diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95de88499fc5..c43f8398678e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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..d38c249a7aa9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,5 +10,8 @@ end_of_line = lf
 indent_style = space
 indent_size = 2
 
+[Makefile]
+indent_style = tab
+
 [*.{md,markdown}]
 trim_trailing_whitespace = false
diff --git a/.eslintrc.json b/.eslintrc.json
index 8a8366b60be9..a59dc0d9e2dd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -14,7 +14,8 @@
       "rules": {
         "@babel/development/no-undefined-identifier": "error",
         "@babel/development/no-deprecated-clone": "error",
-        "import/no-extraneous-dependencies": "error"
+        "import/no-extraneous-dependencies": "error",
+        "guard-for-in": "error"
       }
     },
     {
diff --git a/.github/actions/trigger-github-release/Dockerfile b/.github/actions/trigger-github-release/Dockerfile
index 69b3cb60f5e8..c7e17c775bae 100644
--- a/.github/actions/trigger-github-release/Dockerfile
+++ b/.github/actions/trigger-github-release/Dockerfile
@@ -12,6 +12,7 @@ ADD entrypoint.sh /action/entrypoint.sh
 ADD package.json /action/package.json
 ADD package-lock.json /action/package-lock.json
 ADD release.js /action/release.js
+ADD update-changelog.js /action/update-changelog.js
 
 RUN chmod +x /action/entrypoint.sh
 
diff --git a/.github/actions/trigger-github-release/entrypoint.sh b/.github/actions/trigger-github-release/entrypoint.sh
index c5fcecaffb52..11c7f193e359 100755
--- a/.github/actions/trigger-github-release/entrypoint.sh
+++ b/.github/actions/trigger-github-release/entrypoint.sh
@@ -5,21 +5,18 @@ set -e
 echo "INFO: Installing action dependencies..."
 (cd /action; npm ci)
 
-echo "INFO: Checking out current commit..."
-git -c advice.detachedHead=false checkout $GITHUB_SHA
-
 # GitHub doesn't support running actions on new tags yet: we need to run it on the commit.
 # For this reason, we can't be sure that the tag already exists. We can use the commit
 # message to create the tag. If the tag already exists locally, they won't conflict because
 # they have the same name and are on the same commit.
 echo "INFO: Getting release version..."
-# current_tag=$(git describe --abbrev=0 --tags HEAD)
-current_tag=$(git log --oneline --format=%B -1 HEAD)
+# current_tag=$(git describe --abbrev=0 --tags $GITHUB_SHA)
+current_tag=$(git log --oneline --format=%B -1 $GITHUB_SHA)
 
 echo "INFO: Creating new tag..."
 (git tag $current_tag $GITHUB_SHA) || echo "INFO: Tag already exists"
 
-last_tag=$(git describe --abbrev=0 --tags HEAD^)
+last_tag=$(git describe --abbrev=0 --tags $current_tag^)
 echo "INFO: New version is $current_tag; last version is $last_tag."
 
 echo "INFO: Generating the changelog..."
@@ -35,4 +32,15 @@ changelog=$(
 echo "INFO: Publishing the new GitHub release..."
 echo "$changelog" | node /action/release $current_tag
 
+echo "INFO: Updating CHANGELOG.md..."
+echo "$changelog" | node /action/update-changelog
+
+echo "INFO: Committing changelog..."
+git add CHANGELOG.md
+git -c user.name="$COMMIT_AUTHOR_NAME" -c user.email="$COMMIT_AUTHOR_EMAIL" \
+  commit -m "Add $current_tag to CHANGELOG.md [skip ci]" --no-verify --quiet
+
+echo "INFO: Pushing updates..."
+git push "https://${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" master
+
 echo "INFO: Done! Don't forget to thank new contributors :)"
diff --git a/.github/actions/trigger-github-release/update-changelog.js b/.github/actions/trigger-github-release/update-changelog.js
new file mode 100644
index 000000000000..f7fdd7fbdedd
--- /dev/null
+++ b/.github/actions/trigger-github-release/update-changelog.js
@@ -0,0 +1,31 @@
+"use strict";
+
+const getStdin = require("get-stdin");
+const fs = require("fs").promises;
+const path = require("path");
+
+const { GITHUB_WORKSPACE } = process.env;
+
+const INSERTION_POINT = "<!-- insert-new-changelog-here -->";
+const CHANGELOG = path.resolve(GITHUB_WORKSPACE, "CHANGELOG.md");
+
+main();
+async function main() {
+  let [stdin, changelog] = await Promise.all([
+    getStdin(),
+    fs.readFile(CHANGELOG, "utf8"),
+  ]);
+
+  if (!changelog.includes(INSERTION_POINT)) {
+    throw new Error(`Missing "${INSERTION_POINT}" in CHANGELOG.md`);
+  }
+
+  // Remove committers
+  stdin = stdin.split("\n\n#### Committers")[0];
+  changelog = changelog.replace(
+    INSERTION_POINT,
+    INSERTION_POINT + "\n" + stdin
+  );
+
+  await fs.writeFile(CHANGELOG, changelog);
+}
diff --git a/.github/main.workflow b/.github/main.workflow
index bb88d85128d8..1a6c5a4058d2 100644
--- a/.github/main.workflow
+++ b/.github/main.workflow
@@ -7,6 +7,11 @@ action "Trigger GitHub release" {
   uses = "./.github/actions/trigger-github-release/"
   secrets = ["GITHUB_TOKEN"]
 
+  env = {
+    COMMIT_AUTHOR_NAME  = "Babel Bot"
+    COMMIT_AUTHOR_EMAIL = "babel@hopeinsource.com"
+  }
+
   # When GitHub Actions will support the "release" event for public
   # repositories, we won't need these checks anymore.
   needs = [
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec87f4f4176a..f0a65682a747 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,37 @@ 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.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
diff --git a/Gulpfile.js b/Gulpfile.js
index acada36eea3d..105d37a8ac0f 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -12,9 +12,7 @@ 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");
@@ -35,13 +33,9 @@ function getIndexFromPackage(name) {
   return `${name}/src/index.js`;
 }
 
-function compilationLogger(rollup) {
+function compilationLogger() {
   return through.obj(function(file, enc, callback) {
-    fancyLog(
-      `Compiling '${chalk.cyan(file.relative)}'${
-        rollup ? " with rollup " : ""
-      }...`
-    );
+    fancyLog(`Compiling '${chalk.cyan(file.relative)}'...`);
     callback(null, file);
   });
 }
@@ -90,32 +84,36 @@ 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: [
+            rollupBabel({
+              envName: "babel-parser",
+            }),
+            rollupNodeResolve(),
+          ],
+        })
+        .then(bundle => {
+          return bundle.write({
+            file: path.join(pkg, "lib/index.js"),
+            format: "cjs",
+            name: "babel-parser",
+          });
+        });
     })
   );
 }
 
-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"));
 
diff --git a/Makefile b/Makefile
index 67adb8378d29..1a52c4cef887 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 MAKEFLAGS = -j1
 FLOW_COMMIT = 2ac56861e3ceff9ca406ae586fbafb3480c6c0b7
-TEST262_COMMIT = 4f1155c566a222238fd86f179c6635ecb4c289bb
+TEST262_COMMIT = b4e15b3d5cf63571151dbd02c0987864544c6a56
 
 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
 export FORCE_COLOR = true
@@ -11,6 +11,7 @@ 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
@@ -103,7 +104,7 @@ test-flow-update-whitelist:
 bootstrap-test262:
 	rm -rf ./build/test262
 	mkdir -p ./build
-	git clone --branch=master --single-branch --shallow-since=2010-01-10 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:
diff --git a/babel.config.js b/babel.config.js
index 12f4bb16ca83..cb8f2fbf003b 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -115,9 +115,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.3.4" }]
+            : null,
+        ].filter(Boolean),
       },
     ].filter(Boolean),
   };
diff --git a/eslint-local-rules.js b/eslint-local-rules.js
deleted file mode 100644
index 8b3b7ea4971f..000000000000
--- a/eslint-local-rules.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-
-const noDeprecatedClone = require("./scripts/eslint_rules/no-deprecated-clone");
-const noUndefinedIdentifier = require("./scripts/eslint_rules/no-undefined-identifier");
-const pluginName = require("./scripts/eslint_rules/plugin-name");
-
-module.exports = {
-  "no-deprecated-clone": noDeprecatedClone,
-  "no-undefined-identifier": noUndefinedIdentifier,
-  "plugin-name": pluginName,
-};
diff --git a/lerna.json b/lerna.json
index ce4edadaea0a..8e4c852552ed 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,10 +1,10 @@
 {
-  "version": "7.3.3",
+  "version": "7.3.4",
   "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",
diff --git a/package.json b/package.json
index d682ce4540bf..4100dbd0147f 100644
--- a/package.json
+++ b/package.json
@@ -10,19 +10,19 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
+    "@babel/core": "^7.3.4",
     "@babel/eslint-plugin-development": "^1.0.1",
-    "@babel/plugin-proposal-class-properties": "^7.3.0",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
     "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
     "@babel/plugin-proposal-numeric-separator": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.2.0",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/plugin-transform-runtime": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-flow": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "@babel/runtime": "^7.3.1",
+    "@babel/runtime": "^7.3.4",
     "babel-eslint": "^11.0.0-beta.0",
-    "babel-jest": "^24.0.0",
+    "babel-jest": "^24.5.0",
     "babel-loader": "^8.0.5",
     "babel-plugin-transform-charcodes": "^0.2.0",
     "browserify": "^16.2.3",
@@ -32,13 +32,13 @@
     "derequire": "^2.0.2",
     "duplicate-package-checker-webpack-plugin": "^2.1.0",
     "enhanced-resolve": "^3.0.0",
-    "eslint": "^5.12.1",
-    "eslint-config-babel": "^8.0.2",
+    "eslint": "^5.15.1",
+    "eslint-config-babel": "^9.0.0",
     "eslint-plugin-flowtype": "^3.2.1",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-prettier": "^3.0.1",
     "fancy-log": "^1.3.3",
-    "flow-bin": "^0.92.1",
+    "flow-bin": "^0.94.0",
     "graceful-fs": "^4.1.15",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
@@ -46,10 +46,10 @@
     "gulp-newer": "^1.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^1.4.0",
-    "gulp-uglify": "^3.0.1",
+    "gulp-uglify": "^3.0.2",
     "gulp-watch": "^5.0.1",
     "husky": "^1.3.1",
-    "jest": "^24.0.0",
+    "jest": "^24.5.0",
     "lerna": "^3.6.0",
     "lerna-changelog": "^0.5.0",
     "lint-staged": "^8.1.0",
@@ -59,13 +59,12 @@
     "prettier": "^1.16.1",
     "pump": "^3.0.0",
     "rimraf": "^2.6.3",
-    "rollup-plugin-babel": "^4.0.0-beta.0",
-    "rollup-plugin-node-resolve": "^3.0.2",
-    "rollup-stream": "^1.24.1",
+    "rollup": "^1.6.0",
+    "rollup-plugin-babel": "^4.0.0",
+    "rollup-plugin-node-resolve": "^4.0.1",
     "test262-stream": "^1.2.0",
     "through2": "^2.0.0",
-    "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"
diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
index a3820f8a760d..d07beafc0c8b 100644
--- a/packages/babel-core/package.json
+++ b/packages/babel-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/core",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "Babel compiler core.",
   "main": "lib/index.js",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
@@ -34,12 +34,12 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
-    "@babel/generator": "^7.3.3",
+    "@babel/generator": "^7.3.4",
     "@babel/helpers": "^7.2.0",
-    "@babel/parser": "^7.3.3",
+    "@babel/parser": "^7.3.4",
     "@babel/template": "^7.2.2",
-    "@babel/traverse": "^7.2.2",
-    "@babel/types": "^7.3.3",
+    "@babel/traverse": "^7.3.4",
+    "@babel/types": "^7.3.4",
     "convert-source-map": "^1.1.0",
     "debug": "^4.1.0",
     "json5": "^2.1.0",
diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json
index ed5860c96e80..85fe45c82400 100644
--- a/packages/babel-generator/package.json
+++ b/packages/babel-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/generator",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "Turns an AST into code.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -14,7 +14,7 @@
     "lib"
   ],
   "dependencies": {
-    "@babel/types": "^7.3.3",
+    "@babel/types": "^7.3.4",
     "jsesc": "^2.5.1",
     "lodash": "^4.17.11",
     "source-map": "^0.5.0",
@@ -22,6 +22,6 @@
   },
   "devDependencies": {
     "@babel/helper-fixtures": "^7.2.0",
-    "@babel/parser": "^7.3.3"
+    "@babel/parser": "^7.3.4"
   }
 }
diff --git a/packages/babel-generator/src/generators/base.js b/packages/babel-generator/src/generators/base.js
index cb98733e5541..dd45014377f6 100644
--- a/packages/babel-generator/src/generators/base.js
+++ b/packages/babel-generator/src/generators/base.js
@@ -82,3 +82,13 @@ export function DirectiveLiteral(node: Object) {
 export function InterpreterDirective(node: Object) {
   this.token(`#!${node.value}\n`);
 }
+
+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/types.js b/packages/babel-generator/src/generators/types.js
index 491ae7513828..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);
diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js
index 1d0b2077a160..fb4715d491c5 100644
--- a/packages/babel-generator/src/printer.js
+++ b/packages/babel-generator/src/printer.js
@@ -367,7 +367,7 @@ export default class Printer {
 
     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);
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
index e409b79f575f..b5a205cc36d6 100644
--- 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
@@ -2,8 +2,8 @@ var fn = async (
     arg
 ) => {}
 
-async (x)
-=> {}
+async (x) =>
+{}
 
 async x => {}
 
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/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/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/input.js b/packages/babel-generator/test/fixtures/flow/object-literal-types/input.js
index 6d747ee65e10..f3139a94e350 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,11 @@
 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 };
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..5c02e095e3fa 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,30 @@
 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
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 b4f20f2d705e..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,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/type-alias/input.js b/packages/babel-generator/test/fixtures/flow/type-alias/input.js
index f71342c5265f..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"}
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 a8263f67218b..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,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"
 } | {
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 76be1b446fac..e7335c30b72a 100644
--- a/packages/babel-generator/test/fixtures/flow/type-annotations/input.js
+++ b/packages/babel-generator/test/fixtures/flow/type-annotations/input.js
@@ -107,7 +107,7 @@ 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 { foo };
+export type { foo1 };
 export type { bar } from "bar";
 export interface baz { p: number }
 export interface qux<T> { p: T }
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 cd69710614a1..6465359f336d 100644
--- a/packages/babel-generator/test/fixtures/flow/type-annotations/output.js
+++ b/packages/babel-generator/test/fixtures/flow/type-annotations/output.js
@@ -231,7 +231,7 @@ 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 { foo };
+export type { foo1 };
 export type { bar } from "bar";
 export interface baz {
   p: number
@@ -293,4 +293,4 @@ function foo27(numVal: number = 2) {}
 
 function foo28(numVal?: number = 2) {}
 
-export type * from "foo";
+export type * from "foo";
\ 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/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/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 e1a7074425ea..ae3f4b33c003 100644
--- a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js
+++ b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js
@@ -20,6 +20,16 @@ class 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
   () {}
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 fbb5a3097e73..24f3e9229c84 100644
--- a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js
+++ b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js
@@ -37,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/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/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/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/index.js b/packages/babel-generator/test/index.js
index fc20e8ad425e..4781339b28ea 100644
--- a/packages/babel-generator/test/index.js
+++ b/packages/babel-generator/test/index.js
@@ -489,7 +489,7 @@ 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,
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/package.json b/packages/babel-helper-create-class-features-plugin/package.json
index 81056b4bef10..54f3d95dd86b 100644
--- a/packages/babel-helper-create-class-features-plugin/package.json
+++ b/packages/babel-helper-create-class-features-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-create-class-features-plugin",
-  "version": "7.3.2",
+  "version": "7.3.4",
   "author": "The Babel Team (https://babeljs.io/team)",
   "license": "MIT",
   "description": "Compile class public and private fields, private methods and decorators to ES6",
@@ -18,14 +18,14 @@
     "@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.2.3",
+    "@babel/helper-replace-supers": "^7.3.4",
     "@babel/helper-split-export-declaration": "^7.0.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.2",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-helper-create-class-features-plugin/src/features.js b/packages/babel-helper-create-class-features-plugin/src/features.js
index 5ad2cf26948a..fffc0d0014e0 100644
--- a/packages/babel-helper-create-class-features-plugin/src/features.js
+++ b/packages/babel-helper-create-class-features-plugin/src/features.js
@@ -67,9 +67,9 @@ export function verifyUsedFeatures(path, file) {
       throw path.buildCodeFrameError("Class private methods are not enabled.");
     }
 
-    if (path.node.static) {
+    if (path.node.static && path.node.kind !== "method") {
       throw path.buildCodeFrameError(
-        "@babel/plugin-class-features doesn't support class static private methods yet.",
+        "@babel/plugin-class-features doesn't support class static private accessors yet.",
       );
     }
   }
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
index de121f9cf5dd..e29ff33776ca 100644
--- a/packages/babel-helper-create-class-features-plugin/src/fields.js
+++ b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -24,7 +24,7 @@ export function buildPrivateNamesMap(props) {
         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" && isMethod && isInstance) {
+      } else if (prop.node.kind === "method") {
         update.methodId = prop.scope.generateUidIdentifier(name);
       }
       privateNamesMap.set(name, update);
@@ -141,12 +141,18 @@ const privateNameHandlerSpec = {
       setId,
     } = privateNamesMap.get(name);
 
-    if (isStatic && !isMethod) {
-      return t.callExpression(
-        file.addHelper("classStaticPrivateFieldSpecGet"),
-        [this.receiver(member), t.cloneNode(classRef), t.cloneNode(id)],
-      );
+    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"), [
@@ -176,11 +182,17 @@ const privateNameHandlerSpec = {
       setId,
     } = privateNamesMap.get(name);
 
-    if (isStatic && !isMethod) {
-      return t.callExpression(
-        file.addHelper("classStaticPrivateFieldSpecSet"),
-        [this.receiver(member), t.cloneNode(classRef), t.cloneNode(id), value],
-      );
+    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) {
@@ -403,14 +415,28 @@ function buildPublicFieldInitSpec(ref, prop, state) {
   );
 }
 
-function buildPrivateInstanceMethodDeclaration(prop, privateNamesMap) {
+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(
@@ -441,6 +467,14 @@ function buildPrivateInstanceMethodDeclaration(prop, privateNamesMap) {
       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),
@@ -472,8 +506,9 @@ function replaceThisContext(path, ref, superRef, file, loose) {
   });
   replacer.isStatic = true;
   replacer.replace();
-
-  path.traverse(thisContextVisitor, state);
+  if (path.isProperty()) {
+    path.traverse(thisContextVisitor, state);
+  }
   return state.needsClassRef;
 }
 
@@ -497,7 +532,7 @@ export function buildFieldsInitNodes(
     const isField = prop.isProperty();
     const isMethod = !isField;
 
-    if (isStatic && isField) {
+    if (isStatic) {
       const replaced = replaceThisContext(prop, ref, superRef, state, loose);
       needsClassRef = needsClassRef || replaced;
     }
@@ -548,7 +583,7 @@ export function buildFieldsInitNodes(
           ),
         );
         staticNodes.push(
-          buildPrivateInstanceMethodDeclaration(prop, privateNamesMap),
+          buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
         );
         break;
       case isInstance && isPrivate && isMethod && !loose:
@@ -560,7 +595,27 @@ export function buildFieldsInitNodes(
           ),
         );
         staticNodes.push(
-          buildPrivateInstanceMethodDeclaration(prop, privateNamesMap),
+          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:
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-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-replace-supers/package.json b/packages/babel-helper-replace-supers/package.json
index 309e682b3abe..1bc336576a3a 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.2.3",
+  "version": "7.3.4",
   "description": "Helper function to replace supers",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-replace-supers",
   "license": "MIT",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@babel/helper-member-expression-to-functions": "^7.0.0",
     "@babel/helper-optimise-call-expression": "^7.0.0",
-    "@babel/traverse": "^7.2.3",
-    "@babel/types": "^7.0.0"
+    "@babel/traverse": "^7.3.4",
+    "@babel/types": "^7.3.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-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
index 7d2cbf4f03d6..2448e0cdeaae 100644
--- a/packages/babel-helpers/src/helpers.js
+++ b/packages/babel-helpers/src/helpers.js
@@ -1102,7 +1102,21 @@ helpers.classStaticPrivateFieldSpecSet = helper("7.0.2")`
     descriptor.value = value;
     return value;
   }
-  
+`;
+
+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")`
diff --git a/packages/babel-parser/ast/spec.md b/packages/babel-parser/ast/spec.md
index 31afe89aab02..34c04919cbd0 100644
--- a/packages/babel-parser/ast/spec.md
+++ b/packages/babel-parser/ast/spec.md
@@ -72,6 +72,7 @@ These are the core @babel/parser (babylon) AST node types.
     - [LogicalExpression](#logicalexpression)
       - [LogicalOperator](#logicaloperator)
     - [SpreadElement](#spreadelement)
+    - [ArgumentPlaceholder](#argumentplaceholder)
     - [MemberExpression](#memberexpression)
     - [BindExpression](#bindexpression)
   - [ConditionalExpression](#conditionalexpression)
@@ -863,6 +864,14 @@ interface SpreadElement <: Node {
 }
 ```
 
+### ArgumentPlaceholder
+
+```js
+interface ArgumentPlaceholder <: Node {
+    type: "ArgumentPlaceholder";
+}
+```
+
 ### MemberExpression
 
 ```js
diff --git a/packages/babel-parser/package.json b/packages/babel-parser/package.json
index 555014a52b19..c93d2cfbeac8 100644
--- a/packages/babel-parser/package.json
+++ b/packages/babel-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/parser",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "A JavaScript parser",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -30,8 +30,8 @@
   "devDependencies": {
     "@babel/code-frame": "^7.0.0",
     "@babel/helper-fixtures": "^7.2.0",
-    "charcodes": "0.1.0",
-    "unicode-11.0.0": "^0.7.8"
+    "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 083adcde0a2a..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 +
diff --git a/packages/babel-parser/src/options.js b/packages/babel-parser/src/options.js
index 347c1099b2a0..5a615ccddfac 100755
--- a/packages/babel-parser/src/options.js
+++ b/packages/babel-parser/src/options.js
@@ -65,7 +65,7 @@ export const defaultOptions: Options = {
 
 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 a56058c7c2b7..f2eeaaa01465 100644
--- a/packages/babel-parser/src/parser/base.js
+++ b/packages/babel-parser/src/parser/base.js
@@ -3,17 +3,23 @@
 import type { Options } from "../options";
 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;
+  length: number;
 
   hasPlugin(name: string): boolean {
     return this.plugins.has(name);
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
index 427c8683c45e..3f8ca135c529 100644
--- a/packages/babel-parser/src/parser/expression.js
+++ b/packages/babel-parser/src/parser/expression.js
@@ -29,10 +29,29 @@ import {
 } 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,
@@ -41,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;
@@ -55,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
@@ -74,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)) {
@@ -128,7 +155,7 @@ export default class ExpressionParser extends LValParser {
     const startPos = this.state.start;
     const startLoc = this.state.startLoc;
     if (this.isContextual("yield")) {
-      if (this.state.inGenerator) {
+      if (this.scope.inGenerator) {
         let left = this.parseYield(noIn);
         if (afterLeftParse) {
           left = afterLeftParse.call(this, left, startPos, startLoc);
@@ -183,21 +210,13 @@ export default class ExpressionParser extends LValParser {
 
       this.checkLVal(left, undefined, undefined, "assignment expression");
 
+      const maybePattern = unwrapParenthesizedExpression(left);
+
       let patternErrorMsg;
-      let elementName;
-
-      const unwrap = node => {
-        return node.type === "ParenthesizedExpression"
-          ? unwrap(node.expression)
-          : node;
-      };
-      const maybePattern = unwrap(left);
       if (maybePattern.type === "ObjectPattern") {
         patternErrorMsg = "`({a}) = 0` use `({a} = 0)`";
-        elementName = "property";
       } else if (maybePattern.type === "ArrayPattern") {
         patternErrorMsg = "`([a]) = 0` use `([a] = 0)`";
-        elementName = "element";
       }
 
       if (
@@ -211,7 +230,7 @@ export default class ExpressionParser extends LValParser {
         );
       }
 
-      if (elementName) this.checkCommaAfterRestFromSpread(elementName);
+      if (patternErrorMsg) this.checkCommaAfterRestFromSpread();
       this.state.commaAfterSpreadAt = oldCommaAfterSpreadAt;
 
       this.next();
@@ -316,7 +335,6 @@ export default class ExpressionParser extends LValParser {
         const operator = this.state.value;
         node.left = left;
         node.operator = operator;
-
         if (
           operator === "**" &&
           left.type === "UnaryExpression" &&
@@ -348,7 +366,7 @@ export default class ExpressionParser extends LValParser {
           if (
             this.match(tt.name) &&
             this.state.value === "await" &&
-            this.state.inAsync
+            this.scope.inAsync
           ) {
             throw this.raise(
               this.state.start,
@@ -438,8 +456,8 @@ export default class ExpressionParser extends LValParser {
   parseMaybeUnary(refShorthandDefaultPos: ?Pos): N.Expression {
     if (
       this.isContextual("await") &&
-      (this.state.inAsync ||
-        (!this.state.inFunction && this.options.allowAwaitOutsideFunction))
+      (this.scope.inAsync ||
+        (!this.scope.inFunction && this.options.allowAwaitOutsideFunction))
     ) {
       return this.parseAwait();
     } else if (this.state.type.prefix) {
@@ -524,12 +542,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;
   }
@@ -544,6 +571,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);
@@ -575,13 +603,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 {
@@ -620,7 +643,6 @@ export default class ExpressionParser extends LValParser {
       this.state.yieldPos = 0;
       this.state.awaitPos = 0;
 
-      const possibleAsync = this.atPossibleAsync(base);
       this.next();
 
       let node = this.startNodeAt(startPos, startLoc);
@@ -631,8 +653,9 @@ export default class ExpressionParser extends LValParser {
 
       node.arguments = this.parseCallExpressionArguments(
         tt.parenR,
-        possibleAsync,
+        maybeAsyncArrow,
         base.type === "Import",
+        base.type !== "Super",
       );
       if (!state.optionalChainMember) {
         this.finishCallExpression(node);
@@ -640,10 +663,10 @@ export default class ExpressionParser extends LValParser {
         this.finishOptionalCallExpression(node);
       }
 
-      if (possibleAsync && this.shouldParseAsyncArrow()) {
+      if (maybeAsyncArrow && this.shouldParseAsyncArrow()) {
         state.stop = true;
 
-        this.checkCommaAfterRestFromSpread("parameter");
+        this.checkCommaAfterRestFromSpread();
 
         node = this.parseAsyncArrowFromCallExpression(
           this.startNodeAt(startPos, startLoc),
@@ -703,11 +726,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"
     );
   }
 
@@ -743,6 +766,7 @@ export default class ExpressionParser extends LValParser {
     close: TokenType,
     possibleAsyncArrow: boolean,
     dynamicImport?: boolean,
+    allowPlaceholder?: boolean,
   ): $ReadOnlyArray<?N.Expression> {
     const elts = [];
     let innerParenStart;
@@ -775,6 +799,7 @@ export default class ExpressionParser extends LValParser {
           false,
           possibleAsyncArrow ? { start: 0 } : undefined,
           possibleAsyncArrow ? { start: 0 } : undefined,
+          allowPlaceholder,
         ),
       );
     }
@@ -788,7 +813,7 @@ export default class ExpressionParser extends LValParser {
   }
 
   shouldParseAsyncArrow(): boolean {
-    return this.match(tt.arrow);
+    return this.match(tt.arrow) && !this.canInsertSemicolon();
   }
 
   parseAsyncArrowFromCallExpression(
@@ -823,11 +848,7 @@ export default class ExpressionParser extends LValParser {
 
     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",
@@ -836,24 +857,26 @@ 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?",
           );
         }
+
+        if (
+          !this.match(tt.parenL) &&
+          !this.match(tt.bracketL) &&
+          !this.match(tt.dot)
+        ) {
+          this.unexpected();
+        }
+
         return this.finishNode(node, "Super");
 
       case tt._import:
@@ -887,20 +910,18 @@ export default class ExpressionParser extends LValParser {
           !this.canInsertSemicolon()
         ) {
           this.next();
-          return this.parseFunction(node, false, false, true);
+          return this.parseFunction(node, undefined, true);
         } else if (
           canBeArrow &&
+          !containsEsc &&
           id.name === "async" &&
           this.match(tt.name) &&
           !this.canInsertSemicolon()
         ) {
-          const oldInAsync = this.state.inAsync;
-          this.state.inAsync = true;
           const params = [this.parseIdentifier()];
           this.expect(tt.arrow);
           // let foo = async bar => {};
           this.parseArrowExpression(node, params, true);
-          this.state.inAsync = oldInAsync;
           return node;
         }
 
@@ -917,12 +938,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");
       }
@@ -1053,19 +1071,8 @@ export default class ExpressionParser extends LValParser {
     if (isPrivate) {
       this.expectOnePlugin(["classPrivateProperties", "classPrivateMethods"]);
       const node = this.startNode();
-      const columnHashEnd = this.state.end;
       this.next();
-      const columnIdentifierStart = this.state.start;
-
-      const spacesBetweenHashAndIdentifier =
-        columnIdentifierStart - columnHashEnd;
-      if (spacesBetweenHashAndIdentifier != 0) {
-        this.raise(
-          columnIdentifierStart,
-          "Unexpected space between # and identifier",
-        );
-      }
-
+      this.assertNoSpace("Unexpected space between # and identifier");
       node.id = this.parseIdentifier(true);
       return this.finishNode(node, "PrivateName");
     } else {
@@ -1085,10 +1092,10 @@ export default class ExpressionParser extends LValParser {
     this.next();
     meta = this.createIdentifier(meta, "function");
 
-    if (this.state.inGenerator && this.eat(tt.dot)) {
+    if (this.scope.inGenerator && this.eat(tt.dot)) {
       return this.parseMetaProperty(node, meta, "sent");
     }
-    return this.parseFunction(node, false);
+    return this.parseFunction(node);
   }
 
   parseMetaProperty(
@@ -1162,11 +1169,7 @@ export default class ExpressionParser extends LValParser {
 
     const node = this.startNodeAt(startPos, startLoc);
     this.addExtra(node, "rawValue", value);
-    this.addExtra(
-      node,
-      "raw",
-      this.state.input.slice(startPos, this.state.end),
-    );
+    this.addExtra(node, "raw", this.input.slice(startPos, this.state.end));
     node.value = value;
     this.next();
     return this.finishNode(node, type);
@@ -1212,13 +1215,13 @@ export default class ExpressionParser extends LValParser {
         spreadStart = this.state.start;
         exprList.push(
           this.parseParenItem(
-            this.parseRest(),
+            this.parseRestBinding(),
             spreadNodeStartPos,
             spreadNodeStartLoc,
           ),
         );
 
-        this.checkCommaAfterRest(tt.parenR, "parameter");
+        this.checkCommaAfterRest();
 
         break;
       } else {
@@ -1325,7 +1328,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")) {
@@ -1388,7 +1391,7 @@ export default class ExpressionParser extends LValParser {
       }
     }
     elem.value = {
-      raw: this.state.input
+      raw: this.input
         .slice(this.state.start, this.state.end)
         .replace(/\r\n?/g, "\n"),
       cooked: this.state.value,
@@ -1420,7 +1423,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();
@@ -1436,108 +1438,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());
-          }
-        }
-      }
-
-      let prop = this.startNode(),
-        isGenerator = false,
-        isAsync = false,
-        startPos,
-        startLoc;
-      if (decorators.length) {
-        prop.decorators = decorators;
-        decorators = [];
-      }
+      const prop = this.parseObjectMember(isPattern, refShorthandDefaultPos);
+      // $FlowIgnore RestElement will never be returned if !isPattern
+      if (!isPattern) this.checkPropClash(prop, propHash);
 
-      if (this.match(tt.ellipsis)) {
-        prop = this.parseSpread(isPattern ? { start: 0 } : undefined);
-        node.properties.push(prop);
-        if (isPattern) {
-          this.toAssignable(prop, true, "object pattern");
-          this.checkCommaAfterRest(tt.braceR, "property");
-          this.expect(tt.braceR);
-          break;
-        }
-        continue;
-      }
-
-      prop.method = false;
-
-      if (isPattern || refShorthandDefaultPos) {
-        startPos = this.state.start;
-        startLoc = this.state.startLoc;
+      // $FlowIgnore
+      if (prop.shorthand) {
+        this.addExtra(prop, "shorthand", true);
       }
 
-      if (!isPattern) {
-        isGenerator = this.eat(tt.star);
-      }
+      node.properties.push(prop);
+    }
 
-      const containsEsc = this.state.containsEsc;
+    return this.finishNode(
+      node,
+      isPattern ? "ObjectPattern" : "ObjectExpression",
+    );
+  }
 
-      if (!isPattern && this.isContextual("async")) {
-        if (isGenerator) this.unexpected();
+  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()
+    );
+  }
 
-        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;
-          isGenerator = this.eat(tt.star);
-          this.parsePropertyName(prop);
-        }
+  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 {
-        this.parsePropertyName(prop);
+        // 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());
+        }
       }
+    }
 
-      this.parseObjPropValue(
-        prop,
-        startPos,
-        startLoc,
-        isGenerator,
-        isAsync,
-        isPattern,
-        refShorthandDefaultPos,
-        containsEsc,
-      );
-      this.checkPropClash(prop, propHash);
+    const prop = this.startNode();
+    let isGenerator = false;
+    let isAsync = false;
+    let startPos;
+    let startLoc;
 
-      if (prop.shorthand) {
-        this.addExtra(prop, "shorthand", true);
+    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");
       }
 
-      node.properties.push(prop);
+      return this.parseSpread();
     }
 
     if (decorators.length) {
-      this.raise(
-        this.state.start,
-        "You have trailing decorators with no property",
-      );
+      prop.decorators = decorators;
+      decorators = [];
     }
 
-    return this.finishNode(
-      node,
-      isPattern ? "ObjectPattern" : "ObjectExpression",
+    prop.method = false;
+
+    if (isPattern || refShorthandDefaultPos) {
+      startPos = this.state.start;
+      startLoc = this.state.startLoc;
+    }
+
+    if (!isPattern) {
+      isGenerator = this.eat(tt.star);
+    }
+
+    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;
+    }
+
+    this.parseObjPropValue(
+      prop,
+      startPos,
+      startLoc,
+      isGenerator,
+      isAsync,
+      isPattern,
+      refShorthandDefaultPos,
+      containsEsc,
     );
+
+    return prop;
   }
 
   isGetterOrSetterMethod(prop: N.ObjectMethod, isPattern: boolean): boolean {
@@ -1554,10 +1565,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") {
@@ -1567,7 +1584,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",
@@ -1591,6 +1611,7 @@ export default class ExpressionParser extends LValParser {
         isGenerator,
         isAsync,
         /* isConstructor */ false,
+        false,
         "ObjectMethod",
       );
     }
@@ -1604,6 +1625,7 @@ export default class ExpressionParser extends LValParser {
         /* isGenerator */ false,
         /* isAsync */ false,
         /* isConstructor */ false,
+        false,
         "ObjectMethod",
       );
       this.checkGetterSetterParams(prop);
@@ -1729,32 +1751,28 @@ 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 oldInAsync = this.state.inAsync;
-    const oldInGenerator = this.state.inGenerator;
     const oldYieldPos = this.state.yieldPos;
     const oldAwaitPos = this.state.awaitPos;
-    this.state.inFunction = true;
-    this.state.inMethod = node.kind || true;
-    this.state.inAsync = isAsync;
-    this.state.inGenerator = isGenerator;
     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.checkYieldAwaitInDefaultParams();
-    this.parseFunctionBodyAndFinish(node, type);
+    this.parseFunctionBodyAndFinish(node, type, true);
 
-    this.state.inFunction = oldInFunc;
-    this.state.inMethod = oldInMethod;
-    this.state.inAsync = oldInAsync;
-    this.state.inGenerator = oldInGenerator;
     this.state.yieldPos = oldYieldPos;
     this.state.awaitPos = oldAwaitPos;
 
@@ -1769,17 +1787,12 @@ export default class ExpressionParser extends LValParser {
     params: ?(N.Expression[]),
     isAsync: boolean,
   ): N.ArrowFunctionExpression {
+    this.scope.enter(functionFlags(isAsync, false) | SCOPE_ARROW);
     this.initFunction(node, isAsync);
 
-    const oldInFunc = this.state.inFunction;
-    const oldInAsync = this.state.inAsync;
-    const oldInGenerator = this.state.inGenerator;
     const oldMaybeInArrowParameters = this.state.maybeInArrowParameters;
     const oldYieldPos = this.state.yieldPos;
     const oldAwaitPos = this.state.awaitPos;
-    this.state.inFunction = true;
-    this.state.inAsync = isAsync;
-    this.state.inGenerator = false;
     this.state.maybeInArrowParameters = false;
     this.state.yieldPos = 0;
     this.state.awaitPos = 0;
@@ -1787,9 +1800,6 @@ export default class ExpressionParser extends LValParser {
     if (params) this.setArrowFunctionParameters(node, params);
     this.parseFunctionBody(node, true);
 
-    this.state.inAsync = oldInAsync;
-    this.state.inGenerator = oldInGenerator;
-    this.state.inFunction = oldInFunc;
     this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
     this.state.yieldPos = oldYieldPos;
     this.state.awaitPos = oldAwaitPos;
@@ -1825,65 +1835,101 @@ 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;
     this.state.inParameters = false;
 
     if (isExpression) {
       node.body = this.parseMaybeAssign();
+      this.checkParams(node, false, allowExpression);
     } else {
+      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 oldInFunc = this.state.inFunction;
       const oldLabels = this.state.labels;
-      this.state.inFunction = true;
       this.state.labels = [];
-      node.body = this.parseBlock(true);
-      this.state.inFunction = oldInFunc;
+      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.scope.exit();
 
-    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
@@ -1917,6 +1963,7 @@ export default class ExpressionParser extends LValParser {
     allowEmpty: ?boolean,
     refShorthandDefaultPos: ?Pos,
     refNeedsArrowPos: ?Pos,
+    allowPlaceholder: ?boolean,
   ): ?N.Expression {
     let elt;
     if (allowEmpty && this.match(tt.comma)) {
@@ -1929,6 +1976,14 @@ export default class ExpressionParser extends LValParser {
         spreadNodeStartPos,
         spreadNodeStartLoc,
       );
+    } 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,
@@ -1974,8 +2029,7 @@ export default class ExpressionParser extends LValParser {
       if (
         (name === "class" || name === "function") &&
         (this.state.lastTokEnd !== this.state.lastTokStart + 1 ||
-          this.state.input.charCodeAt(this.state.lastTokStart) !==
-            charCodes.dot)
+          this.input.charCodeAt(this.state.lastTokStart) !== charCodes.dot)
       ) {
         this.state.context.pop();
       }
@@ -2003,22 +2057,21 @@ export default class ExpressionParser extends LValParser {
     checkKeywords: boolean,
     isBinding: boolean,
   ): void {
-    const state = this.state;
-    if (state.inGenerator && word === "yield") {
+    if (this.scope.inGenerator && word === "yield") {
       this.raise(
         startLoc,
         "Can not use 'yield' as identifier inside a generator",
       );
     }
 
-    if (state.inAsync && word === "await") {
+    if (this.scope.inAsync && word === "await") {
       this.raise(
         startLoc,
         "Can not use 'await' as identifier inside an async function",
       );
     }
 
-    if (state.inClassProperty && word === "arguments") {
+    if (this.state.inClassProperty && word === "arguments") {
       this.raise(
         startLoc,
         "'arguments' is not allowed in class field initializer",
@@ -2028,14 +2081,14 @@ export default class ExpressionParser extends LValParser {
       this.raise(startLoc, `Unexpected keyword '${word}'`);
     }
 
-    const reservedTest = !state.strict
+    const reservedTest = !this.state.strict
       ? isReservedWord
       : isBinding
       ? isStrictBindReservedWord
       : isStrictReservedWord;
 
     if (reservedTest(word, this.inModule)) {
-      if (!state.inAsync && word === "await") {
+      if (!this.scope.inAsync && word === "await") {
         this.raise(
           startLoc,
           "Can not use keyword 'await' outside an async function",
diff --git a/packages/babel-parser/src/parser/index.js b/packages/babel-parser/src/parser/index.js
index 00617bd8632c..b92ecb8203ad 100644
--- a/packages/babel-parser/src/parser/index.js
+++ b/packages/babel-parser/src/parser/index.js
@@ -5,6 +5,8 @@ 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 = Map<string, { [string]: any }>;
 
@@ -20,11 +22,13 @@ export default class Parser extends StatementParser {
 
     this.options = options;
     this.inModule = this.options.sourceType === "module";
+    this.scope = new ScopeHandler(this.raise.bind(this), this.inModule);
     this.plugins = pluginsMap(this.options.plugins);
     this.filename = options.sourceFilename;
   }
 
   parse(): File {
+    this.scope.enter(SCOPE_PROGRAM);
     const file = this.startNode();
     const program = this.startNode();
     this.nextToken();
diff --git a/packages/babel-parser/src/parser/location.js b/packages/babel-parser/src/parser/location.js
index f73724004b06..79db584a4995 100644
--- a/packages/babel-parser/src/parser/location.js
+++ b/packages/babel-parser/src/parser/location.js
@@ -21,7 +21,7 @@ export default class LocationParser extends CommentsParser {
       code?: string,
     } = {},
   ): empty {
-    const loc = getLineInfo(this.state.input, pos);
+    const loc = getLineInfo(this.input, 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 d200bc7c07e8..6db5558a8ff9 100644
--- a/packages/babel-parser/src/parser/lval.js
+++ b/packages/babel-parser/src/parser/lval.js
@@ -16,6 +16,7 @@ import type {
 import type { Pos, Position } from "../util/location";
 import { isStrictBindReservedWord } from "../util/identifier";
 import { NodeUtils } from "./node";
+import { type BindingTypes, BIND_NONE, BIND_OUTSIDE } from "../util/scopeflags";
 
 export default class LValParser extends NodeUtils {
   // Forward-declaration: defined in expression.js
@@ -129,7 +130,7 @@ export default class LValParser extends NodeUtils {
 
       this.raise(prop.key.start, error);
     } else if (prop.type === "SpreadElement" && !isLast) {
-      this.raiseRestNotLast(prop.start, "property");
+      this.raiseRestNotLast(prop.start);
     } else {
       this.toAssignable(prop, isBinding, "object destructuring pattern");
     }
@@ -167,7 +168,7 @@ export default class LValParser extends NodeUtils {
       if (elt) {
         this.toAssignable(elt, isBinding, contextDescription);
         if (elt.type === "RestElement") {
-          this.raiseRestNotLast(elt.start, "element");
+          this.raiseRestNotLast(elt.start);
         }
       }
     }
@@ -220,7 +221,7 @@ export default class LValParser extends NodeUtils {
     return this.finishNode(node, "SpreadElement");
   }
 
-  parseRest(): RestElement {
+  parseRestBinding(): RestElement {
     const node = this.startNode();
     this.next();
     node.argument = this.parseBindingAtom();
@@ -267,13 +268,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()));
-        this.checkCommaAfterRest(
-          close,
-          this.state.inFunction && this.state.inParameters
-            ? "parameter"
-            : "element",
-        );
+        elts.push(this.parseAssignableListItemTypes(this.parseRestBinding()));
+        this.checkCommaAfterRest();
         this.expect(close);
         break;
       } else {
@@ -333,7 +329,7 @@ export default class LValParser extends NodeUtils {
 
   checkLVal(
     expr: Expression,
-    isBinding: ?boolean,
+    bindingType: ?BindingTypes = BIND_NONE,
     checkClashes: ?{ [key: string]: boolean },
     contextDescription: string,
   ): void {
@@ -345,7 +341,7 @@ export default class LValParser extends NodeUtils {
         ) {
           this.raise(
             expr.start,
-            `${isBinding ? "Binding" : "Assigning to"} '${
+            `${bindingType === BIND_NONE ? "Assigning to" : "Binding"} '${
               expr.name
             }' in strict mode`,
           );
@@ -366,15 +362,20 @@ 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_NONE && bindingType !== BIND_OUTSIDE) {
+          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":
@@ -382,7 +383,7 @@ export default class LValParser extends NodeUtils {
           if (prop.type === "ObjectProperty") prop = prop.value;
           this.checkLVal(
             prop,
-            isBinding,
+            bindingType,
             checkClashes,
             "object destructuring pattern",
           );
@@ -394,7 +395,7 @@ export default class LValParser extends NodeUtils {
           if (elem) {
             this.checkLVal(
               elem,
-              isBinding,
+              bindingType,
               checkClashes,
               "array destructuring pattern",
             );
@@ -405,20 +406,25 @@ 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,
-          isBinding,
+          bindingType,
           checkClashes,
           "parenthesized expression",
         );
@@ -426,9 +432,9 @@ export default class LValParser extends NodeUtils {
 
       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
@@ -447,27 +453,19 @@ export default class LValParser extends NodeUtils {
     }
   }
 
-  checkCommaAfterRest(close: TokenType, kind: string): void {
+  checkCommaAfterRest(): void {
     if (this.match(tt.comma)) {
-      if (this.lookahead().type === close) {
-        this.raiseCommaAfterRest(this.state.start, kind);
-      } else {
-        this.raiseRestNotLast(this.state.start, kind);
-      }
+      this.raiseRestNotLast(this.state.start);
     }
   }
 
-  checkCommaAfterRestFromSpread(kind: string): void {
+  checkCommaAfterRestFromSpread(): void {
     if (this.state.commaAfterSpreadAt > -1) {
-      this.raiseCommaAfterRest(this.state.commaAfterSpreadAt, kind);
+      this.raiseRestNotLast(this.state.commaAfterSpreadAt);
     }
   }
 
-  raiseCommaAfterRest(pos: number, kind: string) {
-    this.raise(pos, `A trailing comma is not permitted after the rest ${kind}`);
-  }
-
-  raiseRestNotLast(pos: number, kind: string) {
-    this.raise(pos, `The rest ${kind} must be the last ${kind}`);
+  raiseRestNotLast(pos: number) {
+    this.raise(pos, `Rest element must be last element`);
   }
 }
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
index 35a291d08b9e..d89aa6b11567 100644
--- a/packages/babel-parser/src/parser/statement.js
+++ b/packages/babel-parser/src/parser/statement.js
@@ -10,6 +10,17 @@ import {
 } from "../util/identifier";
 import { lineBreak, skipWhiteSpace } from "../util/whitespace";
 import * as charCodes from "charcodes";
+import {
+  BIND_SIMPLE_CATCH,
+  BIND_LEXICAL,
+  BIND_VAR,
+  BIND_FUNCTION,
+  functionFlags,
+  SCOPE_CLASS,
+  SCOPE_OTHER,
+  SCOPE_SIMPLE_CATCH,
+  SCOPE_SUPER,
+} from "../util/scopeflags";
 
 // Reused empty array added for node fields that are always empty.
 
@@ -18,6 +29,11 @@ const empty = [];
 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
 
@@ -33,6 +49,14 @@ export default class StatementParser extends ExpressionParser {
 
     this.parseBlockBody(program, true, true, tt.eof);
 
+    if (this.inModule && 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;
 
@@ -49,7 +73,7 @@ export default class StatementParser extends ExpressionParser {
     const directiveLiteral = this.startNodeAt(expr.start, expr.loc.start);
     const directive = this.startNodeAt(stmt.start, stmt.loc.start);
 
-    const raw = this.state.input.slice(expr.start, expr.end);
+    const raw = this.input.slice(expr.start, expr.end);
     const val = (directiveLiteral.value = raw.slice(1, -1)); // remove quotes
 
     this.addExtra(directiveLiteral, "raw", raw);
@@ -81,10 +105,10 @@ export default class StatementParser extends ExpressionParser {
       return false;
     }
     skipWhiteSpace.lastIndex = this.state.pos;
-    const skip = skipWhiteSpace.exec(this.state.input);
+    const skip = skipWhiteSpace.exec(this.input);
     // $FlowIgnore
     const next = this.state.pos + skip[0].length;
-    const nextCh = this.state.input.charCodeAt(next);
+    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
@@ -96,10 +120,10 @@ export default class StatementParser extends ExpressionParser {
 
     if (isIdentifierStart(nextCh)) {
       let pos = next + 1;
-      while (isIdentifierChar(this.state.input.charCodeAt(pos))) {
+      while (isIdentifierChar(this.input.charCodeAt(pos))) {
         ++pos;
       }
-      const ident = this.state.input.slice(next, pos);
+      const ident = this.input.slice(next, pos);
       if (!keywordRelationalOperator.test(ident)) return true;
     }
     return false;
@@ -144,26 +168,24 @@ export default class StatementParser extends ExpressionParser {
         return this.parseDoStatement(node);
       case tt._for:
         return this.parseForStatement(node);
-      case tt._function: {
+      case tt._function:
         if (this.lookahead().type === tt.dot) break;
-        if (
-          context &&
-          (this.state.strict || (context !== "if" && context !== "label"))
-        ) {
-          this.raise(
-            this.state.start,
-            "Function declaration not allowed in this context",
-          );
-        }
-        const result = this.parseFunctionStatement(node);
-
-        // TODO: Remove this once we have proper scope tracking in place.
-        if (context && result.generator) {
-          this.unexpected(node.start);
+        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);
 
-        return result;
-      }
       case tt._class:
         if (context) this.unexpected();
         return this.parseClass(node, true);
@@ -182,7 +204,12 @@ export default class StatementParser extends ExpressionParser {
       case tt._const:
       case tt._var:
         kind = kind || this.state.value;
-        if (context && kind !== "var") this.unexpected();
+        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:
@@ -237,24 +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()) {
-            if (context) {
-              this.raise(
-                this.state.lastTokStart,
-                "Function declaration not allowed in this context",
-              );
-            }
-            this.next();
-            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
@@ -394,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];
@@ -414,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 {
@@ -468,12 +495,13 @@ export default class StatementParser extends ExpressionParser {
 
     let awaitAt = -1;
     if (
-      (this.state.inAsync ||
-        (!this.state.inFunction && this.options.allowAwaitOutsideFunction)) &&
+      (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)) {
@@ -531,9 +559,17 @@ export default class StatementParser extends ExpressionParser {
     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 {
@@ -545,7 +581,7 @@ export default class StatementParser extends ExpressionParser {
   }
 
   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");
     }
 
@@ -571,6 +607,7 @@ export default class StatementParser extends ExpressionParser {
     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
@@ -602,6 +639,7 @@ export default class StatementParser extends ExpressionParser {
         }
       }
     }
+    this.scope.exit();
     if (cur) this.finishNode(cur, "SwitchCase");
     this.next(); // Closing brace
     this.state.labels.pop();
@@ -611,9 +649,7 @@ export default class StatementParser extends ExpressionParser {
   parseThrowStatement(node: N.ThrowStatement): N.ThrowStatement {
     this.next();
     if (
-      lineBreak.test(
-        this.state.input.slice(this.state.lastTokEnd, this.state.start),
-      )
+      lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start))
     ) {
       this.raise(this.state.lastTokEnd, "Illegal newline after throw");
     }
@@ -634,11 +670,18 @@ 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,
+          simple ? BIND_SIMPLE_CATCH : BIND_LEXICAL,
+          null,
+          "catch clause",
+        );
         this.expect(tt.parenR);
       } else {
         clause.param = null;
+        this.scope.enter(SCOPE_OTHER);
       }
 
       clause.body =
@@ -648,8 +691,9 @@ export default class StatementParser extends ExpressionParser {
         // outside of the function body.
         this.withTopicForbiddingContext(() =>
           // Parse the catch clause's body.
-          this.parseBlock(false),
+          this.parseBlock(false, false),
         );
+      this.scope.exit();
 
       node.handler = this.finishNode(clause, "CatchClause");
     }
@@ -766,7 +810,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");
@@ -776,10 +820,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");
   }
 
@@ -874,6 +927,7 @@ export default class StatementParser extends ExpressionParser {
         this.parseStatement("for"),
       );
 
+    this.scope.exit();
     this.state.labels.pop();
 
     return this.finishNode(node, "ForStatement");
@@ -909,6 +963,7 @@ export default class StatementParser extends ExpressionParser {
         this.parseStatement("for"),
       );
 
+    this.scope.exit();
     this.state.labels.pop();
 
     return this.finishNode(node, type);
@@ -961,7 +1016,12 @@ export default class StatementParser extends ExpressionParser {
       this.unexpected(null, "let is disallowed as a lexically bound name");
     }
     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
@@ -969,51 +1029,53 @@ export default class StatementParser extends ExpressionParser {
 
   parseFunction<T: N.NormalFunction>(
     node: T,
-    isStatement: boolean,
-    allowExpressionBody?: boolean = false,
+    statement?: number = FUNC_NO_FLAGS,
     isAsync?: boolean = false,
-    optionalId?: boolean = false,
   ): T {
-    const oldInFunc = this.state.inFunction;
-    const oldInMethod = this.state.inMethod;
-    const oldInAsync = this.state.inAsync;
-    const oldInGenerator = this.state.inGenerator;
-    const oldInClassProperty = this.state.inClassProperty;
-    const oldYieldPos = this.state.yieldPos;
-    const oldAwaitPos = this.state.awaitPos;
-    this.state.inFunction = true;
-    this.state.inMethod = false;
-    this.state.inClassProperty = false;
-    this.state.yieldPos = 0;
-    this.state.awaitPos = 0;
+    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) && 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.unexpected();
+    if (isStatement) {
+      node.id = this.parseFunctionId(requireId);
+      if (node.id && !isHangingStatement) {
+        // 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",
+        );
+      }
     }
 
-    // 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.
-    // The same applies to await & async functions.
+    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) {
-      this.state.inAsync = isAsync;
-      this.state.inGenerator = node.generator;
-    }
-    if (this.match(tt.name)) {
-      node.id = this.parseIdentifier();
-    }
-    if (isStatement) {
-      this.state.inAsync = isAsync;
-      this.state.inGenerator = node.generator;
+      node.id = this.parseFunctionId();
     }
 
     this.parseFunctionParams(node);
@@ -1026,14 +1088,9 @@ export default class StatementParser extends ExpressionParser {
       this.parseFunctionBodyAndFinish(
         node,
         isStatement ? "FunctionDeclaration" : "FunctionExpression",
-        allowExpressionBody,
       );
     });
 
-    this.state.inFunction = oldInFunc;
-    this.state.inMethod = oldInMethod;
-    this.state.inAsync = oldInAsync;
-    this.state.inGenerator = oldInGenerator;
     this.state.inClassProperty = oldInClassProperty;
     this.state.yieldPos = oldYieldPos;
     this.state.awaitPos = oldAwaitPos;
@@ -1041,6 +1098,10 @@ export default class StatementParser extends ExpressionParser {
     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;
@@ -1073,7 +1134,7 @@ export default class StatementParser extends ExpressionParser {
 
     this.parseClassId(node, isStatement, optionalId);
     this.parseClassSuper(node);
-    this.parseClassBody(node);
+    node.body = this.parseClassBody(!!node.superClass);
 
     this.state.strict = oldStrict;
 
@@ -1100,13 +1161,12 @@ export default class StatementParser extends ExpressionParser {
     );
   }
 
-  parseClassBody(node: N.Class): void {
+  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);
@@ -1140,7 +1200,7 @@ export default class StatementParser extends ExpressionParser {
           decorators = [];
         }
 
-        this.parseClassMember(classBody, member, state);
+        this.parseClassMember(classBody, member, state, constructorAllowsSuper);
 
         if (
           member.kind === "constructor" &&
@@ -1162,15 +1222,16 @@ export default class StatementParser extends ExpressionParser {
       );
     }
 
-    node.body = this.finishNode(classBody, "ClassBody");
-
     this.state.classLevel--;
+
+    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;
@@ -1192,6 +1253,7 @@ export default class StatementParser extends ExpressionParser {
           false,
           false,
           /* isConstructor */ false,
+          false,
         );
         return;
       } else if (this.isClassProperty()) {
@@ -1211,7 +1273,13 @@ export default class StatementParser extends ExpressionParser {
       isStatic = true;
     }
 
-    this.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
+    this.parseClassMemberWithIsStatic(
+      classBody,
+      member,
+      state,
+      isStatic,
+      constructorAllowsSuper,
+    );
   }
 
   parseClassMemberWithIsStatic(
@@ -1219,6 +1287,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;
@@ -1251,11 +1320,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.
@@ -1273,7 +1344,7 @@ export default class StatementParser extends ExpressionParser {
 
       // a normal method
       const isConstructor = this.isNonstaticConstructor(publicMethod);
-
+      let allowsDirectSuper = false;
       if (isConstructor) {
         publicMethod.kind = "constructor";
 
@@ -1289,6 +1360,7 @@ export default class StatementParser extends ExpressionParser {
           this.raise(key.start, "Duplicate constructor in the same class");
         }
         state.hadConstructor = true;
+        allowsDirectSuper = constructorAllowsSuper;
       }
 
       this.pushClassMethod(
@@ -1297,6 +1369,7 @@ export default class StatementParser extends ExpressionParser {
         false,
         false,
         isConstructor,
+        allowsDirectSuper,
       );
     } else if (this.isClassProperty()) {
       if (isPrivate) {
@@ -1304,7 +1377,12 @@ 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.eat(tt.star);
 
@@ -1334,11 +1412,13 @@ export default class StatementParser extends ExpressionParser {
           isGenerator,
           true,
           /* isConstructor */ false,
+          false,
         );
       }
     } else if (
       isSimple &&
       (key.name === "get" || key.name === "set") &&
+      !containsEsc &&
       !(this.match(tt.star) && this.isLineTerminator())
     ) {
       // `get\n*` is an uninitialized property named 'get' followed by a generator.
@@ -1363,6 +1443,7 @@ export default class StatementParser extends ExpressionParser {
           false,
           false,
           /* isConstructor */ false,
+          false,
         );
       }
 
@@ -1429,6 +1510,7 @@ export default class StatementParser extends ExpressionParser {
     isGenerator: boolean,
     isAsync: boolean,
     isConstructor: boolean,
+    allowsDirectSuper: boolean,
   ): void {
     classBody.body.push(
       this.parseMethod(
@@ -1436,7 +1518,9 @@ export default class StatementParser extends ExpressionParser {
         isGenerator,
         isAsync,
         isConstructor,
+        allowsDirectSuper,
         "ClassMethod",
+        true,
       ),
     );
   }
@@ -1454,7 +1538,9 @@ export default class StatementParser extends ExpressionParser {
         isGenerator,
         isAsync,
         /* isConstructor */ false,
+        false,
         "ClassPrivateMethod",
+        true,
       ),
     );
   }
@@ -1473,13 +1559,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");
   }
 
@@ -1488,10 +1577,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();
@@ -1501,7 +1590,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");
   }
@@ -1513,6 +1603,9 @@ export default class StatementParser extends ExpressionParser {
   ): void {
     if (this.match(tt.name)) {
       node.id = this.parseIdentifier();
+      if (isStatement) {
+        this.checkLVal(node.id, BIND_LEXICAL, undefined, "class name");
+      }
     } else {
       if (optionalId || !isStatement) {
         node.id = null;
@@ -1563,7 +1656,7 @@ export default class StatementParser extends ExpressionParser {
     }
 
     if (isFromRequired || hasSpecifiers || hasDeclaration) {
-      this.checkExport(node, true);
+      this.checkExport(node, true, false, !!node.source);
       return this.finishNode(node, "ExportNamedDeclaration");
     }
 
@@ -1649,22 +1742,23 @@ export default class StatementParser extends ExpressionParser {
     return false;
   }
 
-  isAsyncFunction() {
+  isAsyncFunction(): boolean {
     if (!this.isContextual("async")) return false;
 
-    const { input, pos, length } = 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 === length || !isIdentifierChar(input.charCodeAt(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)))
     );
   }
 
@@ -1673,13 +1767,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)) {
@@ -1773,8 +1871,9 @@ export default class StatementParser extends ExpressionParser {
 
   checkExport(
     node: N.ExportNamedDeclaration,
-    checkNames: ?boolean,
+    checkNames?: boolean,
     isDefault?: boolean,
+    isFrom?: boolean,
   ): void {
     if (checkNames) {
       // Check for duplicate exports
@@ -1785,6 +1884,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
@@ -1868,7 +1980,6 @@ export default class StatementParser extends ExpressionParser {
   parseExportSpecifiers(): Array<N.ExportSpecifier> {
     const nodes = [];
     let first = true;
-    let needsFrom;
 
     // export { x, y as z } [from '...']
     this.expect(tt.braceL);
@@ -1881,22 +1992,14 @@ 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;
   }
 
@@ -1934,7 +2037,12 @@ 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));
   }
 
@@ -2007,7 +2115,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 1ea8aeaf8f1c..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
 
@@ -87,7 +89,7 @@ export default class UtilParser extends Tokenizer {
 
   hasPrecedingLineBreak(): boolean {
     return lineBreak.test(
-      this.state.input.slice(this.state.lastTokEnd, this.state.start),
+      this.input.slice(this.state.lastTokEnd, this.state.start),
     );
   }
 
@@ -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.
 
@@ -165,4 +174,27 @@ export default class UtilParser extends Tokenizer {
       );
     }
   }
+
+  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 317bdff32352..c1cb6a6b7e92 100644
--- a/packages/babel-parser/src/plugin-utils.js
+++ b/packages/babel-parser/src/plugin-utils.js
@@ -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 ae859107b066..38e7e2e01cdd 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,
+        allowsDirectSuper,
         "MethodDefinition",
+        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,7 +292,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         isGenerator,
         isAsync,
         isConstructor,
+        allowDirectSuper,
         "FunctionExpression",
+        inClassScope,
       );
       delete funcNode.kind;
       // $FlowIgnore
diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js
index 1effe1725c0e..dc2de5036bcc 100644
--- a/packages/babel-parser/src/plugins/flow.js
+++ b/packages/babel-parser/src/plugins/flow.js
@@ -9,6 +9,12 @@ import type State from "../tokenizer/state";
 import { types as tc } from "../tokenizer/context";
 import * as charCodes from "charcodes";
 import { isIteratorStart } from "../util/identifier";
+import {
+  type BindingTypes,
+  BIND_NONE,
+  BIND_LEXICAL,
+  SCOPE_OTHER,
+} from "../util/scopeflags";
 
 const reservedTypes = [
   "any",
@@ -257,6 +263,8 @@ 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();
       } else {
@@ -290,6 +298,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
         body.push(bodyNode);
       }
+
+      this.scope.exit();
+
       this.expect(tt.braceR);
 
       this.finishNode(bodyNode, "BlockStatement");
@@ -518,6 +529,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();
@@ -537,6 +549,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();
@@ -1124,7 +1137,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       node.types = [];
       this.expect(tt.bracketL);
       // We allow trailing commas
-      while (this.state.pos < this.state.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);
@@ -1531,23 +1544,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();
 
         [
@@ -1562,7 +1578,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           : null;
       }
 
-      super.parseFunctionBodyAndFinish(node, type, allowExpressionBody);
+      super.parseFunctionBodyAndFinish(node, type, isMethod);
     }
 
     // interfaces
@@ -1761,7 +1777,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
               "arrow function parameters",
             );
             // Use super's method to force the parameters to be checked
-            super.checkFunctionNameAndParams(node, true);
+            super.checkParams(node, false, true);
           } else {
             arrows.push(node);
           }
@@ -1922,7 +1938,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     // ensure that inside flow types, we bypass the jsx parser plugin
     getTokenFromCode(code: number): void {
-      const next = this.state.input.charCodeAt(this.state.pos + 1);
+      const next = this.input.charCodeAt(this.state.pos + 1);
       if (code === charCodes.leftCurlyBrace && next === charCodes.verticalBar) {
         return this.finishOp(tt.braceBarL, 2);
       } else if (
@@ -1995,14 +2011,14 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     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,
         );
@@ -2047,6 +2063,7 @@ 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);
@@ -2064,6 +2081,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         isGenerator,
         isAsync,
         isConstructor,
+        allowsDirectSuper,
       );
     }
 
@@ -2217,7 +2235,12 @@ 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));
     }
 
@@ -2327,12 +2350,17 @@ 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("<")) {
@@ -2340,7 +2368,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           /* allowDefault */ false,
         );
       }
-      super.parseFunctionParams(node);
+      super.parseFunctionParams(node, allowModifiers);
     }
 
     // parse flow type annotations on variable declarator heads - let foo: string = bar
@@ -2519,8 +2547,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    checkFunctionNameAndParams(
+    checkParams(
       node: N.Function,
+      allowDuplicates: boolean,
       isArrowFunction: ?boolean,
     ): void {
       if (
@@ -2530,7 +2559,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 {
@@ -2590,6 +2619,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");
@@ -2642,6 +2672,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         startLoc,
         noCalls,
         subscriptState,
+        maybeAsyncArrow,
       );
     }
 
@@ -2679,7 +2710,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     readToken_mult_modulo(code: number): void {
-      const next = this.state.input.charCodeAt(this.state.pos + 1);
+      const next = this.input.charCodeAt(this.state.pos + 1);
       if (
         code === charCodes.asterisk &&
         next === charCodes.slash &&
@@ -2695,7 +2726,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     readToken_pipe_amp(code: number): void {
-      const next = this.state.input.charCodeAt(this.state.pos + 1);
+      const next = this.input.charCodeAt(this.state.pos + 1);
       if (
         code === charCodes.verticalBar &&
         next === charCodes.rightCurlyBrace
@@ -2731,7 +2762,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
 
       if (this.state.hasFlowComment) {
-        const end = this.state.input.indexOf("*-/", (this.state.pos += 2));
+        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;
@@ -2745,22 +2776,20 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let shiftToFirstNonWhiteSpace = 2;
       while (
         [charCodes.space, charCodes.tab].includes(
-          this.state.input.charCodeAt(pos + shiftToFirstNonWhiteSpace),
+          this.input.charCodeAt(pos + shiftToFirstNonWhiteSpace),
         )
       ) {
         shiftToFirstNonWhiteSpace++;
       }
 
-      const ch2 = this.state.input.charCodeAt(shiftToFirstNonWhiteSpace + pos);
-      const ch3 = this.state.input.charCodeAt(
-        shiftToFirstNonWhiteSpace + pos + 1,
-      );
+      const ch2 = this.input.charCodeAt(shiftToFirstNonWhiteSpace + pos);
+      const ch3 = this.input.charCodeAt(shiftToFirstNonWhiteSpace + pos + 1);
 
       if (ch2 === charCodes.colon && ch3 === charCodes.colon) {
         return shiftToFirstNonWhiteSpace + 2; // check for /*::
       }
       if (
-        this.state.input.slice(
+        this.input.slice(
           shiftToFirstNonWhiteSpace + pos,
           shiftToFirstNonWhiteSpace + pos + 12,
         ) === "flow-include"
@@ -2774,7 +2803,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     hasFlowCommentCompletion(): void {
-      const end = this.state.input.indexOf("*/", this.state.pos);
+      const end = this.input.indexOf("*/", this.state.pos);
       if (end === -1) {
         this.raise(this.state.pos, "Unterminated comment");
       }
diff --git a/packages/babel-parser/src/plugins/jsx/index.js b/packages/babel-parser/src/plugins/jsx/index.js
index a129c6d27a27..a2644915f1f7 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,11 +81,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let out = "";
       let chunkStart = this.state.pos;
       for (;;) {
-        if (this.state.pos >= this.state.length) {
+        if (this.state.pos >= this.length) {
           this.raise(this.state.start, "Unterminated JSX contents");
         }
 
-        const ch = this.state.input.charCodeAt(this.state.pos);
+        const ch = this.input.charCodeAt(this.state.pos);
 
         switch (ch) {
           case charCodes.lessThan:
@@ -95,18 +97,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
               }
               return super.getTokenFromCode(ch);
             }
-            out += this.state.input.slice(chunkStart, this.state.pos);
+            out += this.input.slice(chunkStart, this.state.pos);
             return this.finishToken(tt.jsxText, out);
 
           case charCodes.ampersand:
-            out += this.state.input.slice(chunkStart, this.state.pos);
+            out += this.input.slice(chunkStart, this.state.pos);
             out += this.jsxReadEntity();
             chunkStart = this.state.pos;
             break;
 
           default:
             if (isNewLine(ch)) {
-              out += this.state.input.slice(chunkStart, this.state.pos);
+              out += this.input.slice(chunkStart, this.state.pos);
               out += this.jsxReadNewLine(true);
               chunkStart = this.state.pos;
             } else {
@@ -117,12 +119,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     jsxReadNewLine(normalizeCRLF: boolean): string {
-      const ch = this.state.input.charCodeAt(this.state.pos);
+      const ch = this.input.charCodeAt(this.state.pos);
       let out;
       ++this.state.pos;
       if (
         ch === charCodes.carriageReturn &&
-        this.state.input.charCodeAt(this.state.pos) === charCodes.lineFeed
+        this.input.charCodeAt(this.state.pos) === charCodes.lineFeed
       ) {
         ++this.state.pos;
         out = normalizeCRLF ? "\n" : "\r\n";
@@ -139,25 +141,25 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let out = "";
       let chunkStart = ++this.state.pos;
       for (;;) {
-        if (this.state.pos >= this.state.length) {
+        if (this.state.pos >= this.length) {
           this.raise(this.state.start, "Unterminated string constant");
         }
 
-        const ch = this.state.input.charCodeAt(this.state.pos);
+        const ch = this.input.charCodeAt(this.state.pos);
         if (ch === quote) break;
         if (ch === charCodes.ampersand) {
-          out += this.state.input.slice(chunkStart, this.state.pos);
+          out += this.input.slice(chunkStart, this.state.pos);
           out += this.jsxReadEntity();
           chunkStart = this.state.pos;
         } else if (isNewLine(ch)) {
-          out += this.state.input.slice(chunkStart, this.state.pos);
+          out += this.input.slice(chunkStart, this.state.pos);
           out += this.jsxReadNewLine(false);
           chunkStart = this.state.pos;
         } else {
           ++this.state.pos;
         }
       }
-      out += this.state.input.slice(chunkStart, this.state.pos++);
+      out += this.input.slice(chunkStart, this.state.pos++);
       return this.finishToken(tt.string, out);
     }
 
@@ -165,11 +167,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let str = "";
       let count = 0;
       let entity;
-      let ch = this.state.input[this.state.pos];
+      let ch = this.input[this.state.pos];
 
       const startPos = ++this.state.pos;
-      while (this.state.pos < this.state.length && count++ < 10) {
-        ch = this.state.input[this.state.pos++];
+      while (this.state.pos < this.length && count++ < 10) {
+        ch = this.input[this.state.pos++];
         if (ch === ";") {
           if (str[0] === "#") {
             if (str[1] === "x") {
@@ -208,11 +210,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let ch;
       const start = this.state.pos;
       do {
-        ch = this.state.input.charCodeAt(++this.state.pos);
+        ch = this.input.charCodeAt(++this.state.pos);
       } while (isIdentifierChar(ch) || ch === charCodes.dash);
       return this.finishToken(
         tt.jsxName,
-        this.state.input.slice(start, this.state.pos),
+        this.input.slice(start, this.state.pos),
       );
     }
 
@@ -508,8 +510,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return this.jsxParseElement();
       } else if (
         this.isRelational("<") &&
-        this.state.input.charCodeAt(this.state.pos) !==
-          charCodes.exclamationMark
+        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
@@ -550,8 +551,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       if (
         code === charCodes.lessThan &&
         this.state.exprAllowed &&
-        this.state.input.charCodeAt(this.state.pos + 1) !==
-          charCodes.exclamationMark
+        this.input.charCodeAt(this.state.pos + 1) !== charCodes.exclamationMark
       ) {
         ++this.state.pos;
         return this.finishToken(tt.jsxTagStart);
diff --git a/packages/babel-parser/src/plugins/placeholders.js b/packages/babel-parser/src/plugins/placeholders.js
new file mode 100644
index 000000000000..3a61a255595f
--- /dev/null
+++ b/packages/babel-parser/src/plugins/placeholders.js
@@ -0,0 +1,314 @@
+// @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> {
+      node.expectedNode = expectedNode;
+      return 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
index 1c0961ab9733..513d0f3a94c0 100644
--- a/packages/babel-parser/src/plugins/typescript.js
+++ b/packages/babel-parser/src/plugins/typescript.js
@@ -6,6 +6,7 @@ import { types as ct } from "../tokenizer/context";
 import * as N from "../types";
 import type { Pos, Position } from "../util/location";
 import Parser from "../parser";
+import { type BindingTypes, BIND_NONE, SCOPE_OTHER } from "../util/scopeflags";
 
 type TsModifier =
   | "readonly"
@@ -569,7 +570,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         const restNode: N.TsRestType = this.startNode();
         this.next(); // skips ellipsis
         restNode.typeAnnotation = this.tsParseType();
-        this.checkCommaAfterRest(tt.bracketR, "type");
+        this.checkCommaAfterRest();
         return this.finishNode(restNode, "TSRestType");
       }
 
@@ -1071,6 +1072,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     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(
@@ -1079,6 +1082,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         /* topLevel */ true,
         /* end */ tt.braceR,
       );
+      this.scope.exit();
       return this.finishNode(node, "TSModuleBlock");
     }
 
@@ -1217,8 +1221,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       switch (starttype) {
         case tt._function:
-          this.next();
-          return this.parseFunction(nany, /* isStatement */ true);
+          return this.parseFunctionStatement(nany);
         case tt._class:
           return this.parseClass(
             nany,
@@ -1372,18 +1375,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return undefined;
       }
 
-      const oldInAsync = this.state.inAsync;
-      const oldInGenerator = this.state.inGenerator;
-      this.state.inAsync = true;
-      this.state.inGenerator = false;
-      res.id = null;
-      res.generator = false;
-      res.expression = true; // May be set again by parseFunctionBody.
-      res.async = true;
-      this.parseFunctionBody(res, true);
-      this.state.inAsync = oldInAsync;
-      this.state.inGenerator = oldInGenerator;
-      return this.finishNode(res, "ArrowFunctionExpression");
+      return this.parseArrowExpression(
+        res,
+        /* params are already set */ null,
+        /* async */ true,
+      );
     }
 
     tsParseTypeArguments(): N.TsTypeParameterInstantiation {
@@ -1476,10 +1472,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     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)) {
         node.returnType = this.tsParseTypeOrTypePredicateAnnotation(tt.colon);
       }
 
@@ -1494,7 +1489,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return;
       }
 
-      super.parseFunctionBodyAndFinish(node, type, allowExpressionBody);
+      super.parseFunctionBodyAndFinish(node, type, isMethod);
     }
 
     parseSubscript(
@@ -1503,6 +1498,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       startLoc: Position,
       noCalls: ?boolean,
       state: N.ParseSubscriptState,
+      maybeAsyncArrow: boolean,
     ): N.Expression {
       if (!this.hasPrecedingLineBreak() && this.match(tt.bang)) {
         this.state.exprAllowed = false;
@@ -1565,7 +1561,14 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         if (result) return result;
       }
 
-      return super.parseSubscript(base, startPos, startLoc, noCalls, state);
+      return super.parseSubscript(
+        base,
+        startPos,
+        startLoc,
+        noCalls,
+        state,
+        maybeAsyncArrow,
+      );
     }
 
     parseNewArguments(node: N.NewExpression): void {
@@ -1721,11 +1724,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       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);
+      super.parseClassMember(classBody, member, state, constructorAllowsSuper);
     }
 
     parseClassMemberWithIsStatic(
@@ -1733,6 +1737,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       member: any,
       state: { hadConstructor: boolean },
       isStatic: boolean,
+      constructorAllowsSuper: boolean,
     ): void {
       const methodOrProp: N.ClassMethod | N.ClassProperty = member;
       const prop: N.ClassProperty = member;
@@ -1773,7 +1778,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return;
       }
 
-      super.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
+      super.parseClassMemberWithIsStatic(
+        classBody,
+        member,
+        state,
+        isStatic,
+        constructorAllowsSuper,
+      );
     }
 
     parsePostMemberNameModifiers(
@@ -1923,6 +1934,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       isGenerator: boolean,
       isAsync: boolean,
       isConstructor: boolean,
+      allowsDirectSuper: boolean,
     ): void {
       const typeParameters = this.tsTryParseTypeParameters();
       if (typeParameters) method.typeParameters = typeParameters;
@@ -1932,6 +1944,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         isGenerator,
         isAsync,
         isConstructor,
+        allowsDirectSuper,
       );
     }
 
@@ -2154,7 +2167,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 {
@@ -2167,7 +2180,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         case "TSParameterProperty":
           this.checkLVal(
             expr.parameter,
-            isBinding,
+            bindingType,
             checkClashes,
             "parameter property",
           );
@@ -2177,13 +2190,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         case "TSTypeAssertion":
           this.checkLVal(
             expr.expression,
-            isBinding,
+            bindingType,
             checkClashes,
             contextDescription,
           );
           return;
         default:
-          super.checkLVal(expr, isBinding, checkClashes, contextDescription);
+          super.checkLVal(expr, bindingType, checkClashes, contextDescription);
           return;
       }
     }
@@ -2263,8 +2276,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     ): $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);
+        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);
@@ -2321,4 +2344,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       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/tokenizer/context.js b/packages/babel-parser/src/tokenizer/context.js
index 6add1a4cf7d3..1d8108874f4a 100644
--- a/packages/babel-parser/src/tokenizer/context.js
+++ b/packages/babel-parser/src/tokenizer/context.js
@@ -60,7 +60,7 @@ tt.name.updateContext = function(prevType) {
   if (prevType !== tt.dot) {
     if (
       (this.state.value === "of" && !this.state.exprAllowed) ||
-      (this.state.value === "yield" && this.state.inGenerator)
+      (this.state.value === "yield" && this.scope.inGenerator)
     ) {
       allowed = true;
     }
@@ -107,9 +107,7 @@ tt._function.updateContext = tt._class.updateContext = function(prevType) {
     prevType !== tt._else &&
     !(
       prevType === tt._return &&
-      lineBreak.test(
-        this.state.input.slice(this.state.lastTokEnd, this.state.start),
-      )
+      lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start))
     ) &&
     !(
       (prevType === tt.colon || prevType === tt.braceL) &&
diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
index f576698130f5..084a7ff9335b 100644
--- a/packages/babel-parser/src/tokenizer/index.js
+++ b/packages/babel-parser/src/tokenizer/index.js
@@ -116,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;
   }
 
@@ -175,7 +177,7 @@ export default class Tokenizer extends LocationParser {
     this.state.pos = this.state.start;
     while (this.state.pos < this.state.lineStart) {
       this.state.lineStart =
-        this.state.input.lastIndexOf("\n", this.state.lineStart - 2) + 1;
+        this.input.lastIndexOf("\n", this.state.lineStart - 2) + 1;
       --this.state.curLine;
     }
     this.nextToken();
@@ -196,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.state.length) {
+    if (this.state.pos >= this.length) {
       this.finishToken(tt.eof);
       return;
     }
@@ -204,7 +206,7 @@ export default class Tokenizer extends LocationParser {
     if (curContext.override) {
       curContext.override(this);
     } else {
-      this.getTokenFromCode(this.state.input.codePointAt(this.state.pos));
+      this.getTokenFromCode(this.input.codePointAt(this.state.pos));
     }
   }
 
@@ -234,14 +236,14 @@ export default class Tokenizer extends LocationParser {
   skipBlockComment(): void {
     const startLoc = this.state.curPosition();
     const start = this.state.pos;
-    const end = this.state.input.indexOf("*/", (this.state.pos += 2));
+    const end = this.input.indexOf("*/", (this.state.pos += 2));
     if (end === -1) this.raise(this.state.pos - 2, "Unterminated comment");
 
     this.state.pos = end + 2;
     lineBreakG.lastIndex = start;
     let match;
     while (
-      (match = lineBreakG.exec(this.state.input)) &&
+      (match = lineBreakG.exec(this.input)) &&
       match.index < this.state.pos
     ) {
       ++this.state.curLine;
@@ -250,7 +252,7 @@ export default class Tokenizer extends LocationParser {
 
     this.pushComment(
       true,
-      this.state.input.slice(start + 2, end),
+      this.input.slice(start + 2, end),
       start,
       this.state.pos,
       startLoc,
@@ -261,22 +263,22 @@ export default class Tokenizer extends LocationParser {
   skipLineComment(startSkip: number): void {
     const start = this.state.pos;
     const startLoc = this.state.curPosition();
-    let ch = this.state.input.charCodeAt((this.state.pos += startSkip));
-    if (this.state.pos < this.state.length) {
+    let ch = this.input.charCodeAt((this.state.pos += startSkip));
+    if (this.state.pos < this.length) {
       while (
         ch !== charCodes.lineFeed &&
         ch !== charCodes.carriageReturn &&
         ch !== charCodes.lineSeparator &&
         ch !== charCodes.paragraphSeparator &&
-        ++this.state.pos < this.state.length
+        ++this.state.pos < this.length
       ) {
-        ch = this.state.input.charCodeAt(this.state.pos);
+        ch = this.input.charCodeAt(this.state.pos);
       }
     }
 
     this.pushComment(
       false,
-      this.state.input.slice(start + startSkip, this.state.pos),
+      this.input.slice(start + startSkip, this.state.pos),
       start,
       this.state.pos,
       startLoc,
@@ -288,8 +290,8 @@ export default class Tokenizer extends LocationParser {
   // whitespace and comments, and.
 
   skipSpace(): void {
-    loop: while (this.state.pos < this.state.length) {
-      const ch = this.state.input.charCodeAt(this.state.pos);
+    loop: while (this.state.pos < this.length) {
+      const ch = this.input.charCodeAt(this.state.pos);
       switch (ch) {
         case charCodes.space:
         case charCodes.nonBreakingSpace:
@@ -298,8 +300,7 @@ export default class Tokenizer extends LocationParser {
           break;
         case charCodes.carriageReturn:
           if (
-            this.state.input.charCodeAt(this.state.pos + 1) ===
-            charCodes.lineFeed
+            this.input.charCodeAt(this.state.pos + 1) === charCodes.lineFeed
           ) {
             ++this.state.pos;
           }
@@ -313,7 +314,7 @@ export default class Tokenizer extends LocationParser {
           break;
 
         case charCodes.slash:
-          switch (this.state.input.charCodeAt(this.state.pos + 1)) {
+          switch (this.input.charCodeAt(this.state.pos + 1)) {
             case charCodes.asterisk:
               this.skipBlockComment();
               break;
@@ -368,7 +369,7 @@ export default class Tokenizer extends LocationParser {
     }
 
     const nextPos = this.state.pos + 1;
-    const next = this.state.input.charCodeAt(nextPos);
+    const next = this.input.charCodeAt(nextPos);
     if (next >= charCodes.digit0 && next <= charCodes.digit9) {
       this.raise(this.state.pos, "Unexpected digit after hash token");
     }
@@ -391,13 +392,13 @@ export default class Tokenizer extends LocationParser {
   }
 
   readToken_dot(): void {
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
     if (next >= charCodes.digit0 && next <= charCodes.digit9) {
       this.readNumber(true);
       return;
     }
 
-    const next2 = this.state.input.charCodeAt(this.state.pos + 2);
+    const next2 = this.input.charCodeAt(this.state.pos + 2);
     if (next === charCodes.dot && next2 === charCodes.dot) {
       this.state.pos += 3;
       this.finishToken(tt.ellipsis);
@@ -415,7 +416,7 @@ export default class Tokenizer extends LocationParser {
       return;
     }
 
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
     if (next === charCodes.equalsTo) {
       this.finishOp(tt.assign, 2);
     } else {
@@ -424,12 +425,12 @@ export default class Tokenizer extends LocationParser {
   }
 
   readToken_interpreter(): boolean {
-    if (this.state.pos !== 0 || this.state.length < 2) return false;
+    if (this.state.pos !== 0 || this.length < 2) return false;
 
     const start = this.state.pos;
     this.state.pos += 1;
 
-    let ch = this.state.input.charCodeAt(this.state.pos);
+    let ch = this.input.charCodeAt(this.state.pos);
     if (ch !== charCodes.exclamationMark) return false;
 
     while (
@@ -437,12 +438,12 @@ export default class Tokenizer extends LocationParser {
       ch !== charCodes.carriageReturn &&
       ch !== charCodes.lineSeparator &&
       ch !== charCodes.paragraphSeparator &&
-      ++this.state.pos < this.state.length
+      ++this.state.pos < this.length
     ) {
-      ch = this.state.input.charCodeAt(this.state.pos);
+      ch = this.input.charCodeAt(this.state.pos);
     }
 
-    const value = this.state.input.slice(start + 2, this.state.pos);
+    const value = this.input.slice(start + 2, this.state.pos);
 
     this.finishToken(tt.interpreterDirective, value);
 
@@ -453,13 +454,13 @@ export default class Tokenizer extends LocationParser {
     // '%*'
     let type = code === charCodes.asterisk ? tt.star : tt.modulo;
     let width = 1;
-    let next = this.state.input.charCodeAt(this.state.pos + 1);
+    let next = this.input.charCodeAt(this.state.pos + 1);
     const exprAllowed = this.state.exprAllowed;
 
     // Exponentiation operator **
     if (code === charCodes.asterisk && next === charCodes.asterisk) {
       width++;
-      next = this.state.input.charCodeAt(this.state.pos + 2);
+      next = this.input.charCodeAt(this.state.pos + 2);
       type = tt.exponent;
     }
 
@@ -473,12 +474,10 @@ export default class Tokenizer extends LocationParser {
 
   readToken_pipe_amp(code: number): void {
     // '||' '&&' '||=' '&&='
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
 
     if (next === code) {
-      if (
-        this.state.input.charCodeAt(this.state.pos + 2) === charCodes.equalsTo
-      ) {
+      if (this.input.charCodeAt(this.state.pos + 2) === charCodes.equalsTo) {
         this.finishOp(tt.assign, 3);
       } else {
         this.finishOp(
@@ -510,7 +509,7 @@ export default class Tokenizer extends LocationParser {
 
   readToken_caret(): void {
     // '^'
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
     if (next === charCodes.equalsTo) {
       this.finishOp(tt.assign, 2);
     } else {
@@ -520,17 +519,14 @@ export default class Tokenizer extends LocationParser {
 
   readToken_plus_min(code: number): void {
     // '+-'
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
 
     if (next === code) {
       if (
         next === charCodes.dash &&
         !this.inModule &&
-        this.state.input.charCodeAt(this.state.pos + 2) ===
-          charCodes.greaterThan &&
-        lineBreak.test(
-          this.state.input.slice(this.state.lastTokEnd, this.state.pos),
-        )
+        this.input.charCodeAt(this.state.pos + 2) === charCodes.greaterThan &&
+        lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.pos))
       ) {
         // A `-->` line comment
         this.skipLineComment(3);
@@ -551,20 +547,16 @@ export default class Tokenizer extends LocationParser {
 
   readToken_lt_gt(code: number): void {
     // '<>'
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
     let size = 1;
 
     if (next === code) {
       size =
         code === charCodes.greaterThan &&
-        this.state.input.charCodeAt(this.state.pos + 2) ===
-          charCodes.greaterThan
+        this.input.charCodeAt(this.state.pos + 2) === charCodes.greaterThan
           ? 3
           : 2;
-      if (
-        this.state.input.charCodeAt(this.state.pos + size) ===
-        charCodes.equalsTo
-      ) {
+      if (this.input.charCodeAt(this.state.pos + size) === charCodes.equalsTo) {
         this.finishOp(tt.assign, size + 1);
         return;
       }
@@ -576,8 +568,8 @@ export default class Tokenizer extends LocationParser {
       next === charCodes.exclamationMark &&
       code === charCodes.lessThan &&
       !this.inModule &&
-      this.state.input.charCodeAt(this.state.pos + 2) === charCodes.dash &&
-      this.state.input.charCodeAt(this.state.pos + 3) === charCodes.dash
+      this.input.charCodeAt(this.state.pos + 2) === charCodes.dash &&
+      this.input.charCodeAt(this.state.pos + 3) === charCodes.dash
     ) {
       // `<!--`, an XML-style comment that should be interpreted as a line comment
       this.skipLineComment(4);
@@ -596,11 +588,11 @@ export default class Tokenizer extends LocationParser {
 
   readToken_eq_excl(code: number): void {
     // '=!'
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
+    const next = this.input.charCodeAt(this.state.pos + 1);
     if (next === charCodes.equalsTo) {
       this.finishOp(
         tt.equality,
-        this.state.input.charCodeAt(this.state.pos + 2) === charCodes.equalsTo
+        this.input.charCodeAt(this.state.pos + 2) === charCodes.equalsTo
           ? 3
           : 2,
       );
@@ -617,8 +609,8 @@ export default class Tokenizer extends LocationParser {
 
   readToken_question(): void {
     // '?'
-    const next = this.state.input.charCodeAt(this.state.pos + 1);
-    const next2 = this.state.input.charCodeAt(this.state.pos + 2);
+    const next = this.input.charCodeAt(this.state.pos + 1);
+    const next2 = this.input.charCodeAt(this.state.pos + 2);
     if (next === charCodes.questionMark && !this.state.inType) {
       if (next2 === charCodes.equalsTo) {
         // '??='
@@ -686,7 +678,7 @@ export default class Tokenizer extends LocationParser {
       case charCodes.colon:
         if (
           this.hasPlugin("functionBind") &&
-          this.state.input.charCodeAt(this.state.pos + 1) === charCodes.colon
+          this.input.charCodeAt(this.state.pos + 1) === charCodes.colon
         ) {
           this.finishOp(tt.doubleColon, 2);
         } else {
@@ -705,7 +697,7 @@ export default class Tokenizer extends LocationParser {
         return;
 
       case charCodes.digit0: {
-        const next = this.state.input.charCodeAt(this.state.pos + 1);
+        const next = this.input.charCodeAt(this.state.pos + 1);
         // '0x', '0X' - hex number
         if (next === charCodes.lowercaseX || next === charCodes.uppercaseX) {
           this.readRadixNumber(16);
@@ -811,7 +803,7 @@ export default class Tokenizer extends LocationParser {
   }
 
   finishOp(type: TokenType, size: number): void {
-    const str = this.state.input.slice(this.state.pos, this.state.pos + size);
+    const str = this.input.slice(this.state.pos, this.state.pos + size);
     this.state.pos += size;
     this.finishToken(type, str);
   }
@@ -820,10 +812,10 @@ export default class Tokenizer extends LocationParser {
     const start = this.state.pos;
     let escaped, inClass;
     for (;;) {
-      if (this.state.pos >= this.state.length) {
+      if (this.state.pos >= this.length) {
         this.raise(start, "Unterminated regular expression");
       }
-      const ch = this.state.input.charAt(this.state.pos);
+      const ch = this.input.charAt(this.state.pos);
       if (lineBreak.test(ch)) {
         this.raise(start, "Unterminated regular expression");
       }
@@ -841,14 +833,14 @@ export default class Tokenizer extends LocationParser {
       }
       ++this.state.pos;
     }
-    const content = this.state.input.slice(start, this.state.pos);
+    const content = this.input.slice(start, this.state.pos);
     ++this.state.pos;
 
     let mods = "";
 
-    while (this.state.pos < this.state.length) {
-      const char = this.state.input[this.state.pos];
-      const charCode = this.state.input.codePointAt(this.state.pos);
+    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.has(char)) {
         if (mods.indexOf(char) > -1) {
@@ -895,12 +887,12 @@ export default class Tokenizer extends LocationParser {
     let total = 0;
 
     for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
-      const code = this.state.input.charCodeAt(this.state.pos);
+      const code = this.input.charCodeAt(this.state.pos);
       let val;
 
       if (this.hasPlugin("numericSeparator")) {
-        const prev = this.state.input.charCodeAt(this.state.pos - 1);
-        const next = this.state.input.charCodeAt(this.state.pos + 1);
+        const prev = this.input.charCodeAt(this.state.pos - 1);
+        const next = this.input.charCodeAt(this.state.pos + 1);
         if (code === charCodes.underscore) {
           if (allowedSiblings.indexOf(next) === -1) {
             this.raise(this.state.pos, "Invalid or unexpected token");
@@ -954,22 +946,18 @@ export default class Tokenizer extends LocationParser {
     }
 
     if (this.hasPlugin("bigInt")) {
-      if (
-        this.state.input.charCodeAt(this.state.pos) === charCodes.lowercaseN
-      ) {
+      if (this.input.charCodeAt(this.state.pos) === charCodes.lowercaseN) {
         ++this.state.pos;
         isBigInt = true;
       }
     }
 
-    if (isIdentifierStart(this.state.input.codePointAt(this.state.pos))) {
+    if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
       this.raise(this.state.pos, "Identifier directly after number");
     }
 
     if (isBigInt) {
-      const str = this.state.input
-        .slice(start, this.state.pos)
-        .replace(/[_n]/g, "");
+      const str = this.input.slice(start, this.state.pos).replace(/[_n]/g, "");
       this.finishToken(tt.bigint, str);
       return;
     }
@@ -989,7 +977,7 @@ export default class Tokenizer extends LocationParser {
     }
     let octal =
       this.state.pos - start >= 2 &&
-      this.state.input.charCodeAt(start) === charCodes.digit0;
+      this.input.charCodeAt(start) === charCodes.digit0;
     if (octal) {
       if (this.state.strict) {
         this.raise(
@@ -997,30 +985,30 @@ export default class Tokenizer extends LocationParser {
           "Legacy octal literals are not allowed in strict mode",
         );
       }
-      if (/[89]/.test(this.state.input.slice(start, this.state.pos))) {
+      if (/[89]/.test(this.input.slice(start, this.state.pos))) {
         octal = false;
       }
     }
 
-    let next = this.state.input.charCodeAt(this.state.pos);
+    let next = this.input.charCodeAt(this.state.pos);
     if (next === charCodes.dot && !octal) {
       ++this.state.pos;
       this.readInt(10);
       isFloat = true;
-      next = this.state.input.charCodeAt(this.state.pos);
+      next = this.input.charCodeAt(this.state.pos);
     }
 
     if (
       (next === charCodes.uppercaseE || next === charCodes.lowercaseE) &&
       !octal
     ) {
-      next = this.state.input.charCodeAt(++this.state.pos);
+      next = this.input.charCodeAt(++this.state.pos);
       if (next === charCodes.plusSign || next === charCodes.dash) {
         ++this.state.pos;
       }
       if (this.readInt(10) === null) this.raise(start, "Invalid number");
       isFloat = true;
-      next = this.state.input.charCodeAt(this.state.pos);
+      next = this.input.charCodeAt(this.state.pos);
     }
 
     if (this.hasPlugin("bigInt")) {
@@ -1032,14 +1020,12 @@ export default class Tokenizer extends LocationParser {
       }
     }
 
-    if (isIdentifierStart(this.state.input.codePointAt(this.state.pos))) {
+    if (isIdentifierStart(this.input.codePointAt(this.state.pos))) {
       this.raise(this.state.pos, "Identifier directly after number");
     }
 
     // remove "_" for numeric literal separator, and "n" for BigInts
-    const str = this.state.input
-      .slice(start, this.state.pos)
-      .replace(/[_n]/g, "");
+    const str = this.input.slice(start, this.state.pos).replace(/[_n]/g, "");
 
     if (isBigInt) {
       this.finishToken(tt.bigint, str);
@@ -1053,13 +1039,13 @@ export default class Tokenizer extends LocationParser {
   // Read a string value, interpreting backslash-escapes.
 
   readCodePoint(throwOnInvalid: boolean): number | null {
-    const ch = this.state.input.charCodeAt(this.state.pos);
+    const ch = this.input.charCodeAt(this.state.pos);
     let code;
 
     if (ch === charCodes.leftCurlyBrace) {
       const codePos = ++this.state.pos;
       code = this.readHexChar(
-        this.state.input.indexOf("}", this.state.pos) - this.state.pos,
+        this.input.indexOf("}", this.state.pos) - this.state.pos,
         throwOnInvalid,
       );
       ++this.state.pos;
@@ -1084,13 +1070,13 @@ export default class Tokenizer extends LocationParser {
     let out = "",
       chunkStart = ++this.state.pos;
     for (;;) {
-      if (this.state.pos >= this.state.length) {
+      if (this.state.pos >= this.length) {
         this.raise(this.state.start, "Unterminated string constant");
       }
-      const ch = this.state.input.charCodeAt(this.state.pos);
+      const ch = this.input.charCodeAt(this.state.pos);
       if (ch === quote) break;
       if (ch === charCodes.backslash) {
-        out += this.state.input.slice(chunkStart, this.state.pos);
+        out += this.input.slice(chunkStart, this.state.pos);
         // $FlowFixMe
         out += this.readEscapedChar(false);
         chunkStart = this.state.pos;
@@ -1106,7 +1092,7 @@ export default class Tokenizer extends LocationParser {
         ++this.state.pos;
       }
     }
-    out += this.state.input.slice(chunkStart, this.state.pos++);
+    out += this.input.slice(chunkStart, this.state.pos++);
     this.finishToken(tt.string, out);
   }
 
@@ -1117,14 +1103,14 @@ export default class Tokenizer extends LocationParser {
       chunkStart = this.state.pos,
       containsInvalid = false;
     for (;;) {
-      if (this.state.pos >= this.state.length) {
+      if (this.state.pos >= this.length) {
         this.raise(this.state.start, "Unterminated template");
       }
-      const ch = this.state.input.charCodeAt(this.state.pos);
+      const ch = this.input.charCodeAt(this.state.pos);
       if (
         ch === charCodes.graveAccent ||
         (ch === charCodes.dollarSign &&
-          this.state.input.charCodeAt(this.state.pos + 1) ===
+          this.input.charCodeAt(this.state.pos + 1) ===
             charCodes.leftCurlyBrace)
       ) {
         if (this.state.pos === this.state.start && this.match(tt.template)) {
@@ -1138,12 +1124,12 @@ export default class Tokenizer extends LocationParser {
             return;
           }
         }
-        out += this.state.input.slice(chunkStart, this.state.pos);
+        out += this.input.slice(chunkStart, this.state.pos);
         this.finishToken(tt.template, containsInvalid ? null : out);
         return;
       }
       if (ch === charCodes.backslash) {
-        out += this.state.input.slice(chunkStart, this.state.pos);
+        out += this.input.slice(chunkStart, this.state.pos);
         const escaped = this.readEscapedChar(true);
         if (escaped === null) {
           containsInvalid = true;
@@ -1152,13 +1138,11 @@ export default class Tokenizer extends LocationParser {
         }
         chunkStart = this.state.pos;
       } else if (isNewLine(ch)) {
-        out += this.state.input.slice(chunkStart, this.state.pos);
+        out += this.input.slice(chunkStart, this.state.pos);
         ++this.state.pos;
         switch (ch) {
           case charCodes.carriageReturn:
-            if (
-              this.state.input.charCodeAt(this.state.pos) === charCodes.lineFeed
-            ) {
+            if (this.input.charCodeAt(this.state.pos) === charCodes.lineFeed) {
               ++this.state.pos;
             }
           case charCodes.lineFeed:
@@ -1181,7 +1165,7 @@ export default class Tokenizer extends LocationParser {
 
   readEscapedChar(inTemplate: boolean): string | null {
     const throwOnInvalid = !inTemplate;
-    const ch = this.state.input.charCodeAt(++this.state.pos);
+    const ch = this.input.charCodeAt(++this.state.pos);
     ++this.state.pos;
     switch (ch) {
       case charCodes.lowercaseN:
@@ -1205,9 +1189,7 @@ export default class Tokenizer extends LocationParser {
       case charCodes.lowercaseF:
         return "\f";
       case charCodes.carriageReturn:
-        if (
-          this.state.input.charCodeAt(this.state.pos) === charCodes.lineFeed
-        ) {
+        if (this.input.charCodeAt(this.state.pos) === charCodes.lineFeed) {
           ++this.state.pos;
         }
       case charCodes.lineFeed:
@@ -1220,7 +1202,7 @@ export default class Tokenizer extends LocationParser {
         if (ch >= charCodes.digit0 && ch <= charCodes.digit7) {
           const codePos = this.state.pos - 1;
           // $FlowFixMe
-          let octalStr = this.state.input
+          let octalStr = this.input
             .substr(this.state.pos - 1, 3)
             .match(/^[0-7]+/)[0];
           let octal = parseInt(octalStr, 8);
@@ -1277,8 +1259,8 @@ export default class Tokenizer extends LocationParser {
     const start = this.state.pos;
     let chunkStart = this.state.pos;
 
-    while (this.state.pos < this.state.length) {
-      const ch = this.state.input.codePointAt(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) {
@@ -1286,14 +1268,12 @@ export default class Tokenizer extends LocationParser {
       } else if (ch === charCodes.backslash) {
         this.state.containsEsc = true;
 
-        word += this.state.input.slice(chunkStart, this.state.pos);
+        word += this.input.slice(chunkStart, this.state.pos);
         const escStart = this.state.pos;
         const identifierCheck =
           this.state.pos === start ? isIdentifierStart : isIdentifierChar;
 
-        if (
-          this.state.input.charCodeAt(++this.state.pos) !== charCodes.lowercaseU
-        ) {
+        if (this.input.charCodeAt(++this.state.pos) !== charCodes.lowercaseU) {
           this.raise(
             this.state.pos,
             "Expecting Unicode escape sequence \\uXXXX",
@@ -1317,7 +1297,7 @@ export default class Tokenizer extends LocationParser {
         break;
       }
     }
-    return word + this.state.input.slice(chunkStart, this.state.pos);
+    return word + this.input.slice(chunkStart, this.state.pos);
   }
 
   isIterator(word: string): boolean {
@@ -1329,7 +1309,7 @@ export default class Tokenizer extends LocationParser {
 
   readWord(): void {
     const word = this.readWord1();
-    const type = keywordTypes[word] || tt.name;
+    const type = keywordTypes.get(word) || tt.name;
 
     if (type.keyword && this.state.containsEsc) {
       this.raise(this.state.pos, `Escape sequence in keyword ${word}`);
@@ -1366,7 +1346,7 @@ export default class Tokenizer extends LocationParser {
       (prevType === tt.name && this.state.exprAllowed)
     ) {
       return lineBreak.test(
-        this.state.input.slice(this.state.lastTokEnd, this.state.start),
+        this.input.slice(this.state.lastTokEnd, this.state.start),
       );
     }
 
diff --git a/packages/babel-parser/src/tokenizer/state.js b/packages/babel-parser/src/tokenizer/state.js
index 24f58f042031..bd7efa5f3dab 100644
--- a/packages/babel-parser/src/tokenizer/state.js
+++ b/packages/babel-parser/src/tokenizer/state.js
@@ -23,9 +23,6 @@ type TopicContextState = {
 
 export default class State {
   strict: boolean;
-  input: string;
-  length: number;
-
   curLine: number;
 
   // And, if locations are used, the {line, column} object
@@ -33,13 +30,10 @@ export default class State {
   startLoc: Position;
   endLoc: Position;
 
-  init(options: Options, input: string): void {
+  init(options: Options): void {
     this.strict =
       options.strictMode === false ? false : options.sourceType === "module";
 
-    this.input = input;
-    this.length = input.length;
-
     this.curLine = options.startLine;
     this.startLoc = this.endLoc = this.curPosition();
   }
@@ -66,13 +60,9 @@ export default class State {
   // and then convert them, we need to track it.
   commaAfterSpreadAt: number = -1;
 
-  // Flags to track whether we are in a function, a generator.
-  inFunction: boolean = false;
+  // Flags to track
   inParameters: boolean = false;
   maybeInArrowParameters: boolean = false;
-  inGenerator: boolean = false;
-  inMethod: boolean | N.MethodKind = false;
-  inAsync: boolean = false;
   inPipeline: boolean = false;
   inType: boolean = false;
   noAnonFunctionType: boolean = false;
diff --git a/packages/babel-parser/src/tokenizer/types.js b/packages/babel-parser/src/tokenizer/types.js
index ea9f15c7082a..2301759f3892 100644
--- a/packages/babel-parser/src/tokenizer/types.js
+++ b/packages/babel-parser/src/tokenizer/types.js
@@ -32,7 +32,6 @@ const postfix = true;
 
 type TokenOptions = {
   keyword?: string,
-
   beforeExpr?: boolean,
   startsExpr?: boolean,
   rightAssociative?: boolean,
@@ -66,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 });
 }
 
@@ -133,74 +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: BinopTokenType("|>", 0),
-  nullishCoalescing: BinopTokenType("??", 1),
-  logicalOR: BinopTokenType("||", 1),
-  logicalAND: BinopTokenType("&&", 2),
-  bitwiseOR: BinopTokenType("|", 3),
-  bitwiseXOR: BinopTokenType("^", 4),
-  bitwiseAND: BinopTokenType("&", 5),
-  equality: BinopTokenType("==/!=", 6),
-  relational: BinopTokenType("</>", 7),
-  bitShift: 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: BinopTokenType("%", 10),
-  star: BinopTokenType("*", 10),
-  slash: BinopTokenType("/", 10),
+  modulo: createBinop("%", 10),
+  star: createBinop("*", 10),
+  slash: createBinop("/", 10),
   exponent: new TokenType("**", {
     beforeExpr,
     binop: 11,
     rightAssociative: true,
   }),
-};
 
-function makeKeywordProps(
-  name: string,
-  conf: any,
-): PropertyDescriptor<TokenType> {
-  return { value: KeywordTokenType(name, conf), enumerable: true };
-}
-
-// $FlowIssue
-export const keywords = Object.create(null, {
-  break: makeKeywordProps("break"),
-  case: makeKeywordProps("case", { beforeExpr }),
-  catch: makeKeywordProps("catch"),
-  continue: makeKeywordProps("continue"),
-  debugger: makeKeywordProps("debugger"),
-  default: makeKeywordProps("default", { beforeExpr }),
-  do: makeKeywordProps("do", { isLoop, beforeExpr }),
-  else: makeKeywordProps("else", { beforeExpr }),
-  finally: makeKeywordProps("finally"),
-  for: makeKeywordProps("for", { isLoop }),
-  function: makeKeywordProps("function", { startsExpr }),
-  if: makeKeywordProps("if"),
-  return: makeKeywordProps("return", { beforeExpr }),
-  switch: makeKeywordProps("switch"),
-  throw: makeKeywordProps("throw", { beforeExpr, prefix, startsExpr }),
-  try: makeKeywordProps("try"),
-  var: makeKeywordProps("var"),
-  const: makeKeywordProps("const"),
-  while: makeKeywordProps("while", { isLoop }),
-  with: makeKeywordProps("with"),
-  new: makeKeywordProps("new", { beforeExpr, startsExpr }),
-  this: makeKeywordProps("this", { startsExpr }),
-  super: makeKeywordProps("super", { startsExpr }),
-  class: makeKeywordProps("class", { startsExpr }),
-  extends: makeKeywordProps("extends", { beforeExpr }),
-  export: makeKeywordProps("export"),
-  import: makeKeywordProps("import", { startsExpr }),
-  null: makeKeywordProps("null", { startsExpr }),
-  true: makeKeywordProps("true", { startsExpr }),
-  false: makeKeywordProps("false", { startsExpr }),
-  in: makeKeywordProps("in", { beforeExpr, binop: 7 }),
-  instanceof: makeKeywordProps("instanceof", { beforeExpr, binop: 7 }),
-  typeof: makeKeywordProps("typeof", { beforeExpr, prefix, startsExpr }),
-  void: makeKeywordProps("void", { beforeExpr, prefix, startsExpr }),
-  delete: makeKeywordProps("delete", { beforeExpr, prefix, startsExpr }),
-});
-
-// Map keyword names to token types.
-Object.keys(keywords).forEach(name => {
-  types["_" + name] = keywords[name];
-});
+  // 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 }),
+};
diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js
index fe8e7070590e..cc1fd01f305c 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",
@@ -340,6 +346,8 @@ export type VariableDeclarator = NodeBase & {
 
 // Misc
 
+export type ArgumentPlaceholder = NodeBase & { type: "ArgumentPlaceholder" };
+
 export type Decorator = NodeBase & {
   type: "Decorator",
   expression: Expression,
@@ -685,6 +693,7 @@ export type ClassBody = NodeBase & {
   type: "ClassBody",
   body: Array<ClassMember | TsIndexSignature>, // TODO: $ReadOnlyArray
 };
+// | Placeholder<"ClassBody">;
 
 export type ClassMemberBase = NodeBase &
   HasDecorators & {
@@ -836,6 +845,7 @@ export type ExportNamedDeclaration = NodeBase & {
 export type ExportSpecifier = NodeBase & {
   type: "ExportSpecifier",
   exported: Identifier,
+  local: Identifier,
 };
 
 export type ExportDefaultSpecifier = NodeBase & {
@@ -1423,6 +1433,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 d8fa87603c1d..7fda0e27de71 100644
--- a/packages/babel-parser/src/util/identifier.js
+++ b/packages/babel-parser/src/util/identifier.js
@@ -3,6 +3,7 @@
 // @flow
 
 import * as charCodes from "charcodes";
+import { keywords } from "../tokenizer/types";
 
 const reservedWords = {
   strict: [
@@ -52,44 +53,6 @@ export function isStrictBindReservedWord(
   return isReservedWord(word, inModule) || reservedWordsStrictBindSet.has(word);
 }
 
-const keywords = new Set([
-  "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",
-  "const",
-  "class",
-  "extends",
-  "export",
-  "import",
-  "super",
-]);
-
 export function isKeyword(word: string): boolean {
   return keywords.has(word);
 }
@@ -98,16 +61,16 @@ 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 + "]",
@@ -124,9 +87,9 @@ 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
diff --git a/packages/babel-parser/src/util/scope.js b/packages/babel-parser/src/util/scope.js
new file mode 100644
index 000000000000..a9cf9d89edea
--- /dev/null
+++ b/packages/babel-parser/src/util/scope.js
@@ -0,0 +1,178 @@
+// @flow
+import {
+  SCOPE_ARROW,
+  SCOPE_ASYNC,
+  SCOPE_DIRECT_SUPER,
+  SCOPE_FUNCTION,
+  SCOPE_GENERATOR,
+  SCOPE_SIMPLE_CATCH,
+  SCOPE_SUPER,
+  SCOPE_PROGRAM,
+  SCOPE_VAR,
+  BIND_SIMPLE_CATCH,
+  BIND_LEXICAL,
+  BIND_FUNCTION,
+  type ScopeFlags,
+  type BindingTypes,
+  SCOPE_CLASS,
+} from "./scopeflags";
+import * as N from "../types";
+
+// Start an AST node, attaching a start offset.
+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 {
+  scopeStack: Array<Scope> = [];
+  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());
+  }
+
+  enter(flags: ScopeFlags) {
+    this.scopeStack.push(new Scope(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: Scope): boolean {
+    return !!(
+      scope.flags & SCOPE_FUNCTION ||
+      (!this.inModule && scope.flags & SCOPE_PROGRAM)
+    );
+  }
+
+  declareName(name: string, bindingType: ?BindingTypes, pos: number) {
+    let redeclared = false;
+    if (bindingType === BIND_LEXICAL) {
+      const scope = this.currentScope();
+      redeclared =
+        scope.lexical.indexOf(name) > -1 ||
+        scope.functions.indexOf(name) > -1 ||
+        scope.var.indexOf(name) > -1;
+      scope.lexical.push(name);
+      if (this.inModule && scope.flags & SCOPE_PROGRAM) {
+        this.undefinedExports.delete(name);
+      }
+    } else if (bindingType === BIND_SIMPLE_CATCH) {
+      const scope = this.currentScope();
+      scope.lexical.push(name);
+    } else if (bindingType === BIND_FUNCTION) {
+      const scope = this.currentScope();
+      if (this.treatFunctionsAsVar) {
+        redeclared = scope.lexical.indexOf(name) > -1;
+      } else {
+        redeclared =
+          scope.lexical.indexOf(name) > -1 || scope.var.indexOf(name) > -1;
+      }
+      scope.functions.push(name);
+    } else {
+      for (let i = this.scopeStack.length - 1; i >= 0; --i) {
+        const scope = this.scopeStack[i];
+        if (
+          (scope.lexical.indexOf(name) > -1 &&
+            !(scope.flags & SCOPE_SIMPLE_CATCH && scope.lexical[0] === name)) ||
+          (!this.treatFunctionsAsVarInScope(scope) &&
+            scope.functions.indexOf(name) > -1)
+        ) {
+          redeclared = true;
+          break;
+        }
+        scope.var.push(name);
+
+        if (this.inModule && scope.flags & SCOPE_PROGRAM) {
+          this.undefinedExports.delete(name);
+        }
+
+        if (scope.flags & SCOPE_VAR) break;
+      }
+    }
+    if (redeclared) {
+      this.raise(pos, `Identifier '${name}' has already been declared`);
+    }
+  }
+
+  checkLocalExport(id: N.Identifier) {
+    // scope.functions must be empty as Module code is always strict.
+    if (
+      this.scopeStack[0].lexical.indexOf(id.name) === -1 &&
+      this.scopeStack[0].var.indexOf(id.name) === -1
+    ) {
+      this.undefinedExports.set(id.name, id.start);
+    }
+  }
+
+  currentScope(): Scope {
+    return this.scopeStack[this.scopeStack.length - 1];
+  }
+
+  // $FlowIgnore
+  currentVarScope(): Scope {
+    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(): Scope {
+    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..35ba7fe30301
--- /dev/null
+++ b/packages/babel-parser/src/util/scopeflags.js
@@ -0,0 +1,52 @@
+// @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)
+  );
+}
+
+// Used in checkLVal and declareName to determine the type of a binding
+export const BIND_NONE = 0, // Not a binding
+  BIND_VAR = 1, // Var-style binding
+  BIND_LEXICAL = 2, // Let- or const-style binding
+  BIND_FUNCTION = 3, // Function declaration
+  BIND_SIMPLE_CATCH = 4, // Simple (identifier pattern) catch binding
+  BIND_OUTSIDE = 5; // Special case for function names as bound inside the function
+
+export type BindingTypes =
+  | typeof BIND_NONE
+  | typeof BIND_VAR
+  | typeof BIND_LEXICAL
+  | typeof BIND_FUNCTION
+  | typeof BIND_SIMPLE_CATCH
+  | typeof BIND_OUTSIDE;
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/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
index c1cad1bfedad..05a7826ae8ba 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Function declaration not allowed in this context (1:10)"
+  "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/options.json b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/options.json
index 1397e6a76220..395620bfa2f8 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Function declaration not allowed in this context (1:20)"
+  "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/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..b576780b7063
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/output.json
@@ -0,0 +1,207 @@
+{
+  "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": []
+          }
+        },
+        "guardedHandlers": [],
+        "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..677fad5fcdc7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/output.json
@@ -0,0 +1,169 @@
+{
+  "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": []
+          }
+        },
+        "guardedHandlers": [],
+        "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..6b4c229346ab
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/output.json
@@ -0,0 +1,254 @@
+{
+  "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": []
+                  }
+                },
+                "guardedHandlers": [],
+                "finalizer": null
+              }
+            ],
+            "directives": []
+          }
+        },
+        "guardedHandlers": [],
+        "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..439f7f105f01
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/output.json
@@ -0,0 +1,169 @@
+{
+  "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": []
+          }
+        },
+        "guardedHandlers": [],
+        "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..66d668784cab
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/output.json
@@ -0,0 +1,170 @@
+{
+  "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": []
+          }
+        },
+        "guardedHandlers": [],
+        "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-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/396/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/396/options.json
index 029befcedaa1..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": "The rest parameter must be the last parameter (1:18)"
+  "throws": "Rest element must be last element (1:18)"
 }
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/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/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/555/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json
index baad06556ff8..c1c6450ba3c0 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "The rest parameter must be the last parameter (3:13)"
+  "throws": "Rest element must be last element (3:13)"
 }
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/options.json b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/options.json
index a85e470aeb8b..daa827f45cc4 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "A trailing comma is not permitted after the rest element (1:5)"
+  "throws": "Rest element must be last element (1:5)"
 }
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 083dcaaa2cb0..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,3 +1,3 @@
 {
-  "throws": "The rest element must be the last element (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/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/options.json
index d866b41af70c..65ed8c638978 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "A trailing comma is not permitted after the rest parameter (1:8)"
+  "throws": "Rest element must be last element (1:8)"
 }
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
index baad06556ff8..c1c6450ba3c0 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "The rest parameter must be the last parameter (3:13)"
+  "throws": "Rest element must be last element (3:13)"
 }
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 faef53359bea..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,3 +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/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/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/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/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-destructuring10/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring10/options.json
index c8c111d88d34..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,3 +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 cf1dcd59dc8e..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,3 +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 c2f8cdda986d..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,3 +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 1cd229e76cc6..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,3 +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 e6aaa311fc54..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,3 +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 4eb6f26f952b..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,3 +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 4f3ba9d9d20a..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,3 +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 dab0e075b01d..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,3 +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 7ee0cc434182..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,3 +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 72b54a0a77cb..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,3 +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 f28333f6f8ad..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,3 +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 1923e4752336..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,3 +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 37d131b70f3c..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,3 +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 1923e4752336..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,3 +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 37d131b70f3c..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,3 +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 f28333f6f8ad..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,3 +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 8ef246d83cc0..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,3 +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 6b46482b6ed6..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,3 +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/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/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/statements/label-invalid-const/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-const/options.json
index 91b308200e05..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": "Unexpected token (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 042d7e196224..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": "Function declaration not allowed in this context (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 91b308200e05..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": "Unexpected token (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 ee5cd5b13513..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": "Function declaration not allowed in this context (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/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/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/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/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/277/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/277/options.json
index 029befcedaa1..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": "The rest parameter must be the last parameter (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 3ead3a4299f8..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": "The rest parameter must be the last parameter (1:5)"
+  "throws": "Rest element must be last element (1:5)"
 }
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/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/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/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/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/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/options.json
index c1cad1bfedad..4bcd823e98be 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Function declaration not allowed in this context (1:10)"
+  "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/params-invalid-rest-trailing-comma/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/params-invalid-rest-trailing-comma/options.json
index 231d5fccd5ff..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 parameter (1:11)"
+  "throws": "Rest element must be last element (1:11)"
 }
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
index b382a06ac5d7..6dad74eebd16 100644
--- 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
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:23)"
+  "throws": "Identifier 'foo' has already been declared (2:23)"
 }
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
index d6149ed84502..165223a448a3 100644
--- 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
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "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/es2018/object-rest-spread/13/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/options.json
index 8daa306ff731..68df28e41c41 100644
--- 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
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:30)"
+  "throws": "Identifier 'foo' has already been declared (2:30)"
 }
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
index a87b46d55ac6..280073b140f0 100644
--- 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
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "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/es2018/object-rest-spread/15/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/options.json
index 8daa306ff731..68df28e41c41 100644
--- 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
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:30)"
+  "throws": "Identifier 'foo' has already been declared (2:30)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json
index f65c23001ff1..9ce9658f7dfa 100644
--- a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:8)"
+  "throws": "Unexpected token (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json
index bf0116a7b09f..2a28555f76db 100644
--- a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:9)"
+  "throws": "Unexpected token (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json
index 6a9895dd9d8c..b8b06c3a03ba 100644
--- a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:18)"
+  "throws": "Unexpected token (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json
index 6a9895dd9d8c..b8b06c3a03ba 100644
--- a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:18)"
+  "throws": "Unexpected token (1:18)"
 }
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
index f65c23001ff1..08b79c43d6cd 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:8)"
+  "throws": "Unexpected token, expected \",\" (1:10)"
 }
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
index 6a9895dd9d8c..81e7a97e3f7e 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:18)"
+  "throws": "Unexpected token, expected \",\" (1:20)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json
index f65c23001ff1..9ce9658f7dfa 100644
--- a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:8)"
+  "throws": "Unexpected token (1:8)"
 }
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
index 6a9895dd9d8c..b8b06c3a03ba 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid rest operator's argument (1:18)"
+  "throws": "Unexpected token (1:18)"
 }
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
index 253a786581de..b86f80dc4a72 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "The rest property must be the last property (1:10)"
+  "throws": "Rest element must be last element (1:10)"
 }
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
index e5efb196646c..c49db16e2821 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "A trailing comma is not permitted after the rest property (1:16)"
+  "throws": "Rest element must be last element (1:16)"
 }
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
index e1bf843ed1c1..e9effa60cb30 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "The rest property must be the last property (1:13)"
+  "throws": "Rest element must be last element (1:13)"
 }
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
index a19bb078b172..935d087d7ee5 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "A trailing comma is not permitted after the rest property (1:6)"
+  "throws": "Rest element must be last element (1:6)"
 }
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
index 015adf82cda0..b708967fd223 100644
--- 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
@@ -1,3 +1,3 @@
 {
-  "throws": "The rest property must be the last property (1:2)"
+  "throws": "Rest element must be last element (1:2)"
 }
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/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-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 3ead3a4299f8..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": "The rest parameter must be the last parameter (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-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-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-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/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_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_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_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_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_0258/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0258/options.json
index 029befcedaa1..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": "The rest parameter must be the last parameter (1:18)"
+  "throws": "Rest element must be last element (1:18)"
 }
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
index f8dba0c322fe..9914950b66fe 100644
--- 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
@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected space between # and identifier (2:5)",
+  "throws": "Unexpected space between # and identifier (2:3)",
   "plugins": ["classPrivateMethods"]
 }
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
index f8dba0c322fe..9914950b66fe 100644
--- 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
@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected space between # and identifier (2:5)",
+  "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 e20043c3fa2e..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,4 +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/super-call/options.json b/packages/babel-parser/test/fixtures/experimental/class-properties/super-call/options.json
index 3f06e4fecfc3..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,4 +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/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/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-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/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/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/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-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/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 f72e8ff175f2..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",
@@ -158,7 +158,7 @@
       {
         "type": "TypeAlias",
         "start": 28,
-        "end": 58,
+        "end": 59,
         "loc": {
           "start": {
             "line": 2,
@@ -166,13 +166,13 @@
           },
           "end": {
             "line": 2,
-            "column": 30
+            "column": 31
           }
         },
         "id": {
           "type": "Identifier",
           "start": 33,
-          "end": 34,
+          "end": 35,
           "loc": {
             "start": {
               "line": 2,
@@ -180,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"
                 },
@@ -240,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",
@@ -290,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
                     }
                   }
                 }
@@ -316,8 +316,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 59,
-        "end": 82,
+        "start": 60,
+        "end": 84,
         "loc": {
           "start": {
             "line": 3,
@@ -325,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,
@@ -339,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"
                 },
@@ -399,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": [],
@@ -416,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
                     }
                   }
                 }
@@ -441,8 +441,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 83,
-        "end": 109,
+        "start": 85,
+        "end": 112,
         "loc": {
           "start": {
             "line": 4,
@@ -450,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,
@@ -464,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"
                 },
@@ -524,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",
@@ -574,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
                     }
                   }
                 }
@@ -599,8 +599,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 111,
-        "end": 135,
+        "start": 114,
+        "end": 139,
         "loc": {
           "start": {
             "line": 6,
@@ -608,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,
@@ -622,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": [],
@@ -678,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
                     }
                   }
                 }
@@ -703,8 +703,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 136,
-        "end": 167,
+        "start": 140,
+        "end": 172,
         "loc": {
           "start": {
             "line": 7,
@@ -712,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,
@@ -726,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"
                       },
@@ -812,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"
                         },
@@ -848,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",
@@ -882,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
                     }
                   }
                 }
@@ -907,8 +907,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 169,
-        "end": 203,
+        "start": 174,
+        "end": 209,
         "loc": {
           "start": {
             "line": 9,
@@ -916,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,
@@ -930,11 +930,11 @@
             },
             "end": {
               "line": 9,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T6"
           },
-          "name": "T"
+          "name": "T6"
         },
         "typeParameters": null,
         "extends": [],
@@ -942,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"
                 },
@@ -993,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": [],
@@ -1010,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
                     }
                   }
                 }
@@ -1034,8 +1034,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 204,
-        "end": 245,
+        "start": 210,
+        "end": 252,
         "loc": {
           "start": {
             "line": 10,
@@ -1043,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,
@@ -1057,11 +1057,11 @@
             },
             "end": {
               "line": 10,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T7"
           },
-          "name": "T"
+          "name": "T7"
         },
         "typeParameters": null,
         "extends": [],
@@ -1069,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"
                 },
@@ -1120,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": [],
@@ -1137,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
                     }
                   }
                 }
@@ -1161,8 +1161,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 246,
-        "end": 276,
+        "start": 253,
+        "end": 284,
         "loc": {
           "start": {
             "line": 11,
@@ -1170,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,
@@ -1184,11 +1184,11 @@
             },
             "end": {
               "line": 11,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T8"
           },
-          "name": "T"
+          "name": "T8"
         },
         "typeParameters": null,
         "extends": [],
@@ -1196,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": [],
@@ -1243,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
                     }
                   }
                 }
@@ -1267,8 +1267,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 277,
-        "end": 314,
+        "start": 285,
+        "end": 323,
         "loc": {
           "start": {
             "line": 12,
@@ -1276,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,
@@ -1290,11 +1290,11 @@
             },
             "end": {
               "line": 12,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T9"
           },
-          "name": "T"
+          "name": "T9"
         },
         "typeParameters": null,
         "extends": [],
@@ -1302,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": [],
@@ -1349,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-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/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..355f89df612f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/output.json
@@ -0,0 +1,166 @@
+{
+  "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"
+          }
+        },
+        "guardedHandlers": [],
+        "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..cb39ff141899
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/output.json
@@ -0,0 +1,150 @@
+{
+  "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"
+          }
+        },
+        "guardedHandlers": [],
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.js
new file mode 100644
index 000000000000..5868c4e2feda
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.js
@@ -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/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/output.json
index b8ff07769c78..8af1eae03c46 100644
--- 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
@@ -93,7 +93,6 @@
           "params": [],
           "id": null,
           "generator": false,
-          "expression": true,
           "async": true,
           "body": {
             "type": "AwaitExpression",
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/cast/arrow-async-parameter-as/input.js b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/input.js
new file mode 100644
index 000000000000..746078a226a0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/input.js
@@ -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.js b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/input.js
new file mode 100644
index 000000000000..5e3f1481d6e7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/input.js
@@ -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-parameter-as/input.js b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/input.js
new file mode 100644
index 000000000000..dc2282c6bdc8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/input.js
@@ -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.js b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/input.js
new file mode 100644
index 000000000000..39dae7d0cf4a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/input.js
@@ -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/function/getter-setter/input.js b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/input.js
new file mode 100644
index 000000000000..2a14042c1f49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/input.js
@@ -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/regression/async-arrow-generic-9560/input.js b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/input.js
new file mode 100644
index 000000000000..2f1c5ce9190a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/input.js
@@ -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/scope/no-dupl-decl-type-const/input.js b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-const/input.js
new file mode 100644
index 000000000000..62acca05efa0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-const/input.js
@@ -0,0 +1,2 @@
+const X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-const/output.json b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-const/output.json
new file mode 100644
index 000000000000..b51eb30f5c6c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-const/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/no-dupl-decl-type-let/input.js b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-let/input.js
new file mode 100644
index 000000000000..fe2809ad6b22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-let/input.js
@@ -0,0 +1,2 @@
+let X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-let/output.json b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-let/output.json
new file mode 100644
index 000000000000..8c157d8a364d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-let/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/no-dupl-decl-type-var/input.js b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-var/input.js
new file mode 100644
index 000000000000..856d8ef6f308
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-var/input.js
@@ -0,0 +1,2 @@
+var X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-var/output.json b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-var/output.json
new file mode 100644
index 000000000000..6cfc11c09339
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/no-dupl-decl-type-var/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/types/tuple-rest-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json
index a500c245e78f..82b4f09fc940 100644
--- 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
@@ -1,5 +1,5 @@
 {
   "sourceType": "module",
   "plugins": ["typescript"],
-  "throws": "The rest type must be the last type (1:19)"
+  "throws": "Rest element must be last element (1:19)"
 }
diff --git a/packages/babel-parser/test/helpers/runFixtureTests.js b/packages/babel-parser/test/helpers/runFixtureTests.js
index be42014fd7d3..a3915587f4e7 100644
--- a/packages/babel-parser/test/helpers/runFixtureTests.js
+++ b/packages/babel-parser/test/helpers/runFixtureTests.js
@@ -195,12 +195,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-plugin-proposal-class-properties/package.json b/packages/babel-plugin-proposal-class-properties/package.json
index 67b9c5dc1cb0..1ef6ae5a6465 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.3.3",
+  "version": "7.3.4",
   "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,14 +12,14 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-create-class-features-plugin": "^7.3.0",
+    "@babel/helper-create-class-features-plugin": "^7.3.4",
     "@babel/helper-plugin-utils": "^7.0.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.3",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-object-rest-spread/package.json b/packages/babel-plugin-proposal-object-rest-spread/package.json
index 5393072d5241..f3154500e817 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.3.2",
+  "version": "7.3.4",
   "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",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@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 8506c21db77e..ae88adc3364f 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);
 
@@ -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;
@@ -302,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)),
           );
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-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..5a31663cf72f
--- /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..52ee50ef9414
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@babel/plugin-proposal-partial-application",
+  "version": "7.2.0",
+  "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.2.0"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.2.0",
+    "@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-private-methods/package.json b/packages/babel-plugin-proposal-private-methods/package.json
index 19677ee72a73..eedfe8ca427b 100644
--- a/packages/babel-plugin-proposal-private-methods/package.json
+++ b/packages/babel-plugin-proposal-private-methods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-private-methods",
-  "version": "7.3.2",
+  "version": "7.3.4",
   "description": "This plugin transforms private class methods",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-private-methods",
   "license": "MIT",
@@ -12,14 +12,14 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-create-class-features-plugin": "^7.3.2",
+    "@babel/helper-create-class-features-plugin": "^7.3.4",
     "@babel/helper-plugin-utils": "^7.0.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
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..2793aa6e6026
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js
@@ -0,0 +1,15 @@
+class Base {
+  static basePublicStaticMethod() { return 1017; }
+}
+
+class Sub extends Base {
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    return Sub.#subStaticPrivateMethod();
+  }
+}
+
+expect(Sub.check()).toEqual(1017);
\ No newline at end of file
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..2a8aba080ffc
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js
@@ -0,0 +1,13 @@
+class Base {
+  static basePublicStaticMethod() { return 1017; }
+}
+
+class Sub extends Base {
+  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..4f6bc3698406
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js
@@ -0,0 +1,23 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 1017;
+  }
+
+}
+
+class Sub extends Base {
+  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..2793aa6e6026
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js
@@ -0,0 +1,15 @@
+class Base {
+  static basePublicStaticMethod() { return 1017; }
+}
+
+class Sub extends Base {
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    return Sub.#subStaticPrivateMethod();
+  }
+}
+
+expect(Sub.check()).toEqual(1017);
\ No newline at end of file
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..2a8aba080ffc
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js
@@ -0,0 +1,13 @@
+class Base {
+  static basePublicStaticMethod() { return 1017; }
+}
+
+class Sub extends Base {
+  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..156343f956f7
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js
@@ -0,0 +1,17 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 1017;
+  }
+
+}
+
+class Sub extends Base {
+  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-unicode-property-regex/package.json b/packages/babel-plugin-proposal-unicode-property-regex/package.json
index e8ec8965fbe7..9600ca3384cd 100644
--- a/packages/babel-plugin-proposal-unicode-property-regex/package.json
+++ b/packages/babel-plugin-proposal-unicode-property-regex/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
     "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.2.0"
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
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-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..d50284617998
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-syntax-partial-application
+
+> Allow parsing of optional properties
+
+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..603cc408c815
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@babel/plugin-syntax-partial-application",
+  "version": "7.2.0",
+  "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.2.0"
+  }
+}
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-transform-async-to-generator/package.json b/packages/babel-plugin-transform-async-to-generator/package.json
index 315b8fe9eb01..2ebabcc5e44d 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.2.0",
+  "version": "7.3.4",
   "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.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-block-scoping/package.json b/packages/babel-plugin-transform-block-scoping/package.json
index d33ff7e546ca..8c5e6ce4fb24 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.2.0",
+  "version": "7.3.4",
   "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",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@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 ef91aa55b959..cc63c554ddcd 100644
--- a/packages/babel-plugin-transform-block-scoping/src/index.js
+++ b/packages/babel-plugin-transform-block-scoping/src/index.js
@@ -153,8 +153,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);
@@ -245,8 +244,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)
@@ -410,7 +408,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;
 
@@ -444,7 +442,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;
@@ -471,7 +469,7 @@ class BlockScoping {
     // 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];
@@ -491,7 +489,7 @@ class BlockScoping {
       }
     }
 
-    for (const key in outsideLetRefs) {
+    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
@@ -514,7 +512,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 (
@@ -814,7 +812,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]));
     }
 
@@ -852,7 +850,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..9612b8deb210 100644
--- a/packages/babel-plugin-transform-block-scoping/src/tdz.js
+++ b/packages/babel-plugin-transform-block-scoping/src/tdz.js
@@ -83,7 +83,7 @@ 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)) {
diff --git a/packages/babel-plugin-transform-classes/package.json b/packages/babel-plugin-transform-classes/package.json
index f11bd579cafc..6691ee8d0ea0 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.3.3",
+  "version": "7.3.4",
   "description": "Compile ES2015 classes to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-classes",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "@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-replace-supers": "^7.3.4",
     "@babel/helper-split-export-declaration": "^7.0.0",
     "globals": "^11.1.0"
   },
@@ -25,7 +25,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.3",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-classes/src/transformClass.js b/packages/babel-plugin-transform-classes/src/transformClass.js
index b537c00b3a4e..0335e363439a 100644
--- a/packages/babel-plugin-transform-classes/src/transformClass.js
+++ b/packages/babel-plugin-transform-classes/src/transformClass.js
@@ -19,22 +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",
-        );
-      }
-    },
-  },
-]);
-
 export default function transformClass(
   path: NodePath,
   file: any,
@@ -180,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,
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-illegal-non-constructor-call/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-illegal-non-constructor-call/options.json
index 2ff7004be5b7..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,3 +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-destructuring/src/index.js b/packages/babel-plugin-transform-destructuring/src/index.js
index 52a76928e19f..de2b9ff4ba16 100644
--- a/packages/babel-plugin-transform-destructuring/src/index.js
+++ b/packages/babel-plugin-transform-destructuring/src/index.js
@@ -421,7 +421,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)),
           );
diff --git a/packages/babel-plugin-transform-dotall-regex/package.json b/packages/babel-plugin-transform-dotall-regex/package.json
index a10171064806..93ea1f8d3329 100644
--- a/packages/babel-plugin-transform-dotall-regex/package.json
+++ b/packages/babel-plugin-transform-dotall-regex/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
     "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.1.3"
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
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-strip-types/package.json b/packages/babel-plugin-transform-flow-strip-types/package.json
index 765f29d27d92..8a4d321097db 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.2.3",
+  "version": "7.3.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",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
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-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/input.mjs b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/input.mjs
index 4be37364cf10..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
@@ -99,7 +99,7 @@ import type { imp2, imp3 } from "baz";
 import type { foo as imp4 } from "baz";
 import type from "foo";
 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";
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-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-systemjs/package.json b/packages/babel-plugin-transform-modules-systemjs/package.json
index c2ba50d968e5..90782b80892e 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.2.0",
+  "version": "7.3.4",
   "description": "This plugin transforms ES2015 modules to SystemJS",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-systemjs",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^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 f43fc7a34f53..0542d0d69260 100644
--- a/packages/babel-plugin-transform-modules-systemjs/src/index.js
+++ b/packages/babel-plugin-transform-modules-systemjs/src/index.js
@@ -113,7 +113,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;
           }
@@ -216,10 +216,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 = [];
@@ -229,8 +230,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) {
@@ -257,16 +258,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));
               }
@@ -276,29 +291,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));
               }
@@ -313,14 +337,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);
                   }
                 }
@@ -342,12 +380,8 @@ export default declare((api, options) => {
                         binding &&
                         t.isFunctionDeclaration(binding.path.node)
                       ) {
-                        beforeBody.push(
-                          buildExportCall(
-                            specifier.exported.name,
-                            t.cloneNode(specifier.local),
-                          ),
-                        );
+                        exportNames.push(specifier.exported.name);
+                        exportValues.push(t.cloneNode(specifier.local));
                       }
                       // only globals also exported this way
                       else if (!binding) {
@@ -451,13 +485,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,
@@ -472,25 +506,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/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-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-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-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-regenerator/package.json b/packages/babel-plugin-transform-regenerator/package.json
index a0b491feea4f..069c8bd78da9 100644
--- a/packages/babel-plugin-transform-regenerator/package.json
+++ b/packages/babel-plugin-transform-regenerator/package.json
@@ -2,7 +2,7 @@
   "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.3.4",
   "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",
@@ -17,7 +17,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json
index 932aad78f1a1..773794e3d57e 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.2.0",
+  "version": "7.3.4",
   "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,12 +21,12 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-test-runner": "^7.0.0",
     "@babel/helpers": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.2.0",
-    "@babel/preset-env": "^7.2.0",
-    "@babel/runtime": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
+    "@babel/runtime": "^7.3.4",
     "@babel/template": "^7.0.0",
     "@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..590440aff352 100644
--- a/packages/babel-plugin-transform-runtime/scripts/build-dist.js
+++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js
@@ -19,7 +19,15 @@ writeHelpers("@babel/runtime-corejs2", { corejs: 2 });
 function writeCoreJS2(runtimeName) {
   const pkgDirname = getRuntimeRoot(runtimeName);
 
-  const paths = ["is-iterable", "get-iterator"];
+  const 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",
+  ];
 
   Object.keys(corejs2Definitions.builtins).forEach(key => {
     const path = corejs2Definitions.builtins[key];
diff --git a/packages/babel-plugin-transform-runtime/src/definitions.js b/packages/babel-plugin-transform-runtime/src/definitions.js
index ac044910a08e..b0874d080338 100644
--- a/packages/babel-plugin-transform-runtime/src/definitions.js
+++ b/packages/babel-plugin-transform-runtime/src/definitions.js
@@ -109,7 +109,8 @@ export default runtimeVersion => {
         : {}),
 
       Symbol: {
-        asyncIterator: "symbol/async-iterator",
+        // FIXME: Disabled to work around zloirock/core-js#262.
+        // asyncIterator: "symbol/async-iterator",
         for: "symbol/for",
         hasInstance: "symbol/has-instance",
         isConcatSpreadable: "symbol/is-concat-spreadable",
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
index 420e20481467..bcc3eb3624b3 100644
--- 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
@@ -5,3 +5,9 @@ const o = {
 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/imports/enum-id/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/input.mjs
new file mode 100644
index 000000000000..f46a82c360a2
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/input.mjs
@@ -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.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/input.mjs
new file mode 100644
index 000000000000..727760d0ed26
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/input.mjs
@@ -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/property-signature/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/input.mjs
new file mode 100644
index 000000000000..7e242846479e
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/input.mjs
@@ -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-unicode-regex/package.json b/packages/babel-plugin-transform-unicode-regex/package.json
index d5167f6a11f2..133a98af0bc9 100644
--- a/packages/babel-plugin-transform-unicode-regex/package.json
+++ b/packages/babel-plugin-transform-unicode-regex/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
     "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.1.3"
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
diff --git a/packages/babel-preset-env-standalone/package.json b/packages/babel-preset-env-standalone/package.json
index dd404a10a445..ece2257a407b 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.3.3",
+  "version": "7.3.4",
   "description": "Standalone build of babel-prest-env for use in non-Node.js environments.",
   "main": "babel-preset-env.js",
   "files": [
@@ -12,8 +12,8 @@
     "@babel/plugin-proposal-json-strings": "^7.0.0",
     "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0",
     "@babel/plugin-transform-new-target": "^7.0.0",
-    "@babel/preset-env": "^7.3.1",
-    "@babel/standalone": "^7.3.3"
+    "@babel/preset-env": "^7.3.4",
+    "@babel/standalone": "^7.3.4"
   },
   "keywords": [
     "babel",
diff --git a/packages/babel-preset-env/data/built-in-modules.json b/packages/babel-preset-env/data/built-in-modules.json
index 9bd7f2aa0016..e1b1e8a6dc4e 100644
--- a/packages/babel-preset-env/data/built-in-modules.json
+++ b/packages/babel-preset-env/data/built-in-modules.json
@@ -6,6 +6,6 @@
     "safari": "10.1",
     "opera": "48",
     "ios_saf": "10.3",
-    "and_ff": "60"
+    "and_ff": "64"
   }
 }
diff --git a/packages/babel-preset-env/data/built-ins.json b/packages/babel-preset-env/data/built-ins.json
index 2e6321e2b37c..d584df33679c 100644
--- a/packages/babel-preset-env/data/built-ins.json
+++ b/packages/babel-preset-env/data/built-ins.json
@@ -17,7 +17,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -40,7 +40,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -73,7 +73,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -106,7 +106,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -119,7 +119,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -142,7 +142,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -155,7 +155,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -178,7 +178,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -191,7 +191,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -204,7 +204,7 @@
     "safari": "3.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -214,11 +214,11 @@
     "opera": "50",
     "edge": "12",
     "firefox": "5",
-    "safari": "10.1",
-    "node": "10.0",
+    "safari": "12",
+    "node": "10",
     "ie": "9",
-    "ios": "10.3",
-    "electron": "3"
+    "ios": "12",
+    "electron": "3.1"
   },
   "es6.array.species": {
     "chrome": "51",
@@ -238,7 +238,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -251,7 +251,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -264,7 +264,7 @@
     "safari": "10",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "10",
     "electron": "1.1"
   },
@@ -284,9 +284,9 @@
     "edge": "12",
     "firefox": "2",
     "safari": "3.1",
-    "node": "0.12",
+    "node": "0.10",
     "ie": "10",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -299,9 +299,10 @@
     "safari": "5.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
-    "ios": "7",
-    "phantom": "2"
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "electron": "5"
   },
   "es6.function.has-instance": {
     "chrome": "51",
@@ -316,11 +317,11 @@
   "es6.function.name": {
     "chrome": "5",
     "opera": "10.50",
-    "edge": "12",
+    "edge": "14",
     "firefox": "2",
     "safari": "4",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -624,7 +625,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -637,7 +638,7 @@
     "node": "8.10",
     "ios": "9",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es7.object.define-setter": {
     "chrome": "62",
@@ -647,7 +648,7 @@
     "node": "8.10",
     "ios": "9",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es6.object.define-property": {
     "chrome": "5",
@@ -657,7 +658,7 @@
     "safari": "5.1",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -670,7 +671,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -728,7 +729,7 @@
   "es6.object.get-prototype-of": {
     "chrome": "44",
     "edge": "12",
-    "firefox": "3.5",
+    "firefox": "35",
     "safari": "9",
     "node": "4",
     "ios": "9",
@@ -742,7 +743,7 @@
     "node": "8.10",
     "ios": "9",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es7.object.lookup-setter": {
     "chrome": "62",
@@ -751,7 +752,7 @@
     "node": "8.10",
     "ios": "9",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es6.object.prevent-extensions": {
     "chrome": "44",
@@ -859,10 +860,10 @@
     "edge": "18",
     "firefox": "58",
     "safari": "11.1",
-    "node": "10.0",
+    "node": "10",
     "ios": "11.3",
     "opera": "50",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es6.reflect.apply": {
     "chrome": "49",
@@ -1080,18 +1081,18 @@
     "chrome": "63",
     "firefox": "57",
     "safari": "12",
-    "node": "10.0",
+    "node": "10",
     "ios": "12",
     "opera": "50",
-    "electron": "3"
+    "electron": "3.1"
   },
   "es6.string.anchor": {
     "chrome": "5",
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1101,8 +1102,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1112,8 +1113,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1123,8 +1124,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1154,8 +1155,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1165,8 +1166,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1176,8 +1177,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1207,8 +1208,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1228,8 +1229,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1279,8 +1280,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1300,8 +1301,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1311,8 +1312,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1322,8 +1323,8 @@
     "edge": "12",
     "firefox": "17",
     "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
+    "node": "0.10",
+    "android": "4",
     "ios": "7",
     "phantom": "2",
     "electron": "1.1"
@@ -1336,7 +1337,7 @@
     "safari": "4",
     "node": "0.10",
     "ie": "9",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -1357,9 +1358,9 @@
     "edge": "12",
     "firefox": "15",
     "safari": "5.1",
-    "node": "0.12",
+    "node": "0.10",
     "ie": "10",
-    "android": "4.0",
+    "android": "4",
     "ios": "6",
     "phantom": "2",
     "electron": "1.1"
@@ -1478,7 +1479,7 @@
     "chrome": "69",
     "firefox": "62",
     "safari": "12",
-    "node": "11.0",
+    "node": "11",
     "ios": "12",
     "opera": "56",
     "electron": "4"
diff --git a/packages/babel-preset-env/data/plugins.json b/packages/babel-preset-env/data/plugins.json
index 37c725885368..a869f0bd2111 100644
--- a/packages/babel-preset-env/data/plugins.json
+++ b/packages/babel-preset-env/data/plugins.json
@@ -3,9 +3,7 @@
     "chrome": "41",
     "edge": "13",
     "firefox": "34",
-    "safari": "9",
     "node": "4",
-    "ios": "9",
     "opera": "28",
     "electron": "0.24"
   },
@@ -125,7 +123,7 @@
     "node": "8.10",
     "ios": "11.3",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "transform-unicode-regex": {
     "chrome": "50",
@@ -231,10 +229,10 @@
     "chrome": "63",
     "firefox": "57",
     "safari": "12",
-    "node": "10.0",
+    "node": "10",
     "ios": "12",
     "opera": "50",
-    "electron": "3"
+    "electron": "3.1"
   },
   "proposal-object-rest-spread": {
     "chrome": "60",
@@ -248,35 +246,35 @@
   "proposal-unicode-property-regex": {
     "chrome": "64",
     "safari": "11.1",
-    "node": "10.0",
+    "node": "10",
     "ios": "11.3",
     "opera": "51",
-    "electron": "3"
+    "electron": "3.1"
   },
   "proposal-json-strings": {
     "chrome": "66",
     "firefox": "62",
     "safari": "12",
-    "node": "10.0",
+    "node": "10",
     "ios": "12",
     "opera": "53",
-    "electron": "3"
+    "electron": "3.1"
   },
   "proposal-optional-catch-binding": {
     "chrome": "66",
     "firefox": "58",
     "safari": "11.1",
-    "node": "10.0",
+    "node": "10",
     "ios": "11.3",
     "opera": "53",
-    "electron": "3"
+    "electron": "3.1"
   },
   "transform-named-capturing-groups-regex": {
     "chrome": "64",
     "safari": "11.1",
-    "node": "10.0",
+    "node": "10",
     "ios": "11.3",
     "opera": "51",
-    "electron": "3"
+    "electron": "3.1"
   }
 }
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
index 8106cdf0a094..d32592e328da 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.3.1",
+  "version": "7.3.4",
   "description": "A Babel preset for each environment.",
   "author": "Henry Zhu <hi@henryzoo.com>",
   "homepage": "https://babeljs.io/",
@@ -18,7 +18,7 @@
     "@babel/helper-plugin-utils": "^7.0.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.3.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
     "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
     "@babel/plugin-proposal-unicode-property-regex": "^7.2.0",
     "@babel/plugin-syntax-async-generators": "^7.2.0",
@@ -26,10 +26,10 @@
     "@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.2.0",
+    "@babel/plugin-transform-async-to-generator": "^7.3.4",
     "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-    "@babel/plugin-transform-block-scoping": "^7.2.0",
-    "@babel/plugin-transform-classes": "^7.2.0",
+    "@babel/plugin-transform-block-scoping": "^7.3.4",
+    "@babel/plugin-transform-classes": "^7.3.4",
     "@babel/plugin-transform-computed-properties": "^7.2.0",
     "@babel/plugin-transform-destructuring": "^7.2.0",
     "@babel/plugin-transform-dotall-regex": "^7.2.0",
@@ -40,20 +40,20 @@
     "@babel/plugin-transform-literals": "^7.2.0",
     "@babel/plugin-transform-modules-amd": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-    "@babel/plugin-transform-modules-systemjs": "^7.2.0",
+    "@babel/plugin-transform-modules-systemjs": "^7.3.4",
     "@babel/plugin-transform-modules-umd": "^7.2.0",
     "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0",
     "@babel/plugin-transform-new-target": "^7.0.0",
     "@babel/plugin-transform-object-super": "^7.2.0",
     "@babel/plugin-transform-parameters": "^7.2.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@babel/plugin-transform-regenerator": "^7.3.4",
     "@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.2.0",
     "@babel/plugin-transform-typeof-symbol": "^7.2.0",
     "@babel/plugin-transform-unicode-regex": "^7.2.0",
-    "browserslist": "^4.3.4",
+    "browserslist": "^4.4.2",
     "invariant": "^2.2.2",
     "js-levenshtein": "^1.1.3",
     "semver": "^5.3.0"
@@ -63,11 +63,11 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.0",
+    "@babel/core": "^7.3.4",
     "@babel/helper-fixtures": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "caniuse-db": "1.0.30000851",
-    "compat-table": "kangax/compat-table#1e7b377fbdda9243cf9602872fcb493cdbdd565f",
-    "electron-to-chromium": "1.3.79"
+    "caniuse-db": "1.0.30000938",
+    "compat-table": "kangax/compat-table#6d012ba020fa7415e8a2d29e87924bab79b128a3",
+    "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 3706d8148ae0..28e80b1031f1 100644
--- a/packages/babel-preset-env/scripts/build-data.js
+++ b/packages/babel-preset-env/scripts/build-data.js
@@ -193,27 +193,50 @@ const getLowestImplementedVersion = ({ features }, env) => {
     //
     // NOTE: when/if compat-table adds a babel7 key, we'll want to update this
     if (!test.babel6corejs2 && isBuiltIn) {
-      return "-1";
+      return {
+        version: "0.0.0",
+        semver: "0.0.0",
+        implements: true,
+      };
     }
 
-    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()
-    );
+    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;
+      });
+
+    // 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,15 +252,16 @@ const getLowestImplementedVersion = ({ features }, env) => {
     return null;
   }
 
-  return envTests
-    .map(str => str.replace(env, ""))
-    .reduce((a, b) => {
-      if (a === unreleasedLabelForEnv || b === unreleasedLabelForEnv) {
-        return unreleasedLabelForEnv;
-      }
+  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;
+  });
 };
 
 const generateData = (environments, features) => {
@@ -254,7 +278,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;
       }
     });
 
diff --git a/packages/babel-preset-env/scripts/build-modules-support.js b/packages/babel-preset-env/scripts/build-modules-support.js
index 1ce611078c15..24528bb0ec65 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(["and_chr", "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/test/debug-fixtures/specific-targets/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt
index e27e601607e9..c1caa5390a37 100644
--- a/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt
+++ b/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt
@@ -13,7 +13,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  transform-template-literals { "ie":"10", "safari":"7" }
+  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" }
@@ -59,7 +59,7 @@ Using polyfills with `entry` option:
   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.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" }
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-register/package.json b/packages/babel-register/package.json
index 3a367162ce5d..dbbd342d5604 100644
--- a/packages/babel-register/package.json
+++ b/packages/babel-register/package.json
@@ -15,7 +15,6 @@
   "dependencies": {
     "core-js": "^2.5.7",
     "find-cache-dir": "^2.0.0",
-    "home-or-tmp": "^3.0.0",
     "lodash": "^4.17.11",
     "mkdirp": "^0.5.1",
     "pirates": "^4.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 6bfa58204018..e2c4304aecac 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.3.1",
+  "version": "7.3.4",
   "description": "babel's modular runtime helpers with core-js@2 polyfilling",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/babel-runtime/package.json b/packages/babel-runtime/package.json
index 678b6ae4d616..b0b406145355 100644
--- a/packages/babel-runtime/package.json
+++ b/packages/babel-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/runtime",
-  "version": "7.3.1",
+  "version": "7.3.4",
   "description": "babel's modular runtime helpers",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json
index 3fa63ee985b3..f3108bab07de 100644
--- a/packages/babel-standalone/package.json
+++ b/packages/babel-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/standalone",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "Standalone build of Babel for use in non-Node.js environments.",
   "main": "babel.js",
   "files": [
@@ -9,11 +9,11 @@
     "src"
   ],
   "devDependencies": {
-    "@babel/core": "^7.3.3",
+    "@babel/core": "^7.3.4",
     "@babel/helper-plugin-utils": "^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.3.3",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
     "@babel/plugin-proposal-decorators": "^7.3.0",
     "@babel/plugin-proposal-do-expressions": "^7.2.0",
     "@babel/plugin-proposal-export-default-from": "^7.2.0",
@@ -24,11 +24,11 @@
     "@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.2.0",
     "@babel/plugin-proposal-numeric-separator": "^7.2.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
     "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
     "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@babel/plugin-proposal-pipeline-operator": "^7.3.2",
-    "@babel/plugin-proposal-private-methods": "^7.3.2",
+    "@babel/plugin-proposal-private-methods": "^7.3.4",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/plugin-proposal-unicode-property-regex": "^7.2.0",
     "@babel/plugin-syntax-async-generators": "^7.2.0",
@@ -48,17 +48,17 @@
     "@babel/plugin-syntax-pipeline-operator": "^7.3.0",
     "@babel/plugin-syntax-typescript": "^7.3.3",
     "@babel/plugin-transform-arrow-functions": "^7.2.0",
-    "@babel/plugin-transform-async-to-generator": "^7.2.0",
+    "@babel/plugin-transform-async-to-generator": "^7.3.4",
     "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-    "@babel/plugin-transform-block-scoping": "^7.2.0",
-    "@babel/plugin-transform-classes": "^7.3.3",
+    "@babel/plugin-transform-block-scoping": "^7.3.4",
+    "@babel/plugin-transform-classes": "^7.3.4",
     "@babel/plugin-transform-computed-properties": "^7.2.0",
     "@babel/plugin-transform-destructuring": "^7.3.2",
     "@babel/plugin-transform-dotall-regex": "^7.2.0",
     "@babel/plugin-transform-duplicate-keys": "^7.2.0",
     "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
     "@babel/plugin-transform-flow-comments": "^7.2.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.2.3",
+    "@babel/plugin-transform-flow-strip-types": "^7.3.4",
     "@babel/plugin-transform-for-of": "^7.2.0",
     "@babel/plugin-transform-function-name": "^7.2.0",
     "@babel/plugin-transform-instanceof": "^7.2.0",
@@ -67,7 +67,7 @@
     "@babel/plugin-transform-member-expression-literals": "^7.2.0",
     "@babel/plugin-transform-modules-amd": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-    "@babel/plugin-transform-modules-systemjs": "^7.2.0",
+    "@babel/plugin-transform-modules-systemjs": "^7.3.4",
     "@babel/plugin-transform-modules-umd": "^7.2.0",
     "@babel/plugin-transform-new-target": "^7.0.0",
     "@babel/plugin-transform-object-assign": "^7.2.0",
@@ -84,8 +84,8 @@
     "@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.2.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/plugin-transform-regenerator": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.3.4",
     "@babel/plugin-transform-shorthand-properties": "^7.2.0",
     "@babel/plugin-transform-spread": "^7.2.2",
     "@babel/plugin-transform-sticky-regex": "^7.2.0",
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..812947393cdc
--- /dev/null
+++ b/packages/babel-standalone/scripts/pluginConfig.json
@@ -0,0 +1,85 @@
+[
+  "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-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/src/generated/plugins.js b/packages/babel-standalone/src/generated/plugins.js
new file mode 100644
index 000000000000..188fd621e6f3
--- /dev/null
+++ b/packages/babel-standalone/src/generated/plugins.js
@@ -0,0 +1,260 @@
+// @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 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,
+  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-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 5804409ad095..d7ed72afd261 100644
--- a/packages/babel-standalone/src/index.js
+++ b/packages/babel-standalone/src/index.js
@@ -4,12 +4,26 @@
  * 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,90 +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"),
-  "proposal-private-methods": require("@babel/plugin-proposal-private-methods"),
-  "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"]],
@@ -233,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() {
@@ -265,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 04bd443e8fe9..6885719f2fd2 100644
--- a/packages/babel-standalone/src/preset-stage-3.js
+++ b/packages/babel-standalone/src/preset-stage-3.js
@@ -1,10 +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";
-import transformPrivateMethods from "@babel/plugin-proposal-private-methods";
+// @flow
+import * as babelPlugins from "./generated/plugins";
 
-export default (_, opts) => {
+export default (_: any, opts: Object) => {
   let loose = false;
 
   if (opts !== undefined) {
@@ -13,11 +10,11 @@ export default (_, opts) => {
 
   return {
     plugins: [
-      syntaxDynamicImport,
-      syntaxImportMeta,
-      [transformClassProperties, { loose }],
-      transformJsonStrings,
-      [transformPrivateMethods, { loose }],
+      babelPlugins.syntaxDynamicImport,
+      babelPlugins.syntaxImportMeta,
+      [babelPlugins.proposalClassProperties, { loose }],
+      babelPlugins.proposalJsonStrings,
+      [babelPlugins.proposalPrivateMethods, { loose }],
     ],
   };
 };
diff --git a/packages/babel-traverse/package.json b/packages/babel-traverse/package.json
index 993535f4aa4c..e71adbc215c1 100644
--- a/packages/babel-traverse/package.json
+++ b/packages/babel-traverse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.2.3",
+  "version": "7.3.4",
   "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/",
@@ -12,11 +12,11 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
-    "@babel/generator": "^7.2.2",
+    "@babel/generator": "^7.3.4",
     "@babel/helper-function-name": "^7.1.0",
     "@babel/helper-split-export-declaration": "^7.0.0",
-    "@babel/parser": "^7.2.3",
-    "@babel/types": "^7.2.2",
+    "@babel/parser": "^7.3.4",
+    "@babel/types": "^7.3.4",
     "debug": "^4.1.0",
     "globals": "^11.1.0",
     "lodash": "^4.17.11"
diff --git a/packages/babel-traverse/src/path/context.js b/packages/babel-traverse/src/path/context.js
index a97045e10f16..0057b1694d3f 100644
--- a/packages/babel-traverse/src/path/context.js
+++ b/packages/babel-traverse/src/path/context.js
@@ -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/index.js b/packages/babel-traverse/src/path/index.js
index 506a25e95ded..f76ba1ec5ece 100644
--- a/packages/babel-traverse/src/path/index.js
+++ b/packages/babel-traverse/src/path/index.js
@@ -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/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/replacement.js b/packages/babel-traverse/src/path/replacement.js
index 07691853345e..0c411cb40163 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] });
     }
 
diff --git a/packages/babel-traverse/src/scope/index.js b/packages/babel-traverse/src/scope/index.js
index 88383fa66cf7..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);
           }
@@ -388,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,
@@ -501,7 +500,7 @@ export default class Scope {
 
   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);
     }
@@ -519,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);
 
@@ -746,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();
@@ -886,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-types/package.json b/packages/babel-types/package.json
index b88f576df2fd..f402356a1b03 100644
--- a/packages/babel-types/package.json
+++ b/packages/babel-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/types",
-  "version": "7.3.3",
+  "version": "7.3.4",
   "description": "Babel Types is a Lodash-esque utility library for AST nodes",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -14,7 +14,7 @@
     "to-fast-properties": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/generator": "^7.3.3",
-    "@babel/parser": "^7.3.3"
+    "@babel/generator": "^7.3.4",
+    "@babel/parser": "^7.3.4"
   }
 }
diff --git a/packages/babel-types/scripts/generateTypeHelpers.js b/packages/babel-types/scripts/generateTypeHelpers.js
index 794b214adff5..bf0b036c189e 100644
--- a/packages/babel-types/scripts/generateTypeHelpers.js
+++ b/packages/babel-types/scripts/generateTypeHelpers.js
@@ -1,39 +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);
-
-  try {
-    fs.mkdirSync(path.dirname(file));
-  } catch (error) {
-    if (error.code !== "EEXIST") {
-      throw error;
-    }
-  }
-
-  fs.writeFileSync(file, format(content, file));
-}
-
 console.log("Generating @babel/types dynamic functions");
 
-writeFile(generateBuilders(), "builders/generated/index.js");
+const buildersFile = path.join(baseDir, "builders/generated/index.js");
+writeFile(buildersFile, format(generateBuilders(), buildersFile));
 console.log(`  ${chalk.green("✔")} Generated builders`);
 
-writeFile(generateValidators(), "validators/generated/index.js");
+const validatorsFile = path.join(baseDir, "validators/generated/index.js");
+writeFile(validatorsFile, format(generateValidators(), validatorsFile));
 console.log(`  ${chalk.green("✔")} Generated validators`);
 
-writeFile(generateAsserts(), "asserts/generated/index.js");
+const assertsFile = path.join(baseDir, "asserts/generated/index.js");
+writeFile(assertsFile, format(generateAsserts(), assertsFile));
 console.log(`  ${chalk.green("✔")} Generated asserts`);
 
-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/packages/babel-types/scripts/generators/generateValidators.js b/packages/babel-types/scripts/generators/generateValidators.js
index 1e1ed321be62..1455f99e5b67 100644
--- a/packages/babel-types/scripts/generators/generateValidators.js
+++ b/packages/babel-types/scripts/generators/generateValidators.js
@@ -1,14 +1,37 @@
 "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 {
@@ -16,7 +39,7 @@ function addIsHelper(type, aliasKeys, 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/src/asserts/generated/index.js b/packages/babel-types/src/asserts/generated/index.js
index c0f94dc64281..3a4e81d34700 100644
--- a/packages/babel-types/src/asserts/generated/index.js
+++ b/packages/babel-types/src/asserts/generated/index.js
@@ -660,6 +660,15 @@ export function assertJSXClosingFragment(
 export function assertNoop(node: Object, opts?: Object = {}): void {
   assert("Noop", node, opts);
 }
+export function assertPlaceholder(node: Object, opts?: Object = {}): void {
+  assert("Placeholder", node, opts);
+}
+export function assertArgumentPlaceholder(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("ArgumentPlaceholder", node, opts);
+}
 export function assertAwaitExpression(node: Object, opts?: Object = {}): void {
   assert("AwaitExpression", node, opts);
 }
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 3a227b735e9d..e4ca375762cc 100644
--- a/packages/babel-types/src/builders/generated/index.js
+++ b/packages/babel-types/src/builders/generated/index.js
@@ -596,6 +596,14 @@ export function Noop(...args: Array<any>): Object {
   return builder("Noop", ...args);
 }
 export { Noop as noop };
+export function Placeholder(...args: Array<any>): Object {
+  return builder("Placeholder", ...args);
+}
+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);
 }
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 5f240992a49a..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",
+          ),
         ),
       ),
     },
diff --git a/packages/babel-types/src/definitions/experimental.js b/packages/babel-types/src/definitions/experimental.js
index 6498e9c329e3..ed088af74bd6 100644
--- a/packages/babel-types/src/definitions/experimental.js
+++ b/packages/babel-types/src/definitions/experimental.js
@@ -10,6 +10,8 @@ import {
   classMethodOrDeclareMethodCommon,
 } from "./es2015";
 
+defineType("ArgumentPlaceholder", {});
+
 defineType("AwaitExpression", {
   builder: ["argument"],
   visitor: ["argument"],
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/misc.js b/packages/babel-types/src/definitions/misc.js
index 6bc22babc05f..e319235b2c15 100644
--- a/packages/babel-types/src/definitions/misc.js
+++ b/packages/babel-types/src/definitions/misc.js
@@ -1,6 +1,21 @@
 // @flow
-import defineType from "./utils";
+import defineType, { assertNodeType, assertOneOf } from "./utils";
+import { PLACEHOLDERS } from "./placeholders";
 
 defineType("Noop", {
   visitor: [],
 });
+
+defineType("Placeholder", {
+  visitor: [],
+  builder: ["expectedNode", "name"],
+  // aliases: [], defined in placeholders.js
+  fields: {
+    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/utils.js b/packages/babel-types/src/definitions/utils.js
index 45cf72b297fa..c1d2ce762daa 100644
--- a/packages/babel-types/src/definitions/utils.js
+++ b/packages/babel-types/src/definitions/utils.js
@@ -201,7 +201,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 972d398297b2..890999e5d0e1 100644
--- a/packages/babel-types/src/validators/generated/index.js
+++ b/packages/babel-types/src/validators/generated/index.js
@@ -2093,6 +2093,34 @@ export function isNoop(node: ?Object, opts?: Object): boolean {
 
   return false;
 }
+export function isPlaceholder(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "Placeholder") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+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;
 
@@ -3266,7 +3294,11 @@ export function isExpression(node: ?Object, opts?: Object): boolean {
     "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;
@@ -3317,7 +3349,8 @@ export function isScopable(node: ?Object, opts?: Object): boolean {
     "ClassExpression" === nodeType ||
     "ForOfStatement" === nodeType ||
     "ClassMethod" === nodeType ||
-    "ClassPrivateMethod" === nodeType
+    "ClassPrivateMethod" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3348,7 +3381,8 @@ export function isBlockParent(node: ?Object, opts?: Object): boolean {
     "ArrowFunctionExpression" === nodeType ||
     "ForOfStatement" === nodeType ||
     "ClassMethod" === nodeType ||
-    "ClassPrivateMethod" === nodeType
+    "ClassPrivateMethod" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3366,7 +3400,8 @@ export function isBlock(node: ?Object, opts?: Object): boolean {
   if (
     nodeType === "Block" ||
     "BlockStatement" === nodeType ||
-    "Program" === nodeType
+    "Program" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3428,7 +3463,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;
@@ -3653,7 +3692,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;
@@ -3694,7 +3734,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;
@@ -3715,7 +3756,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;
@@ -3738,7 +3781,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;
@@ -3756,7 +3801,8 @@ export function isTSEntityName(node: ?Object, opts?: Object): boolean {
   if (
     nodeType === "TSEntityName" ||
     "Identifier" === nodeType ||
-    "TSQualifiedName" === nodeType
+    "TSQualifiedName" === nodeType ||
+    (nodeType === "Placeholder" && "Identifier" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3779,7 +3825,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;
@@ -3810,7 +3857,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;
@@ -3926,7 +3974,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;
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 b629e625ee4d..f83c7956c493 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
@@ -37,6 +41,7 @@ export default function isReferenced(node: Object, parent: Object): boolean {
     // yes: { [NODE]: "" }
     // no: { NODE: "" }
     // depends: { NODE }
+    // depends: { key: NODE }
     case "ObjectProperty":
     // no: class { NODE = value; }
     // yes: class { [NODE] = value; }
@@ -51,7 +56,10 @@ export default function isReferenced(node: Object, parent: Object): boolean {
       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 {}
@@ -126,6 +134,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/test/validators.js b/packages/babel-types/test/validators.js
index ce4740288105..f08dedab1a87 100644
--- a/packages/babel-types/test/validators.js
+++ b/packages/babel-types/test/validators.js
@@ -121,6 +121,82 @@ 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() {
@@ -140,4 +216,95 @@ describe("validators", 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/gulp-tasks.js b/scripts/gulp-tasks.js
index 6b52205342df..73c1f7db2e3f 100644
--- a/scripts/gulp-tasks.js
+++ b/scripts/gulp-tasks.js
@@ -20,6 +20,7 @@ const rename = require("gulp-rename");
 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");
 
@@ -62,6 +63,7 @@ function webpackBuild(opts) {
       libraryTarget: "umd",
     },
     plugins: [
+      new WarningsToErrorsPlugin(),
       new DuplicatePackageCheckerPlugin({
         exclude(instance) {
           return instance.name === "semver";
diff --git a/scripts/tests/flow/flow_tests_whitelist.txt b/scripts/tests/flow/flow_tests_whitelist.txt
index c5a154762bb3..60ee5e0e6e98 100644
--- a/scripts/tests/flow/flow_tests_whitelist.txt
+++ b/scripts/tests/flow/flow_tests_whitelist.txt
@@ -10,7 +10,6 @@
 
 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
@@ -35,3 +34,6 @@ 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/test262/run_babel_parser_test262_utils.js b/scripts/tests/test262/run_babel_parser_test262_utils.js
index 4a0bf1b25756..974e4a88e795 100644
--- a/scripts/tests/test262/run_babel_parser_test262_utils.js
+++ b/scripts/tests/test262/run_babel_parser_test262_utils.js
@@ -43,6 +43,7 @@ const ignoredFeatures = [
   "for-of",
   "generators",
   "globalThis",
+  "hashbang",
   "Int8Array",
   "Int32Array",
   "Intl.ListFormat",
@@ -209,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) {
@@ -227,7 +229,7 @@ exports.updateWhitelist = function(filename, summary) {
         return line;
       })
       .filter(function(line) {
-        return line !== null;
+        return line !== null && line !== "";
       })
       .concat(toAdd)
       .sort()
diff --git a/scripts/tests/test262/test262_whitelist.txt b/scripts/tests/test262/test262_whitelist.txt
index 5d67387a1eba..b936b9a595e2 100644
--- a/scripts/tests/test262/test262_whitelist.txt
+++ b/scripts/tests/test262/test262_whitelist.txt
@@ -284,189 +284,23 @@ built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js(
 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/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.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/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js(default)
-language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js(default)
-language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js(default)
-language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js(strict mode)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js(default)
-language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.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/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js(default)
@@ -479,18 +313,6 @@ language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-de
 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-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/named-dflt-params-duplicates.js(default)
 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)
@@ -511,8 +333,8 @@ language/expressions/class/elements/private-derived-cls-indirect-eval-err-contai
 language/expressions/class/elements/private-derived-cls-indirect-eval-err-contains-supercall.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-ctor-super-no-heritage.js(default)
-language/expressions/class/elements/syntax/early-errors/grammar-ctor-super-no-heritage.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)
@@ -569,14 +391,6 @@ language/expressions/class/elements/syntax/early-errors/invalid-names/method-her
 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-inner-call-expression-bad-reference.js(default)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-bad-reference.js(strict mode)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-this.js(default)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-this.js(strict mode)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-bad-reference.js(default)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-bad-reference.js(strict mode)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-this.js(default)
-language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-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)
@@ -591,51 +405,18 @@ language/expressions/class/elements/syntax/early-errors/invalid-names/method-out
 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/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-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/object/method-definition/private-name-early-error-async-fn-inside-class.js(default)
-language/expressions/object/method-definition/private-name-early-error-async-fn-inside-class.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/postfix-decrement/arguments-nostrict.js(default)
-language/expressions/postfix-decrement/eval-nostrict.js(default)
-language/expressions/postfix-increment/arguments-nostrict.js(default)
-language/expressions/postfix-increment/eval-nostrict.js(default)
-language/expressions/prefix-decrement/arguments-nostrict.js(default)
-language/expressions/prefix-decrement/eval-nostrict.js(default)
-language/expressions/prefix-increment/arguments-nostrict.js(default)
-language/expressions/prefix-increment/eval-nostrict.js(default)
 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/template-literal/unicode-escape-nls-err.js(default)
 language/expressions/template-literal/unicode-escape-nls-err.js(strict mode)
-language/global-code/new.target-arrow.js(default)
-language/global-code/new.target-arrow.js(strict mode)
 language/identifiers/unicode-escape-nls-err.js(default)
 language/identifiers/unicode-escape-nls-err.js(strict mode)
-language/import/dup-bound-names.js(default)
-language/import/dup-bound-names.js(strict mode)
-language/line-terminators/invalid-string-ls.js(default)
-language/line-terminators/invalid-string-ls.js(strict mode)
-language/line-terminators/invalid-string-ps.js(default)
-language/line-terminators/invalid-string-ps.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)
@@ -812,16 +593,6 @@ 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/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/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)
@@ -830,14 +601,6 @@ 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/async-function/dflt-params-duplicates.js(default)
-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/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)
@@ -866,8 +629,8 @@ language/statements/class/elements/privatename-not-valid-earlyerr-script-3.js(de
 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-ctor-super-no-heritage.js(default)
-language/statements/class/elements/syntax/early-errors/grammar-ctor-super-no-heritage.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)
@@ -924,14 +687,6 @@ language/statements/class/elements/syntax/early-errors/invalid-names/method-heri
 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-inner-call-expression-bad-reference.js(default)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-bad-reference.js(strict mode)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-this.js(default)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-call-expression-this.js(strict mode)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-bad-reference.js(default)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-bad-reference.js(strict mode)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-member-expression-this.js(default)
-language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-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)
@@ -946,174 +701,17 @@ language/statements/class/elements/syntax/early-errors/invalid-names/method-outt
 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/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/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-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/head-let-bound-names-in-stmt.js(default)
-language/statements/for/head-let-bound-names-in-stmt.js(strict mode)
-language/statements/function/dflt-params-duplicates.js(default)
-language/statements/generators/dflt-params-duplicates.js(default)
-language/statements/let/redeclaration-error-from-within-strict-mode-function.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js(default)
-language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js(default)
-language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js(strict mode)
-language/statements/try/early-catch-function.js(default)
-language/statements/try/early-catch-function.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)
\ No newline at end of file
+language/statements/for-of/head-var-no-expr.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 88%
rename from packages/babel-types/scripts/utils/formatCode.js
rename to scripts/utils/formatCode.js
index 1ed327bd82bf..9801d4acf002 100644
--- a/packages/babel-types/scripts/utils/formatCode.js
+++ b/scripts/utils/formatCode.js
@@ -5,7 +5,7 @@ module.exports = function formatCode(code, filename) {
   filename = filename || __filename;
   const prettierConfig = prettier.resolveConfig.sync(filename);
   prettierConfig.filepath = filename;
-  prettierConfig.parser = "babylon";
+  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 e0f7d90ff7d3..3921641a6111 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,6 +5,7 @@
 "@babel/cli@^7.2.3":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.2.3.tgz#1b262e42a3e959d28ab3d205ba2718e1923cfee6"
+  integrity sha512-bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
@@ -21,24 +22,26 @@
 "@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.1.0", "@babel/core@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
+"@babel/core@^7.1.0", "@babel/core@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
+  integrity sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
+    "@babel/generator" "^7.3.4"
     "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.2.2"
+    "@babel/parser" "^7.3.4"
     "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
@@ -46,36 +49,30 @@
 "@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.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e"
+  integrity sha512-8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.3.4"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/generator@^7.2.2":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb"
-  dependencies:
-    "@babel/types" "^7.3.0"
-    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.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.1.0"
     "@babel/types" "^7.0.0"
@@ -83,24 +80,28 @@
 "@babel/helper-call-delegate@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-create-class-features-plugin@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.0.tgz#2b01a81b3adc2b1287f9ee193688ef8dc71e718f"
+"@babel/helper-create-class-features-plugin@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz#092711a7a3ad8ea34de3e541644c2ce6af1f6f0c"
+  integrity sha512-uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g==
   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.2.3"
+    "@babel/helper-replace-supers" "^7.3.4"
+    "@babel/helper-split-export-declaration" "^7.0.0"
 
 "@babel/helper-define-map@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -109,6 +110,7 @@
 "@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/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -116,6 +118,7 @@
 "@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.1.0"
@@ -124,64 +127,66 @@
 "@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"
+  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@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.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
+  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
   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"
+    "@babel/template" "^7.2.2"
+    "@babel/types" "^7.2.2"
     lodash "^4.17.10"
 
 "@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"
+  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
   dependencies:
     lodash "^4.17.10"
 
 "@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.1.0"
@@ -189,18 +194,20 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz#a795208e9b911a6eeb08e5891faacf06e7013e13"
+  integrity sha512-pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.2.3"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
 
 "@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"
@@ -208,56 +215,64 @@
 "@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"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-wrap-function@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
+  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/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"
 
 "@babel/helpers@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.2.0.tgz#8335f3140f3144270dc63c4732a4f8b0a50b7a21"
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
   dependencies:
     "@babel/template" "^7.1.2"
     "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.2.0"
+    "@babel/types" "^7.3.0"
 
 "@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", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181"
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.2.2", "@babel/parser@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c"
+  integrity sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==
 
 "@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.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
+"@babel/plugin-proposal-class-properties@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz#410f5173b3dc45939f9ab30ca26684d72901405e"
+  integrity sha512-lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.3.0"
+    "@babel/helper-create-class-features-plugin" "^7.3.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@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.2.0"
@@ -265,6 +280,7 @@
 "@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.2.0"
@@ -272,13 +288,15 @@
 "@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.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.1.tgz#f69fb6a1ea6a4e1c503994a91d9cf76f3c4b36e8"
+"@babel/plugin-proposal-object-rest-spread@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz#47f73cf7f2a721aad5c0261205405c642e424654"
+  integrity sha512-j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -286,6 +304,7 @@
 "@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.2.0"
@@ -293,6 +312,7 @@
 "@babel/plugin-proposal-unicode-property-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
+  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -301,54 +321,63 @@
 "@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-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.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.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", "@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.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.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.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
+"@babel/plugin-transform-async-to-generator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz#4e45408d3c3da231c0e7b823f407a53a7eb3048c"
+  integrity sha512-Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -357,44 +386,50 @@
 "@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.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
+"@babel/plugin-transform-block-scoping@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz#5c22c339de234076eee96c8783b2fed61202c5c4"
+  integrity sha512-blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.0.tgz#374f8876075d7d21fea55aeb5c53561259163f96"
+"@babel/plugin-transform-classes@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz#dc173cb999c6c5297e0b5f2277fdaaec3739d0cc"
+  integrity sha512-J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
     "@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-replace-supers" "^7.3.4"
     "@babel/helper-split-export-declaration" "^7.0.0"
     globals "^11.1.0"
 
 "@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.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz#e75269b4b7889ec3a332cd0d0c8cff8fed0dc6f3"
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
+  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-dotall-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
+  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -403,32 +438,37 @@
 "@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.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.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.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz#00156236defb7dedddc2d3c9477dcc01a4494327"
+  integrity sha512-PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA==
   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.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
+  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-function-name@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
+  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -436,12 +476,14 @@
 "@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.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.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -449,14 +491,16 @@
 "@babel/plugin-transform-modules-commonjs@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
+  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
+"@babel/plugin-transform-modules-systemjs@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz#813b34cd9acb6ba70a84939f3680be0eb2e58861"
+  integrity sha512-VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -464,6 +508,7 @@
 "@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"
@@ -471,39 +516,45 @@
 "@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
+  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
   dependencies:
     regexp-tree "^0.1.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"
+  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@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.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz#3a873e07114e1a5bee17d04815662c8317f10e30"
+  integrity sha512-IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw==
   dependencies:
     "@babel/helper-call-delegate" "^7.1.0"
     "@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-regenerator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz#1601655c362f5b38eead6a52631f5106b29fa46a"
+  integrity sha512-hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA==
   dependencies:
-    regenerator-transform "^0.13.3"
+    regenerator-transform "^0.13.4"
 
-"@babel/plugin-transform-runtime@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
+"@babel/plugin-transform-runtime@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz#57805ac8c1798d102ecd75c03b024a5b3ea9b431"
+  integrity sha512-PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -513,18 +564,21 @@
 "@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.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.0.tgz#0c76c12a3b5826130078ee8ec84a7a8e4afd79c4"
+  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.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"
@@ -532,6 +586,7 @@
 "@babel/plugin-transform-template-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
+  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -539,26 +594,29 @@
 "@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.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
+  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
     regexpu-core "^4.1.3"
 
-"@babel/preset-env@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
+"@babel/preset-env@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
+  integrity sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.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.3.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
@@ -566,10 +624,10 @@
     "@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.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.3.4"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.2.0"
-    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.3.4"
+    "@babel/plugin-transform-classes" "^7.3.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.2.0"
     "@babel/plugin-transform-dotall-regex" "^7.2.0"
@@ -580,13 +638,13 @@
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
     "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
     "@babel/plugin-transform-new-target" "^7.0.0"
     "@babel/plugin-transform-object-super" "^7.2.0"
     "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-regenerator" "^7.3.4"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
@@ -601,6 +659,7 @@
 "@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"
@@ -608,6 +667,7 @@
 "@babel/register@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827"
+  integrity sha512-f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g==
   dependencies:
     core-js "^2.5.7"
     find-cache-dir "^1.0.0"
@@ -617,62 +677,197 @@
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
+"@babel/runtime@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
+  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
+  dependencies:
+    regenerator-runtime "^0.12.0"
+
+"@babel/runtime@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
+  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
   dependencies:
     regenerator-runtime "^0.12.0"
 
 "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.2.2"
     "@babel/types" "^7.2.2"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.3.4.tgz#1330aab72234f8dea091b08c4f8b9d05c7119e06"
+  integrity sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
+    "@babel/generator" "^7.3.4"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.2.3"
-    "@babel/types" "^7.2.2"
+    "@babel/parser" "^7.3.4"
+    "@babel/types" "^7.3.4"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@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.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.4.tgz#bf482eaeaffb367a28abbf9357a94963235d90ed"
+  integrity sha512-WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ==
   dependencies:
     esutils "^2.0.2"
-    lodash "^4.2.0"
+    lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0"
+"@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.17.10"
-    to-fast-properties "^2.0.0"
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
 
-"@iamstarkov/listr-update-renderer@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e"
+"@jest/console@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.3.0.tgz#7bd920d250988ba0bf1352c4493a48e1cb97671e"
+  integrity sha512-NaCty/OOei6rSDcbPdMiCbYCI0KGFGPgGO6B09lwWt5QTxnkuhKYET9El5u5z1GAcSxkQmSMtM63e24YabCWqA==
   dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
+    "@jest/source-map" "^24.3.0"
+    "@types/node" "*"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/core@^24.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.5.0.tgz#2cefc6a69e9ebcae1da8f7c75f8a257152ba1ec0"
+  integrity sha512-RDZArRzAs51YS7dXG1pbXbWGxK53rvUu8mCDYsgqqqQ6uSOaTjcVyBl2Jce0exT2rSLk38ca7az7t2f3b0/oYQ==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/reporters" "^24.5.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/transform" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.5.0"
+    jest-config "^24.5.0"
+    jest-haste-map "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve-dependencies "^24.5.0"
+    jest-runner "^24.5.0"
+    jest-runtime "^24.5.0"
+    jest-snapshot "^24.5.0"
+    jest-util "^24.5.0"
+    jest-validate "^24.5.0"
+    jest-watcher "^24.5.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.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.5.0.tgz#a2557f7808767abea3f9e4cc43a172122a63aca8"
+  integrity sha512-tzUHR9SHjMXwM8QmfHb/EJNbF0fjbH4ieefJBvtwO8YErLTrecc1ROj0uo2VnIT6SlpEGZnvdCK6VgKYBo8LsA==
+  dependencies:
+    "@jest/fake-timers" "^24.5.0"
+    "@jest/transform" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    "@types/node" "*"
+    jest-mock "^24.5.0"
+
+"@jest/fake-timers@^24.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.5.0.tgz#4a29678b91fd0876144a58f8d46e6c62de0266f0"
+  integrity sha512-i59KVt3QBz9d+4Qr4QxsKgsIg+NjfuCjSOWj3RQhjF5JNy+eVJDhANQ4WzulzNCHd72srMAykwtRn5NYDGVraw==
+  dependencies:
+    "@jest/types" "^24.5.0"
+    "@types/node" "*"
+    jest-message-util "^24.5.0"
+    jest-mock "^24.5.0"
+
+"@jest/reporters@^24.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.5.0.tgz#9363a210d0daa74696886d9cb294eb8b3ad9b4d9"
+  integrity sha512-vfpceiaKtGgnuC3ss5czWOihKOUSyjJA4M4udm6nH8xgqsuQYcyDCi4nMMcBKsHXWgz9/V5G7iisnZGfOh1w6Q==
+  dependencies:
+    "@jest/environment" "^24.5.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/transform" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-api "^2.1.1"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-source-maps "^3.0.1"
+    jest-haste-map "^24.5.0"
+    jest-resolve "^24.5.0"
+    jest-runtime "^24.5.0"
+    jest-util "^24.5.0"
+    jest-worker "^24.4.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.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.5.0.tgz#ab66fb7741a04af3363443084e72ea84861a53f2"
+  integrity sha512-u66j2vBfa8Bli1+o3rCaVnVYa9O8CAFZeqiqLVhnarXtreSXG33YQ6vNYBogT7+nYiFNOohTU21BKiHlgmxD5A==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/types" "^24.5.0"
+    "@types/istanbul-lib-coverage" "^1.1.0"
+
+"@jest/transform@^24.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.5.0.tgz#6709fc26db918e6af63a985f2cc3c464b4cf99d9"
+  integrity sha512-XSsDz1gdR/QMmB8UCKlweAReQsZrD/DK7FuDlNo/pE8EcKMrfi2kqLRk8h8Gy/PDzgqJj64jNEzOce9pR8oj1w==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.5.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.5.0"
+    jest-regex-util "^24.3.0"
+    jest-util "^24.5.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.5.0":
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.5.0.tgz#feee214a4d0167b0ca447284e95a57aa10b3ee95"
+  integrity sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^1.1.0"
+    "@types/yargs" "^12.0.9"
 
 "@lerna/add@^3.6.0":
   version "3.6.0"
@@ -1208,6 +1403,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"
@@ -1235,6 +1463,16 @@
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.35.tgz#8999974b34028686a8d61a719e61c138d3755107"
 
+"@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/istanbul-lib-coverage@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a"
+  integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==
+
 "@types/lodash@^4.14.67":
   version "4.14.104"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80"
@@ -1243,6 +1481,11 @@
   version "9.4.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
 
+"@types/node@^11.9.5":
+  version "11.10.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.4.tgz#3f5fc4f0f322805f009e00ab35a2ff3d6b778e42"
+  integrity sha512-wa09itaLE8L705aXd8F80jnFpxz3Y1/KRHfKsYL2bPc0XF+wEWu8sR9n5bmeu8Ba1N9z2GRNzm/YdHcghLkLKg==
+
 "@types/node@^8.0.0":
   version "8.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48"
@@ -1251,6 +1494,11 @@
   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"
@@ -1270,14 +1518,12 @@
     "@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"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
+"@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.3.4:
+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:
@@ -1333,9 +1579,10 @@ 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@^6.0.2:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
+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==
 
 agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
   version "4.2.1"
@@ -1353,9 +1600,10 @@ ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@^6.1.0, ajv@^6.5.3, ajv@^6.5.5:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
+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"
@@ -1386,9 +1634,10 @@ ansi-cyan@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
-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"
@@ -1674,17 +1923,7 @@ async-settle@^1.0.0:
   dependencies:
     async-done "^1.2.2"
 
-async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.1.2:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.5.0, async@^2.6.1:
+async@^2.1.2, async@^2.5.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -1714,12 +1953,18 @@ babel-eslint@^11.0.0-beta.0:
     eslint-visitor-keys "^1.0.0"
     semver "^5.6.0"
 
-babel-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.0.0.tgz#8a0c767f03f4a595fb921afdab13ff126edd00da"
+babel-jest@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.5.0.tgz#0ea042789810c2bec9065f7c8ab4dc18e1d28559"
+  integrity sha512-0fKCXyRwxFTJL0UXDJiT2xYxO9Lu2vBd9n+cC+eDjESzcVG3s2DRGAxbzJX21fceB1WYoBjAh8pQ83dKcl003g==
   dependencies:
+    "@jest/transform" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    "@types/babel__core" "^7.1.0"
     babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.0.0"
+    babel-preset-jest "^24.3.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
 
 babel-loader@^8.0.5:
   version "8.0.5"
@@ -1738,9 +1983,12 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.0.0"
     test-exclude "^5.0.0"
 
-babel-plugin-jest-hoist@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.0.0.tgz#3adf030b6fd67e4311479a54b24077bdfc226ec9"
+babel-plugin-jest-hoist@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.3.0.tgz#f2e82952946f6e40bb0a75d266a3790d854c8b5b"
+  integrity sha512-nWh4N1mVH55Tzhx2isvUN5ebM5CDUvIpXPZYMRazQughie/EqGnbR+czzoQlhUmJG9pPJmYDRhvocotb2THl1w==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-transform-charcodes@^0.2.0:
   version "0.2.0"
@@ -1749,12 +1997,13 @@ babel-plugin-transform-charcodes@^0.2.0:
     "@babel/parser" "^7.0.0"
     "@babel/traverse" "^7.0.0"
 
-babel-preset-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.0.0.tgz#d23782e5e036cff517859640a80960bd628bd82b"
+babel-preset-jest@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz#db88497e18869f15b24d9c0e547d8e0ab950796d"
+  integrity sha512-VGTV2QYBa/Kn3WCOKdfS31j9qomaXSgJqi65B6o05/1GsJyj9LVhSljM9ro4S+IBGj/ENhNBuH9bpqzztKAQSw==
   dependencies:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.0.0"
+    babel-plugin-jest-hoist "^24.3.0"
 
 bach@^1.0.0:
   version "1.2.0"
@@ -1814,12 +2063,6 @@ 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"
@@ -1899,15 +2142,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"
 
@@ -2066,10 +2304,15 @@ buffer@^5.0.2:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0:
+builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+builtin-modules@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
+  integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
+
 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"
@@ -2231,15 +2474,7 @@ chalk@^1.0.0, 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"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.3.0:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, 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==
@@ -2248,14 +2483,6 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.1, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 charcodes@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
@@ -2294,11 +2521,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
 
@@ -2317,10 +2540,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"
@@ -2502,11 +2721,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.14.x, commander@^2.8.1, commander@^2.9.0, commander@~2.14.1:
+commander@2.14.x, commander@~2.14.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
-commander@^2.14.1:
+commander@^2.14.1, commander@^2.8.1, commander@^2.9.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
 
@@ -2537,10 +2756,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.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"
@@ -2553,15 +2773,6 @@ 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"
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 config-chain@^1.1.11:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -2706,14 +2917,6 @@ 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@5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
 cosmiconfig@^5.0.2, cosmiconfig@^5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
@@ -2859,13 +3062,7 @@ debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^4.0.1, debug@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.1:
+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:
@@ -2954,18 +3151,6 @@ 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"
-  dependencies:
-    globby "^5.0.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"
-    rimraf "^2.2.8"
-
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -3042,9 +3227,10 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff-sequences@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.0.0.tgz#cdf8e27ed20d8b8d3caccb4e0c0d8fe31a173013"
+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"
@@ -3069,9 +3255,10 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+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"
 
@@ -3194,6 +3381,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"
@@ -3350,9 +3542,10 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-babel@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-babel/-/eslint-config-babel-8.0.2.tgz#01f4b430148078522a4c69ab76944c672092d143"
+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-import-resolver-node@^0.3.2:
   version "0.3.2"
@@ -3371,10 +3564,11 @@ eslint-module-utils@^2.3.0:
     pkg-dir "^2.0.0"
 
 eslint-plugin-flowtype@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.2.1.tgz#45e032aee54e695dfc41a891e92b7afedfc62c77"
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.4.2.tgz#55475e10b05fd714d60bceebbbed596cb8706b16"
+  integrity sha512-sv6O6fiN3dIwhU4qRxfcyIpbKGVvsxwIQ6vgBLudpQKjH1rEyEFEOjGzGEUBTQP9J8LdTZm37OjiqZ0ZeFOa6g==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 eslint-plugin-import@^2.16.0:
   version "2.16.0"
@@ -3405,9 +3599,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.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.2.tgz#5f10cd6cabb1965bf479fa65745673439e21cb0e"
+  integrity sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3420,53 +3615,54 @@ 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.12.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.1.tgz#5ca9931fb9029d04e7be92b03ce3b58edfac7e3b"
+eslint@^5.15.1:
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.15.1.tgz#8266b089fd5391e0009a047050795b1d73664524"
+  integrity sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    ajv "^6.5.3"
+    ajv "^6.9.1"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
     debug "^4.0.1"
-    doctrine "^2.1.0"
-    eslint-scope "^4.0.0"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.2"
     eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^5.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.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.1.0"
+    inquirer "^6.2.2"
     js-yaml "^3.12.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.1"
     semver "^5.5.1"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
-    table "^5.0.2"
+    table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"
+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 "^6.0.2"
+    acorn "^6.0.7"
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
@@ -3494,9 +3690,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"
@@ -3524,11 +3721,10 @@ 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"
-  dependencies:
-    merge "^1.1.3"
+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"
@@ -3600,15 +3796,17 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.0.0.tgz#71f71d88a4202746fc79849bb4c6498008b5ef03"
+expect@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.5.0.tgz#492fb0df8378d8474cc84b827776b069f46294ed"
+  integrity sha512-p2Gmc0CLxOgkyA93ySWmHFYHUPFIHG6XZ06l7WArWAsrqYVaVEkOU5NtT5i68KUyGKbkQgDCkiT65bWmdoL6Bw==
   dependencies:
+    "@jest/types" "^24.5.0"
     ansi-styles "^3.2.0"
-    jest-get-type "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
+    jest-get-type "^24.3.0"
+    jest-matcher-utils "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-regex-util "^24.3.0"
 
 extend-shallow@^1.1.2:
   version "1.1.4"
@@ -3629,15 +3827,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extend@~3.0.2:
+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@^3.0.0:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   dependencies:
@@ -3681,7 +3875,7 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@1.3.2, 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:
@@ -3689,7 +3883,7 @@ fancy-log@1.3.2, fancy-log@^1.3.2:
     color-support "^1.1.3"
     time-stamp "^1.0.0"
 
-fancy-log@^1.3.3:
+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:
@@ -3752,12 +3946,12 @@ 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"
@@ -3866,19 +4060,24 @@ 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.92.1:
-  version "0.92.1"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.92.1.tgz#32c136c07235f30c42dc0549a0790f370fad4070"
-  integrity sha512-F5kC5oQOR2FXROAeybJHFqgZP+moKV9fa/53QK4Q4WayTQHdA0KSl48KD1gP0A9mioRLiKUegTva/7I15cX3Iw==
+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.0, flush-write-stream@^1.0.2:
   version "1.0.3"
@@ -3887,6 +4086,11 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
     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"
@@ -3979,15 +4183,9 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fsevents@^1.2.3:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -4175,20 +4373,10 @@ glob-watcher@^5.0.0:
     just-debounce "^1.0.0"
     object.defaults "^1.1.0"
 
-glob@^7.0.0, glob@^7.0.3, 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"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3:
+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"
@@ -4215,24 +4403,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"
-
-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"
@@ -4262,13 +4436,10 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^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.1.15:
+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"
@@ -4335,13 +4506,16 @@ 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.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.1.tgz#8d3eee466521bea6b10fd75dff72adf8b7ea2d97"
+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"
@@ -4380,9 +4554,10 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
-handlebars@^4.0.11:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+handlebars@^4.0.2, 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 "^2.5.0"
     optimist "^0.6.1"
@@ -4390,16 +4565,6 @@ handlebars@^4.0.11:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.0.2:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4463,16 +4628,10 @@ has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
   dependencies:
-    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"
-  dependencies:
-    function-bind "^1.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
-has@^1.0.3:
+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==
@@ -4521,11 +4680,7 @@ homedir-polyfill@^1.0.1:
   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.6.0:
+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"
 
@@ -4624,22 +4779,16 @@ husky@^1.3.1:
     run-node "^1.0.0"
     slash "^2.0.0"
 
-iconv-lite@0.4.19, iconv-lite@~0.4.13:
+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.24:
+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.2 < 3"
 
-iconv-lite@^0.4.4:
-  version "0.4.21"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
-  dependencies:
-    safer-buffer "^2.1.0"
-
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -4752,38 +4901,21 @@ inline-source-map@~0.6.0:
   dependencies:
     source-map "~0.5.3"
 
-inquirer@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.0"
-    figures "^2.0.0"
-    lodash "^4.17.10"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+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 "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
     strip-ansi "^5.0.0"
     through "^2.3.6"
@@ -4805,13 +4937,7 @@ 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.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
-  dependencies:
-    loose-envify "^1.0.0"
-
-invariant@^2.2.4:
+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:
@@ -5146,9 +5272,10 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^2.0.8:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.0.tgz#37ab0c2c3e83065462f5254b94749d6157846c4e"
+istanbul-api@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.1.tgz#194b773f6d9cbc99a9258446848b0f988951c4d0"
+  integrity sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
@@ -5158,16 +5285,12 @@ istanbul-api@^2.0.8:
     istanbul-lib-instrument "^3.1.0"
     istanbul-lib-report "^2.0.4"
     istanbul-lib-source-maps "^3.0.2"
-    istanbul-reports "^2.1.0"
+    istanbul-reports "^2.1.1"
     js-yaml "^3.12.0"
     make-dir "^1.3.0"
     minimatch "^3.0.4"
     once "^1.4.0"
 
-istanbul-lib-coverage@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
-
 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"
@@ -5178,19 +5301,7 @@ istanbul-lib-hook@^2.0.3:
   dependencies:
     append-transform "^1.0.0"
 
-istanbul-lib-instrument@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
-  dependencies:
-    "@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.1"
-    semver "^5.5.0"
-
-istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
+istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
   dependencies:
@@ -5220,325 +5331,362 @@ istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
-istanbul-reports@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.0.tgz#87b8b55cd1901ba1748964c98ddd8900ce306d59"
+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.0.11"
+    handlebars "^4.1.0"
 
-jest-changed-files@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.0.0.tgz#c02c09a8cc9ca93f513166bc773741bd39898ff7"
+jest-changed-files@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.5.0.tgz#4075269ee115d87194fd5822e642af22133cf705"
+  integrity sha512-Ikl29dosYnTsH9pYa1Tv9POkILBhN/TLZ37xbzgNsZ1D2+2n+8oEZS2yP1BrHn/T4Rs4Ggwwbp/x8CKOS5YJOg==
   dependencies:
+    "@jest/types" "^24.5.0"
     execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.0.0.tgz#691fd4f7bce2574c1865db6844a43b56e60ce2a4"
+jest-cli@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.5.0.tgz#598139d3446d1942fb7dc93944b9ba766d756d4b"
+  integrity sha512-P+Jp0SLO4KWN0cGlNtC7JV0dW1eSFR7eRpoOucP2UM0sqlzp/bVHeo71Omonvigrj9AvCKy7NtQANtqJ7FXz8g==
   dependencies:
-    ansi-escapes "^3.0.0"
+    "@jest/core" "^24.5.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
     chalk "^2.0.1"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.15"
     import-local "^2.0.0"
     is-ci "^2.0.0"
-    istanbul-api "^2.0.8"
-    istanbul-lib-coverage "^2.0.2"
-    istanbul-lib-instrument "^3.0.1"
-    istanbul-lib-source-maps "^3.0.1"
-    jest-changed-files "^24.0.0"
-    jest-config "^24.0.0"
-    jest-environment-jsdom "^24.0.0"
-    jest-get-type "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve-dependencies "^24.0.0"
-    jest-runner "^24.0.0"
-    jest-runtime "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
-    jest-watcher "^24.0.0"
-    jest-worker "^24.0.0"
-    micromatch "^3.1.10"
-    node-notifier "^5.2.1"
-    p-each-series "^1.0.0"
-    pirates "^4.0.0"
+    jest-config "^24.5.0"
+    jest-util "^24.5.0"
+    jest-validate "^24.5.0"
     prompts "^2.0.1"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^2.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^5.0.0"
-    which "^1.2.12"
+    realpath-native "^1.1.0"
     yargs "^12.0.2"
 
-jest-config@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.0.0.tgz#878abe03c060c74a0ec30d3cd5dd1897873e030e"
+jest-config@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.5.0.tgz#404d1bc6bb81aed6bd1890d07e2dca9fbba2e121"
+  integrity sha512-t2UTh0Z2uZhGBNVseF8wA2DS2SuBiLOL6qpLq18+OZGfFUxTM7BzUVKyHFN/vuN+s/aslY1COW95j1Rw81huOQ==
   dependencies:
     "@babel/core" "^7.1.0"
-    babel-jest "^24.0.0"
+    "@jest/types" "^24.5.0"
+    babel-jest "^24.5.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^24.0.0"
-    jest-environment-node "^24.0.0"
-    jest-get-type "^24.0.0"
-    jest-jasmine2 "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
+    jest-environment-jsdom "^24.5.0"
+    jest-environment-node "^24.5.0"
+    jest-get-type "^24.3.0"
+    jest-jasmine2 "^24.5.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.5.0"
+    jest-util "^24.5.0"
+    jest-validate "^24.5.0"
     micromatch "^3.1.10"
-    pretty-format "^24.0.0"
-    realpath-native "^1.0.2"
-    uuid "^3.3.2"
+    pretty-format "^24.5.0"
+    realpath-native "^1.1.0"
 
-jest-diff@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.0.0.tgz#a3e5f573dbac482f7d9513ac9cfa21644d3d6b34"
+jest-diff@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.5.0.tgz#a2d8627964bb06a91893c0fbcb28ab228c257652"
+  integrity sha512-mCILZd9r7zqL9Uh6yNoXjwGQx0/J43OD2vvWVKwOEOLZliQOsojXwqboubAQ+Tszrb6DHGmNU7m4whGeB9YOqw==
   dependencies:
     chalk "^2.0.1"
-    diff-sequences "^24.0.0"
-    jest-get-type "^24.0.0"
-    pretty-format "^24.0.0"
+    diff-sequences "^24.3.0"
+    jest-get-type "^24.3.0"
+    pretty-format "^24.5.0"
 
-jest-docblock@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.0.0.tgz#54d77a188743e37f62181a91a01eb9222289f94e"
+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@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.0.0.tgz#10987a06b21c7ffbfb7706c89d24c52ed864be55"
+jest-each@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.5.0.tgz#da14d017a1b7d0f01fb458d338314cafe7f72318"
+  integrity sha512-6gy3Kh37PwIT5sNvNY2VchtIFOOBh8UCYnBlxXMb5sr5wpJUDPTUATX2Axq1Vfk+HWTMpsYPeVYp4TXx5uqUBw==
   dependencies:
+    "@jest/types" "^24.5.0"
     chalk "^2.0.1"
-    jest-get-type "^24.0.0"
-    jest-util "^24.0.0"
-    pretty-format "^24.0.0"
-
-jest-environment-jsdom@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.0.0.tgz#5affa0654d6e44cd798003daa1a8701dbd6e4d11"
-  dependencies:
-    jest-mock "^24.0.0"
-    jest-util "^24.0.0"
+    jest-get-type "^24.3.0"
+    jest-util "^24.5.0"
+    pretty-format "^24.5.0"
+
+jest-environment-jsdom@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.5.0.tgz#1c3143063e1374100f8c2723a8b6aad23b6db7eb"
+  integrity sha512-62Ih5HbdAWcsqBx2ktUnor/mABBo1U111AvZWcLKeWN/n/gc5ZvDBKe4Og44fQdHKiXClrNGC6G0mBo6wrPeGQ==
+  dependencies:
+    "@jest/environment" "^24.5.0"
+    "@jest/fake-timers" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    jest-mock "^24.5.0"
+    jest-util "^24.5.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.0.0.tgz#330948980656ed8773ce2e04eb597ed91e3c7190"
+jest-environment-node@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.5.0.tgz#763eebdf529f75b60aa600c6cf8cb09873caa6ab"
+  integrity sha512-du6FuyWr/GbKLsmAbzNF9mpr2Iu2zWSaq/BNHzX+vgOcts9f2ayXBweS7RAhr+6bLp6qRpMB6utAMF5Ygktxnw==
   dependencies:
-    jest-mock "^24.0.0"
-    jest-util "^24.0.0"
+    "@jest/environment" "^24.5.0"
+    "@jest/fake-timers" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    jest-mock "^24.5.0"
+    jest-util "^24.5.0"
 
-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-get-type@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.3.0.tgz#582cfd1a4f91b5cdad1d43d2932f816d543c65da"
+  integrity sha512-HYF6pry72YUlVcvUx3sEpMRwXEWGEPlJ0bSPVnB3b3n++j4phUEoSPcS6GC0pPJ9rpyPSe4cb5muFo6D39cXow==
 
-jest-get-type@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.0.0.tgz#36e72930b78e33da59a4f63d44d332188278940b"
-
-jest-haste-map@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0.tgz#e9ef51b2c9257384b4d6beb83bd48c65b37b5e6e"
+jest-haste-map@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.5.0.tgz#3f17d0c548b99c0c96ed2893f9c0ccecb2eb9066"
+  integrity sha512-mb4Yrcjw9vBgSvobDwH8QUovxApdimGcOkp+V1ucGGw4Uvr3VzZQBJhNm1UY3dXYm4XXyTW2G7IBEZ9pM2ggRQ==
   dependencies:
+    "@jest/types" "^24.5.0"
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.15"
     invariant "^2.2.4"
-    jest-serializer "^24.0.0"
-    jest-util "^24.0.0"
-    jest-worker "^24.0.0"
+    jest-serializer "^24.4.0"
+    jest-util "^24.5.0"
+    jest-worker "^24.4.0"
     micromatch "^3.1.10"
-    sane "^3.0.0"
+    sane "^4.0.3"
 
-jest-jasmine2@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.0.0.tgz#7d87be9d8b32d34ac5980ad646b7ae7f99e33a19"
+jest-jasmine2@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.5.0.tgz#e6af4d7f73dc527d007cca5a5b177c0bcc29d111"
+  integrity sha512-sfVrxVcx1rNUbBeyIyhkqZ4q+seNKyAG6iM0S2TYBdQsXjoFDdqWFfsUxb6uXSsbimbXX/NMkJIwUZ1uT9+/Aw==
   dependencies:
     "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.5.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^24.0.0"
+    expect "^24.5.0"
     is-generator-fn "^2.0.0"
-    jest-each "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    pretty-format "^24.0.0"
+    jest-each "^24.5.0"
+    jest-matcher-utils "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-runtime "^24.5.0"
+    jest-snapshot "^24.5.0"
+    jest-util "^24.5.0"
+    pretty-format "^24.5.0"
+    throat "^4.0.0"
 
-jest-leak-detector@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.0.0.tgz#78280119fd05ee98317daee62cddb3aa537a31c6"
+jest-leak-detector@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.5.0.tgz#21ae2b3b0da252c1171cd494f75696d65fb6fa89"
+  integrity sha512-LZKBjGovFRx3cRBkqmIg+BZnxbrLqhQl09IziMk3oeh1OV81Hg30RUIx885mq8qBv1PA0comB9bjKcuyNO1bCQ==
   dependencies:
-    pretty-format "^24.0.0"
+    pretty-format "^24.5.0"
 
-jest-matcher-utils@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.0.0.tgz#fc9c41cfc49b2c3ec14e576f53d519c37729d579"
+jest-matcher-utils@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.5.0.tgz#5995549dcf09fa94406e89526e877b094dad8770"
+  integrity sha512-QM1nmLROjLj8GMGzg5VBra3I9hLpjMPtF1YqzQS3rvWn2ltGZLrGAO1KQ9zUCVi5aCvrkbS5Ndm2evIP9yZg1Q==
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^24.0.0"
-    jest-get-type "^24.0.0"
-    pretty-format "^24.0.0"
+    jest-diff "^24.5.0"
+    jest-get-type "^24.3.0"
+    pretty-format "^24.5.0"
 
-jest-message-util@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.0.0.tgz#a07a141433b2c992dbaec68d4cbfe470ba289619"
+jest-message-util@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.5.0.tgz#181420a65a7ef2e8b5c2f8e14882c453c6d41d07"
+  integrity sha512-6ZYgdOojowCGiV0D8WdgctZEAe+EcFU+KrVds+0ZjvpZurUW2/oKJGltJ6FWY2joZwYXN5VL36GPV6pNVRqRnQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    "@types/stack-utils" "^1.0.1"
     chalk "^2.0.1"
     micromatch "^3.1.10"
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.0.0.tgz#9a4b53e01d66a0e780f7d857462d063e024c617d"
+jest-mock@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.5.0.tgz#976912c99a93f2a1c67497a9414aa4d9da4c7b76"
+  integrity sha512-ZnAtkWrKf48eERgAOiUxVoFavVBziO2pAi2MfZ1+bGXVkDfxWLxU0//oJBkgwbsv6OAmuLBz4XFFqvCFMqnGUw==
+  dependencies:
+    "@jest/types" "^24.5.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@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.0.0.tgz#4feee8ec4a358f5bee0a654e94eb26163cb9089a"
+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@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.0.0.tgz#86540611d660bdcaab8b87d069247d3832811d94"
+jest-resolve-dependencies@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.5.0.tgz#1a0dae9cdd41349ca4a84148b3e78da2ba33fd4b"
+  integrity sha512-dRVM1D+gWrFfrq2vlL5P9P/i8kB4BOYqYf3S7xczZ+A6PC3SgXYSErX/ScW/469pWMboM1uAhgLF+39nXlirCQ==
   dependencies:
-    jest-regex-util "^24.0.0"
-    jest-snapshot "^24.0.0"
+    "@jest/types" "^24.5.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.5.0"
 
-jest-resolve@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.0.0.tgz#0206cfe842324f8796b01f706f4075309bf7b405"
+jest-resolve@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.5.0.tgz#8c16ba08f60a1616c3b1cd7afb24574f50a24d04"
+  integrity sha512-ZIfGqLX1Rg8xJpQqNjdoO8MuxHV1q/i2OO1hLXjgCWFWs5bsedS8UrOdgjUqqNae6DXA+pCyRmdcB7lQEEbXew==
   dependencies:
+    "@jest/types" "^24.5.0"
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
-    realpath-native "^1.0.0"
-
-jest-runner@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.0.0.tgz#00b280d52d23286111a8ed0362ed958283f7f0e3"
-  dependencies:
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
+
+jest-runner@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.5.0.tgz#9be26ece4fd4ab3dfb528b887523144b7c5ffca8"
+  integrity sha512-oqsiS9TkIZV5dVkD+GmbNfWBRPIvxqmlTQ+AQUJUQ07n+4xTSDc40r+aKBynHw9/tLzafC00DIbJjB2cOZdvMA==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/environment" "^24.5.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    chalk "^2.4.2"
     exit "^0.1.2"
     graceful-fs "^4.1.15"
-    jest-config "^24.0.0"
-    jest-docblock "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-jasmine2 "^24.0.0"
-    jest-leak-detector "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-runtime "^24.0.0"
-    jest-util "^24.0.0"
-    jest-worker "^24.0.0"
+    jest-config "^24.5.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.5.0"
+    jest-jasmine2 "^24.5.0"
+    jest-leak-detector "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-resolve "^24.5.0"
+    jest-runtime "^24.5.0"
+    jest-util "^24.5.0"
+    jest-worker "^24.4.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.0.0.tgz#bc80756f5458c2c8e4db86f44b687ff692026c13"
-  dependencies:
-    "@babel/core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
+jest-runtime@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.5.0.tgz#3a76e0bfef4db3896d5116e9e518be47ba771aa2"
+  integrity sha512-GTFHzfLdwpaeoDPilNpBrorlPoNZuZrwKKzKJs09vWwHo+9TOsIIuszK8cWOuKC7ss07aN1922Ge8fsGdsqCuw==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/environment" "^24.5.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.5.0"
+    "@jest/types" "^24.5.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"
     glob "^7.1.3"
     graceful-fs "^4.1.15"
-    jest-config "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
-    micromatch "^3.1.10"
-    realpath-native "^1.0.0"
+    jest-config "^24.5.0"
+    jest-haste-map "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-mock "^24.5.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.5.0"
+    jest-snapshot "^24.5.0"
+    jest-util "^24.5.0"
+    jest-validate "^24.5.0"
+    realpath-native "^1.1.0"
     slash "^2.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.4.2"
+    strip-bom "^3.0.0"
     yargs "^12.0.2"
 
-jest-serializer@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0.tgz#522c44a332cdd194d8c0531eb06a1ee5afb4256b"
+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@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.0.0.tgz#fb447a753a3271660b3d89d068698014eb14c414"
+jest-snapshot@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.5.0.tgz#e5d224468a759fd19e36f01217aac912f500f779"
+  integrity sha512-eBEeJb5ROk0NcpodmSKnCVgMOo+Qsu5z9EDl3tGffwPzK1yV37mjGWF2YeIz1NkntgTzP+fUL4s09a0+0dpVWA==
   dependencies:
     "@babel/types" "^7.0.0"
+    "@jest/types" "^24.5.0"
     chalk "^2.0.1"
-    jest-diff "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-resolve "^24.0.0"
+    expect "^24.5.0"
+    jest-diff "^24.5.0"
+    jest-matcher-utils "^24.5.0"
+    jest-message-util "^24.5.0"
+    jest-resolve "^24.5.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^24.0.0"
+    pretty-format "^24.5.0"
     semver "^5.5.0"
 
-jest-util@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.0.0.tgz#fd38fcafd6dedbd0af2944d7a227c0d91b68f7d6"
+jest-util@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.5.0.tgz#9d9cb06d9dcccc8e7cc76df91b1635025d7baa84"
+  integrity sha512-Xy8JsD0jvBz85K7VsTIQDuY44s+hYJyppAhcsHsOsGisVtdhar6fajf2UOf2mEVEgh15ZSdA0zkCuheN8cbr1Q==
   dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/fake-timers" "^24.5.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    "@types/node" "*"
     callsites "^3.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.15"
     is-ci "^2.0.0"
-    jest-message-util "^24.0.0"
     mkdirp "^0.5.1"
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.5.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^23.6.0"
-
-jest-validate@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.0.0.tgz#aa8571a46983a6538328fef20406b4a496b6c020"
+jest-validate@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.5.0.tgz#62fd93d81214c070bb2d7a55f329a79d8057c7de"
+  integrity sha512-gg0dYszxjgK2o11unSIJhkOFZqNRQbWOAB2/LOUdsd2LfD9oXiMeuee8XsT0iRy5EvSccBgB4h/9HRbIo3MHgQ==
   dependencies:
+    "@jest/types" "^24.5.0"
     camelcase "^5.0.0"
     chalk "^2.0.1"
-    jest-get-type "^24.0.0"
+    jest-get-type "^24.3.0"
     leven "^2.1.0"
-    pretty-format "^24.0.0"
+    pretty-format "^24.5.0"
 
-jest-watcher@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.0.0.tgz#20d44244d10b0b7312410aefd256c1c1eef68890"
+jest-watcher@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.5.0.tgz#da7bd9cb5967e274889b42078c8f501ae1c47761"
+  integrity sha512-/hCpgR6bg0nKvD3nv4KasdTxuhwfViVMHUATJlnGCD0r1QrmIssimPbmc5KfAQblAVxkD8xrzuij9vfPUk1/rA==
   dependencies:
+    "@jest/test-result" "^24.5.0"
+    "@jest/types" "^24.5.0"
+    "@types/node" "*"
+    "@types/yargs" "^12.0.9"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
-    jest-util "^24.0.0"
+    jest-util "^24.5.0"
     string-length "^2.0.0"
 
-jest-worker@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0.tgz#3d3483b077bf04f412f47654a27bba7e947f8b6d"
+jest-worker@^24.4.0:
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.4.0.tgz#fbc452b0120bb5c2a70cdc88fa132b48eeb11dd0"
+  integrity sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==
   dependencies:
+    "@types/node" "*"
     merge-stream "^1.0.1"
     supports-color "^6.1.0"
 
-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.0.0.tgz#b8e2c8e6274e1092c7f56e57762a1fdc7800201e"
+jest@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.5.0.tgz#38f11ae2c2baa2f86c2bc4d8a91d2b51612cd19a"
+  integrity sha512-lxL+Fq5/RH7inxxmfS2aZLCf8MsS+YCUBfeiNO6BWz/MmjhDGaIEA/2bzEf9q4Q0X+mtFHiinHFvQ0u+RvW/qQ==
   dependencies:
     import-local "^2.0.0"
-    jest-cli "^24.0.0"
+    jest-cli "^24.5.0"
 
 js-levenshtein@^1.1.3:
   version "1.1.3"
@@ -5552,20 +5700,13 @@ 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.12.0:
+js-yaml@^3.12.0, js-yaml@^3.2.1, js-yaml@^3.9.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.9.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5613,14 +5754,10 @@ 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.0:
+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-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.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5933,13 +6070,13 @@ liftoff@^2.5.0:
     resolve "^1.1.7"
 
 lint-staged@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz#dbc3ae2565366d8f20efb9f9799d076da64863f2"
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.5.tgz#372476fe1a58b8834eb562ed4c99126bd60bdd79"
+  integrity sha512-e5ZavfnSLcBJE1BTzRTqw6ly8OkqVyO3GL2M6teSmTBYQ/2BuueD5GIt2RPsP31u/vjKdexUyDCxSyK75q4BDA==
   dependencies:
-    "@iamstarkov/listr-update-renderer" "0.4.1"
     chalk "^2.3.1"
     commander "^2.14.1"
-    cosmiconfig "5.0.6"
+    cosmiconfig "^5.0.2"
     debug "^3.1.0"
     dedent "^0.7.0"
     del "^3.0.0"
@@ -5948,9 +6085,9 @@ lint-staged@^8.1.0:
     g-status "^2.0.2"
     is-glob "^4.0.0"
     is-windows "^1.0.2"
-    jest-validate "^23.5.0"
     listr "^0.14.2"
-    lodash "^4.17.5"
+    listr-update-renderer "^0.5.0"
+    lodash "^4.17.11"
     log-symbols "^2.2.0"
     micromatch "^3.1.8"
     npm-which "^3.0.1"
@@ -5961,6 +6098,7 @@ lint-staged@^8.1.0:
     staged-git-files "1.1.2"
     string-argv "^0.0.2"
     stringify-object "^3.2.2"
+    yup "^0.26.10"
 
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
@@ -6104,17 +6242,10 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     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:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-
-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.17.11:
+lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -6157,29 +6288,18 @@ lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^4.1.2, lru-cache@^4.1.3:
+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"
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^1.3.0:
+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"
 
@@ -6327,11 +6447,7 @@ merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
 
-merge@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
-
-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:
@@ -6349,27 +6465,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.10, 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"
@@ -6392,25 +6491,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.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-
-mime-types@^2.1.12:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
+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.19:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+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.37.0"
+    mime-db "~1.38.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -6449,26 +6540,13 @@ 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"
-  dependencies:
-    safe-buffer "^5.1.1"
-    yallist "^3.0.0"
-
-minipass@^2.3.4, minipass@^2.3.5:
+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.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"
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -6778,20 +6856,13 @@ npm-logical-tree@^1.2.1:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-packlist@^1.1.6:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-path@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -7337,6 +7408,13 @@ pirates@^4.0.0:
   dependencies:
     node-modules-regexp "^1.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"
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -7374,10 +7452,6 @@ plugin-error@^0.1.2:
     arr-union "^2.0.1"
     extend-shallow "^1.1.2"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -7401,22 +7475,19 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 prettier@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.1.tgz#534c2c9d7853f8845e5e078384e71973bd74089f"
-
-pretty-format@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
-pretty-format@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
+pretty-format@^24.5.0:
+  version "24.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.5.0.tgz#cc69a0281a62cd7242633fc135d6930cd889822d"
+  integrity sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ==
   dependencies:
+    "@jest/types" "^24.5.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"
@@ -7470,6 +7541,11 @@ promzard@^0.3.0:
   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"
@@ -7585,6 +7661,11 @@ rc@^1.2.7:
     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"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
@@ -7734,9 +7815,10 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-realpath-native@^1.0.0, realpath-native@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+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"
 
@@ -7769,9 +7851,10 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-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"
 
@@ -7783,9 +7866,10 @@ 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.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
+  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
   dependencies:
     private "^0.1.6"
 
@@ -7815,15 +7899,16 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
+  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"
+    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"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
 regjsgen@^0.5.0:
   version "0.5.0"
@@ -7970,7 +8055,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
+resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   dependencies:
@@ -7997,7 +8082,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.2, 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:
@@ -8010,37 +8095,39 @@ 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@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
+  integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
   dependencies:
-    builtin-modules "^1.1.0"
+    builtin-modules "^3.0.0"
     is-module "^1.0.0"
-    resolve "^1.1.6"
+    resolve "^1.10.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-pluginutils@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz#de43ab54965bbf47843599a7f3adceb723de38db"
+  integrity sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw==
   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.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.6.0.tgz#4329f4634718197c678d18491724d50d8b7ee76c"
+  integrity sha512-qu9iWyuiOxAuBM8cAwLuqPclYdarIpayrkfQB7aTGTiyYPbvx+qVF33sIznfq4bxZCiytQux/FvZieUBAXivCw==
   dependencies:
-    rollup "^0.49.2"
-
-rollup@^0.49.2:
-  version "0.49.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.49.3.tgz#4cce32643dd8cf2154c69ff0e43470067db0adbf"
+    "@types/estree" "0.0.39"
+    "@types/node" "^11.9.5"
+    acorn "^6.1.1"
 
 rsvp@^3.3.3:
   version "3.6.2"
@@ -8062,23 +8149,14 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.1.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.2.tgz#6a688b16c4e6e980e62ea805ec30648e1c60907f"
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+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:
     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.1.2:
+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"
 
@@ -8088,25 +8166,24 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", 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@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-3.1.0.tgz#995193b7dc1445ef1fe41ddfca2faf9f111854c6"
+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:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
     capture-exit "^1.2.0"
-    exec-sh "^0.2.0"
+    exec-sh "^0.3.2"
     execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.2.3"
 
 sax@^1.2.4:
   version "1.2.4"
@@ -8122,18 +8199,10 @@ semver-greatest-satisfied-range@^1.1.0:
   dependencies:
     sver-compat "^1.5.0"
 
-"semver@2 || 3 || 4 || 5", 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.x || 3.x || 4 || 5", semver@^5.6.0:
+"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@^5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -8237,10 +8306,13 @@ 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:
@@ -8312,14 +8384,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-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:
@@ -8334,16 +8399,16 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, sourc
   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"
-
 sparkles@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@@ -8513,6 +8578,15 @@ 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-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:
+    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"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -8521,13 +8595,7 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0:
-  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:
@@ -8574,16 +8642,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"
@@ -8653,20 +8721,26 @@ 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.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.6.tgz#de76e0ea2b3558c1e673942e47e714a930fa64aa"
+  integrity sha512-TyOuWLwkmtPL49LHCX1caIwHjRzcVd62+GF6h8W/jHOeZUFHpnd2XJDVuUlaTaLPH1nuu2M69mfHr5XbQJnf/g==
+
 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@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"
+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.5.3"
-    lodash "^4.17.10"
-    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"
@@ -8680,19 +8754,7 @@ tar@^2.0.0:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.2.4"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.1"
-    yallist "^3.0.2"
-
-tar@^4.4.6:
+tar@^4, tar@^4.4.6:
   version "4.4.8"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   dependencies:
@@ -8848,13 +8910,12 @@ to-through@^2.0.0:
   dependencies:
     through2 "^2.0.3"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
+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.4.3:
+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:
@@ -8915,14 +8976,14 @@ 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:
   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.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:
@@ -8931,7 +8992,7 @@ uglify-js@^2.6, uglify-js@^2.8.29:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.1.4:
+uglify-js@^3.0.5, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
   dependencies:
@@ -8995,9 +9056,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.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-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"
@@ -9092,13 +9154,10 @@ util@0.10.3, util@^0.10.3, util@~0.10.1:
   dependencies:
     inherits "2.0.1"
 
-uuid@^3.0.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-
-uuid@^3.3.2:
+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"
@@ -9106,16 +9165,10 @@ 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"
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-validate-npm-package-license@^3.0.3:
+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"
@@ -9138,13 +9191,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"
@@ -9178,13 +9224,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"
@@ -9244,12 +9283,10 @@ walker@~1.0.5:
   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"
@@ -9371,15 +9408,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, which@^1.3.1:
+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"
-  dependencies:
-    isexe "^2.0.0"
-
-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"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
@@ -9423,17 +9455,19 @@ 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.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:
+  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-file-atomic@^2.4.2:
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9457,9 +9491,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"
 
@@ -9625,3 +9660,15 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
+yup@^0.26.10:
+  version "0.26.10"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.26.10.tgz#3545839663289038faf25facfc07e11fd67c0cb1"
+  integrity sha512-keuNEbNSnsOTOuGCt3UJW69jDE3O4P+UHAakO7vSeFMnjaitcmlbij/a3oNb9g1Y1KvSKH/7O1R2PQ4m4TRylw==
+  dependencies:
+    "@babel/runtime" "7.0.0"
+    fn-name "~2.0.1"
+    lodash "^4.17.10"
+    property-expr "^1.5.0"
+    synchronous-promise "^2.0.5"
+    toposort "^2.0.2"