7427 changed files with 32349 additions and 324871 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -30,20 +30,11 @@ aliases:
  - &artifact_env_min
    path: ~/babel/packages/babel-preset-env-standalone/babel-preset-env.min.js

-  - &test262_workdir
-    working_directory: ~/babel/babel-test262-runner
-
-  - &artifact_test262_tap
-    path: ~/test262.tap
-
-  - &artifact_test262_xunit
-    path: ~/test-results
-
 jobs:
-  test:
+  build:
    working_directory: ~/babel
    docker:
-      - image: circleci/node:13
+      - image: circleci/node:10
    steps:
      - checkout
      - restore-cache: *restore-yarn-cache
@ -51,7 +42,7 @@ jobs:
      - run: yarn --version
      - run: make test-ci-coverage
      # Builds babel-standalone with the regular Babel config
-      - run: IS_PUBLISH=true make build
+      - run: 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.
@ -63,59 +54,3 @@ jobs:
      - store_artifacts: *artifact_env_min
      - save_cache: *save-node-modules-cache
      - save_cache: *save-yarn-cache
-  test262:
-    working_directory: ~/babel
-    docker:
-      - image: circleci/node:12
-    steps:
-      - checkout
-      - restore-cache: *restore-yarn-cache
-      - restore-cache: *restore-node-modules-cache
-      - run:
-          name: Build Babel
-          command: BABEL_ENV=test make bootstrap
-      - run:
-          name: Link Babel
-          command: |
-            cd packages
-            for package in */; do
-              cd $package
-              yarn link
-              cd ..
-            done
-      - run:
-          name: Setup Test Runner
-          command: |
-            git clone --recurse-submodules https://github.com/babel/babel-test262-runner
-            cd babel-test262-runner
-            yarn
-            yarn add tap-mocha-reporter --dev
-            curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > jq
-            chmod +x ./jq
-            for package in ../packages/*/package.json; do
-              yarn link $(./jq -j ".name" $package)
-            done
-            node lib/download-node
-      - run:
-          name: Run Test262
-          command: node lib/run-tests I_AM_SURE | tee ~/test262.tap
-          <<: *test262_workdir
-      - store_artifacts: *artifact_test262_tap
-      - run:
-          name: Output test262 results
-          command: |
-            cat ~/test262.tap | $(npm bin)/tap-mocha-reporter spec || true
-          <<: *test262_workdir
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - test
-  master:
-    jobs:
-      - test262:
-          filters:
-            branches:
-              only:
-                - master
--- a/.editorconfig
+++ b/.editorconfig
@ -6,12 +6,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 end_of_line = lf

-[*.{js,json,ts,tsx}]
+[*.{js,json}]
 indent_style = space
 indent_size = 2

-[Makefile]
-indent_style = tab
-
 [*.{md,markdown}]
 trim_trailing_whitespace = false
--- a/.eslintignore
+++ b/.eslintignore
@ -5,8 +5,8 @@ package.json
 lerna.json
 packages/babel-runtime
 !packages/babel-plugin-transform-runtime/scripts
+!packages/babel-runtime-corejs2/core-js.js
 packages/babel-runtime-corejs2
-packages/babel-runtime-corejs3
 packages/*/node_modules
 packages/*/lib
 packages/*/dist
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,7 +1,7 @@
 {
  "root": true,
-  "plugins": ["prettier", "@babel/development", "import"],
  "extends": "babel",
+  "plugins": ["local-rules", "prettier"],
  "rules": {
    "prettier/prettier": "error"
  },
@ -12,10 +12,8 @@
    {
      "files": ["packages/*/src/**/*.js", "codemods/*/src/**/*.js"],
      "rules": {
-        "@babel/development/no-undefined-identifier": "error",
-        "@babel/development/no-deprecated-clone": "error",
-        "import/no-extraneous-dependencies": "error",
-        "guard-for-in": "error"
+        "local-rules/no-undefined-identifier": "error",
+        "local-rules/no-deprecated-clone": "error"
      }
    },
    {
@ -28,14 +26,6 @@
      "env": {
        "jest": true
      }
-    },
-    {
-      "files": ["packages/babel-plugin-*/src/index.js"],
-      "excludedFiles": ["packages/babel-plugin-transform-regenerator/**/*.js"],
-      "rules": {
-        "@babel/development/plugin-name": "error",
-        "eqeqeq": ["error", "always", { "null": "ignore" }]
-      }
    }
  ]
 }
--- a/.flowconfig
+++ b/.flowconfig
@ -1,10 +1,11 @@
 [ignore]
-<PROJECT_ROOT>/build/.*
-<PROJECT_ROOT>/packages/.*/lib
-<PROJECT_ROOT>/packages/.*/test
-<PROJECT_ROOT>/codemods/.*/lib
-<PROJECT_ROOT>/codemods/.*/test
-<PROJECT_ROOT>/node_modules/module-deps/
+.*/build/.*
+.*/packages/.*/lib
+.*/packages/.*/test
+.*/codemods/.*/lib
+.*/codemods/.*/test
+.*/node_modules/conventional-changelog-core/
+.*/node_modules/module-deps/

 [include]
 packages/*/src
@ -24,6 +25,4 @@ suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore
 suppress_type=$FlowFixMe
 suppress_type=$FlowSubtype
 esproposal.export_star_as=enable
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
 module.name_mapper='^@babel\/\([a-zA-Z0-9_\-]+\)$' -> '<PROJECT_ROOT>/packages/babel-\1/src/index'
--- a/.github/CHANGELOG-6to5.md
+++ b/.github/CHANGELOG-6to5.md
@ -84,7 +84,7 @@
  * More performance improvements.
  * Parsing is now ~30% faster thanks to [marijnh/acorn@7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f](https://github.com/marijnh/acorn/commit/7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f).
 * **New Feature**
-  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edge cases.
+  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edgecases.
  * `super` in object literals.
  * Tail call optimisation. Thanks [@RReverser](https://github.com/RReverser)!

@ -122,7 +122,7 @@
  * Restructure transformers so they're only ran if the AST contains nodes that they need to worry about. Improves transpilation speed significantly.
 * **Bug Fix**
  * Fix source maps not tracking end of node locations.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Use static super references as the home object is actually done at definition time.
 * **Polish**
  * Force the `es6.destructuring` transformer to be whitelisted when the `es7.objectSpread` transformer is.
@ -474,12 +474,12 @@
 * **Polish**
  * Rest parameters now allocate the array before populating.
 * **Internal**
-  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of prototype keys.
+  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of protoype keys.
  * Parts of the code generator have now been optimized thanks to [gaearon](https://github.com/gaearon).

 ## 2.12.3

- * **Spec Compliance**
+ * **Spec Compliancy**
  * Optional `typeof` transformer checks for `undefined` before passing it to the helper.
  * Class methods are now named.

@ -551,7 +551,7 @@
  * Add `classesFastSuper` optional transformer that doesn't support parent getters and prototype changing.
  * Add `forOfFast` transformer that speeds up `for...of` on arrays but produces more code.
  * Add `--react-compat` to `bin/6to5`.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Disallow setters without a single parameter.
  * Add `configurable` and `writable` to defined properties.
  * Use define instead of assignment for class methods.
@ -619,7 +619,7 @@

 ## 2.7.0

- * **Spec Compliance**
+ * **Spec Compliancy**
  * Disallow reassignments of imports.
 * **New Feature**
  * `reactCompat` option to enable pre-v0.12 react components.
@ -643,7 +643,7 @@

 * **Bug Fix**
  * Better handling of number literal property keys.
-  * Handle `NewExpression` paren insertion edge cases better.
+  * Handle `NewExpression` paren insertion edegcases better.
 * **Internal**
  * Fix incorrect AST node `identifier("this")`.
  * Better `toIdentifier` method that handles reserved words.
@ -662,7 +662,7 @@
 * **Polish**
  * Move `"use strict";` to inside module bodies instead of at the top of the file.
  * Better handling of dynamic imports.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Class inheritance now has a `function` or `null` type check.
  * Add `interopRequireWildcard` around wildcard imports and exports to handle non-object exports.

@ -850,7 +850,7 @@

 ## 1.14.10

- * Fix let scoping unnecessary override.
+ * Fix let scoping unneccesary override.

 ## 1.14.6

@ -973,7 +973,7 @@

 ## 1.12.21

- * Fix unnecessary let scoping replacement.
+ * Fix unneccesary let scoping replacement.
 * Add `commonInterop` module formatter. Thanks [@Naddiseo](https://github.com/Naddiseo).
 * Fix `return` outside of function body bug. Thanks [@brentburg](https://github.com/brentburg).
 * Add more flexible option types.
@ -1020,7 +1020,7 @@

 ## 1.12.12

- * Make scope tracker more reliable to handle all edge cases.
+ * Make scope tracker more reliable to handle all edgecases.

 ## 1.12.11

--- a/.github/CHANGELOG-v4.md
+++ b/.github/CHANGELOG-v4.md
@ -110,7 +110,7 @@
  * Throw an error on different `babel` and `babel-runtime` versions.
  * Replicate module environment for `babel-node` eval.
  * Clean up classes output.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Make it illegal to use a rest parameter on a setter.

 ## 4.6.6
@ -127,7 +127,7 @@
 ## 4.6.4

 * **Bug Fix**
-  * Fix `ForOfStatement` not properly inheriting labels.
+  * Fix `ForOfStatement` not proplery inheriting labels.
  * When in closure mode in block scoping transformer, properly check for variable shadowing.
 * **New Feature**
  * New `utility.inlineEnvironmentVariables` and `utility.inlineExpression` transformers.
@ -150,10 +150,10 @@

 * **New Feature**
  * Desugar sticky regexes to a new constructor expression so it can be handled by a polyfill.
- * **Spec Compliance**
-  * `for...of` now outputs in a lengthy `try...catch` this is to ensure spec compliance in regards to iterator returns and abrupt completions. See [google/traceur-compiler#1773](https://github.com/google/traceur-compiler/issues/1773) and [babel/babel/#838](https://github.com/babel/babel/issues/838) for more information.
+ * **Spec Compliancy**
+  * `for...of` now outputs in a lengthy `try...catch` this is to ensure spec compliancy in regards to iterator returns and abrupt completions. See [google/traceur-compiler#1773](https://github.com/google/traceur-compiler/issues/1773) and [babel/babel/#838](https://github.com/babel/babel/issues/838) for more information.
 * **Polish**
-  * Rest parameters that are only referred to via number properties on member expressions are desugared into a direct `arguments` reference. Thanks [@neVERberleRfellerER](https://github.com/neVERberleRfellerER)!
+  * Rest parameters that are only refered to via number properties on member expressions are desugared into a direct `arguments` reference. Thanks [@neVERberleRfellerER](https://github.com/neVERberleRfellerER)!
  * `$ babel` no longer exits on syntax errors.
 * **Internal**
  * Upgrade `browserify`.
--- a/.github/CHANGELOG-v5.md
+++ b/.github/CHANGELOG-v5.md
@ -12,7 +12,7 @@

 ## 5.8.24

- * **Spec Compliance**
+ * **Spec Compliancy**
  * Updated `optimisation.react.inlineElements` transformer to React 0.14 output. Thanks [@spicyj](https://github.com/spicyj)!
 * **Polish**
  * Add support for evaluating more static nodes. Thanks [@hzoo](https://github.com/hzoo)!
@ -262,8 +262,8 @@ Issues with publish process.
  * Register labels as bindings to fix undeclared variable checks.
 * **Polish**
  * Remove unnecessary string binary expressions when transforming template literals.
-  * Support module live bindings in arbitrary positions not in Program statement position.
-  * Throw error when attempting to replace a `Program` root node with another node not of type `Program`.
+  * Support module live bindings in arbitary positions not in Program statement position.
+  * Throw error when attemping to replace a `Program` root node with another node not of type `Program`.
  * Optimise rest parameters in spread element position and allocate rest array at the earliest common ancestor of all references.
  * Generate original number representation when value was not changed.
  * Check for invalid binding identifiers when generating inferred method names.
@ -451,7 +451,7 @@ Issues with publish process.

 ![gifs lol](https://31.media.tumblr.com/568205a0e37ae15eca510fa639589a59/tumblr_n8kw8kpcSb1sg6cg8o1_500.gif)

- * **Spec Compliance**
+ * **Spec Compliancy**
  * Allow trailing param commas for methods when using the `es7.trailingCommas` transformer.
 * **Bug Fix**
  * Fix `es6.blockScoping` transformer not properly ignoring `break` in `SwitchCase`.
@ -481,7 +481,7 @@ Issues with publish process.
  * Fix correct function scope being passed to `nameMethod.property` when inferring the function name for class methods.
  * Fix incorrect extensions reference causing weird issues when using the Babel CLI.
  * Fix destructuring param reference replacements not inheriting from their original param.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Fix order that method decorators are ran in.

 ## 5.2.15
@ -543,12 +543,12 @@ Issues with publish process.
 * **Internal**
  * Removed native inheritance support from classes.
  * Added `replaceWithSourceString` path API.
-  * Split up `es3.propertyLiterals` and `es3.memberExpressionLiterals` transformers to `minification.propertyLiterals` and `es3.memberExpressionLiterals`.
+  * Split up `es3.propertyLiterals` and `es3.memberExpressionLiterals` transformers to `minfication.propertyLiterals` and `es3.memberExpressionLiterals`.

 ## 5.2.6

 * **Internal**
-  * Fix transformer aliases being accidentally set as deprecated ones.
+  * Fix transformer aliases being accidently set as deprecated ones.
  * Expose `Pipeline` as `TransformerPipeline` instead.

 ## 5.2.5
@ -616,7 +616,7 @@ Issues with publish process.
  * Fix `externalHelpers` option being incorrectly listed as type `string`.
 * **Internal**
  * Upgrade `core-js` to `0.9.0`.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Fix object decorators not using the `initializer` pattern.
  * Remove property initializer descriptor reflection.

@ -824,10 +824,10 @@ Issues with publish process.
  * Save register cache on tick instead of `SIGINT`.
  * Enable strict mode on babel-node eval flag.
 * **Bug Fixes**
-  * Add support for live bindings. This change also increases the reliability of export specifier renaming.
+  * Add support for live bindings. This change also increases the reliablity of export specifier renaming.
  * Add support for super update and non equals assignment expressions.
  * Rename shadow constructor binding in classes.
-  * Seed next iteration bindings with previous fresh bindings when reassigning loop block scoped variables.
+  * Seed next iteration bindings with previous fresh bindings when reassinging loop block scoped variables.
  * Fix new expression spread referencing the wrong constructor.
  * Call `resolveModuleSource` on dynamic imports.
  * Added `param` to list of duplicate declaration kinds.
@ -836,3 +836,4 @@ Issues with publish process.
  * ES7 Abstract References have been removed.
  * Experimental option has been removed in favor of a stage option.
  * Rename `returnUsedHelpers` to `metadataUsedHelpers`.
+  
--- a/.github/CHANGELOG-v6.md
+++ b/.github/CHANGELOG-v6.md
@ -19,10 +19,10 @@

 ## 6.26.0 (2017-08-16)

-> Backports for some folks (also other's when we accidentally merged PRs from both 6.x/master)
+> Backports for some folks (also other's when we accidently merged PRs from both 6.x/master)
 > Lesson learned: just use `master` and backport on another branch.

-#### :eyeglasses: Spec Compliance
+#### :eyeglasses: Spec Compliancy
 * `babel-core`, `babel-generator`, `babel-plugin-transform-flow-comments`, `babel-plugin-transform-flow-strip-types`, `babel-traverse`, `babel-types`
  * [#6081](https://github.com/babel/babel/pull/6081) Flow opaque type 6.x backport. ([@jbrown215](https://github.com/jbrown215))

@ -1468,7 +1468,7 @@ It's a one-time use tool (helpful after the initial release when upgrading from

 ## v6.17.0 (2016-10-01)

-#### :eyeglasses: Spec Compliance
+#### :eyeglasses: Spec Compliancy
 * `babel-preset-stage-2`, `babel-preset-stage-3`
  * [#4617](https://github.com/babel/babel/pull/4617) Move async-generators to stage-3. ([@hzoo](https://github.com/hzoo))

@ -1476,7 +1476,7 @@ It's a one-time use tool (helpful after the initial release when upgrading from

 Specification repo: https://github.com/tc39/proposal-async-iteration

-Asynchronous Iteration was already added in [6.16.0](http://babeljs.io/blog/2016/09/28/6.16.0#spec-compliance) under stage-2 but it was moved to stage-3 at the [latest TC-39 meeting](https://github.com/tc39/agendas/blob/master/2016/09.md#agenda-for-the-54th-meeting-of-ecma-tc39).
+Asynchronous Iteration was already added in [6.16.0](http://babeljs.io/blog/2016/09/28/6.16.0#spec-compliancy) under stage-2 but it was moved to stage-3 at the [latest TC-39 meeting](https://github.com/tc39/agendas/blob/master/2016/09.md#agenda-for-the-54th-meeting-of-ecma-tc39).

 ```js
 // async generator syntax
@ -1569,7 +1569,7 @@ First PR!

 Babel 6.16: Happy 2nd Birthday 🎂!

-#### :eyeglasses: Spec Compliance
+#### :eyeglasses: Spec Compliancy

 * `babel-core`, `babel-generator`, `babel-helper-remap-async-to-generator`, `babel-helpers`, `babel-plugin-transform-async-generator-functions`, `babel-types`, `babel-preset-stage-2`, ...
  * [#3473](https://github.com/babel/babel/pull/3473) via [#4576](https://github.com/babel/babel/pull/4576) Implement support for async generator functions and for-await statements. ([@zenparsing](https://github.com/zenparsing))
@ -1767,7 +1767,7 @@ typeof Symbol.prototype === 'object'
  * [#3456](https://github.com/babel/babel/pull/3456) Use the real sourcemap API and handle input sourcemaps - Fixes [#7259](https://github.com/babel/babel/issues/7259). ([@loganfsmyth](https://github.com/loganfsmyth))
  * [#4507](https://github.com/babel/babel/pull/4507) Only set options in cli if different from default. ([@danez](https://github.com/danez))

-Fix an issue with defaults not being overridden. This was causing options like `comments: false` not to work correctly.
+Fix an issue with defaults not being overidden. This was causing options like `comments: false` not to work correctly.

  * [#4508](https://github.com/babel/babel/pull/4508) Support custom ports for V8 --inspect. ([@andykant](https://github.com/andykant))
  * [#4562](https://github.com/babel/babel/pull/4562) Fixes [#2299](https://github.com/babel/babel/issues/2299): Prevent REPL from printing implicit 'use strict'. ([@hzoo](https://github.com/hzoo))
@ -2036,7 +2036,7 @@ It's also a lot folk's first PR (or first code PR)!
 * `babel-generator`, `babel-types`
  * [#3570](https://github.com/babel/babel/pull/3570) Add support for the new declare module.exports of flow. ([@danez](https://github.com/danez))

-#### Spec Compliance
+#### Spec Compliancy
 * `babel-plugin-transform-es2015-modules-amd`, `babel-plugin-transform-es2015-modules-commonjs`, `babel-plugin-transform-es2015-modules-umd`
  * [#3518](https://github.com/babel/babel/pull/3518) Throw error for multiple exports default. ([@kaicataldo](https://github.com/kaicataldo))

@ -2084,7 +2084,7 @@ Also added more tests and will update Babel to use the new preset options after

 ## v6.13.1 (2016-08-04)

-We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpectedly backward-incompatible. This release introduces a new alternative plugin-options approach that is uglier but supports backward-compatibility. Ideally new plugins would use the new `module.exports = function(babel, options){ }` approach and simple skip supporting `babel-core@<6.13.x`.
+We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpectedly backward-incompatible. This release introduces a new alternative plugin-options approach that is uglier but supports backward-compatiblity. Ideally new plugins would use the new `module.exports = function(babel, options){ }` approach and simple skip supporting `babel-core@<6.13.x`.

 #### Bug Fix
 * `babel-core`, `babel-preset-es2015`
@ -2092,7 +2092,7 @@ We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpecte

 ## v6.13.0 (2016-08-04)

-> Since the last release we've created https://github.com/babel/notes to track discussions on our slack and high level features/changes that could be added - definitely check it out if you're interested in Babel's development!
+> Since the last release we've created https://github.com/babel/notes to track discussions on our slack and high level features/changes that could be added - definetely check it out if you're interested in Babel's development!

 Some small but very important additions in this release:

@ -2332,7 +2332,7 @@ Length: The number of characters in the output code
 * `babel-plugin-transform-react-jsx-self`, `babel-preset-react`
  * [#3540](https://github.com/babel/babel/pull/3540) Added jsx-self babel transform plugin. ([@jimfb](https://github.com/jimfb))

-#### Spec Compliance
+#### Spec Compliancy
 * `babel-plugin-transform-es2015-unicode-regex`
  * [#3338](https://github.com/babel/babel/pull/3338) Update to `regexpu-core@2.0.0` for ES2016 compliance. ([@mathiasbynens](https://github.com/mathiasbynens))

@ -3206,7 +3206,7 @@ Changes to note:
 - Reverting the class properties semicolon parser error.
 - Fix regression with plugin ordering with `babel-register`.

-#### Spec Compliance
+#### Spec Compliancy
 * `babel-plugin-transform-class-properties`, `babylon`
  * [#3332](https://github.com/babel/babel/pull/3332) Revert to standard ASI behavior for class properties. ([@loganfsmyth](https://github.com/loganfsmyth))

@ -3628,7 +3628,7 @@ Thanks to @samwgoldman for all the new flow support!
 * `babel-plugin-transform-es2015-parameters`: [#3191](https://github.com/babel/babel/pull/3191) Fix the order of arguments initialization (fixes [T6809](http://phabricator.babeljs.io/T6809))
 * `babel-traverse`: [#3198](https://github.com/babel/babel/pull/3198) In `evaluate()`, it should not mistake lack of confidence for falsy

-* **Spec Compliance**
+* **Spec Compliancy**
 * `babylon`, `babel-generator`, `babel-plugin-transform-regenerator`: [#3190](https://github.com/babel/babel/pull/3190): Remove `await *` from `babylon` and raise an error for that syntax since it was removed from the proposal and was causing an issue at runtime but not at compile time (fixes [T6688](http://phabricator.babeljs.io/T6688)).

 * **Internal**
@ -3817,7 +3817,7 @@ Thanks to @samwgoldman for all the new flow support!
 * **New Feature**
  * Add support for `function.sent`.
 * **Internal**
-  * Bump `invariant` dependency version.
+  * Bump `invariant` depenency version.
 * **Polish**
  * Infer filename from the base directory when resolving plugins and presets.
  * Allow JSX pragma to be specified in line comments.
@ -3863,7 +3863,7 @@ Thanks to @samwgoldman for all the new flow support!
  * Move `children` prop pushing to after props to ensure correct order in the react inline elements plugin.
  * Fix `buildExternalHelpers` script ignoring non-underscored helpers.
  * Fix exported classes with static class properties.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Add support for computed mutators in `babel-plugin-transform-es2015-computed-properties`.
 * **Polish**
  * Make interop for plugins with the `__esModule` work for all plugins no matter how they're imported/specified.
@ -3887,7 +3887,7 @@ Thanks to @samwgoldman for all the new flow support!
 ## 6.1.2

 * **Bug Fix**
-  * Fix bug where the parser wouldn't allow typed annotated default parameters in arrow functions.
+  * Fix bug where the parser wouldn't allow typed annotated default parametesr in arrow functions.
  * Add existence check to `NodePath#has` to ensure safeness when making comparisons.
  * Protect against replacing a class expression with a name inferred version that would
    result in it never being transformed.
@ -3904,7 +3904,7 @@ Thanks to @samwgoldman for all the new flow support!
 * **Polish**
  * Add npm 3 check to `babel-doctor`.
  * Autoclear the `babel/register` cache when it gets too big to be serialised.
- * **Spec Compliance**
+ * **Spec Compliancy**
  * Add support for flow existential type parameters.

 ## 6.1.1
@ -3969,14 +3969,14 @@ Thanks to @samwgoldman for all the new flow support!

 ## 6.0.14

- * **Spec Compliance**
+ * **Spec Compliancy**
  * Update exponentiation operator precedence.
  * Fix parser bug where arrow functions have a higher precedence than they should.
 * **Bug Fix**
  * Fix SystemJS module formatter exporting function parameters.
  * Ensure that invalid identifier JSX attribute keys are quoted when transforming to calls.
  * Fix ES3 property literal plugin.
-  * Fix parameters after defaults in arrow functions referring to the wrong `arguments`.
+  * Fix parameters after defaults in arrow functions refering to the wrong `arguments`.

 ## 6.0.13

--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@ -1,9 +1,6 @@
 ---
-name: "\U0001F41B Bug Report"
-about: "If something isn't working as expected \U0001F914."
-title: ''
-labels: 'i: bug, i: needs triage'
-assignees: ''
+name: 🐛 Bug Report
+about: If something isn't working as expected 🤔.

 ---

@ -34,7 +31,7 @@ A clear and concise description of what you expected to happen (or code).
 - Babel version(s): [e.g. v6.0.0, v7.0.0-beta.34]
 - Node/npm version: [e.g. Node 8/npm 5]
 - OS: [e.g. OSX 10.13.4, Windows 10]
- Monorepo: [e.g. yes/no/Lerna]
+- Monorepo [e.g. yes/no/Lerna]
 - How you are using Babel: [e.g. `cli`, `register`, `loader`]

 **Possible Solution**
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@ -1,9 +1,6 @@
 ---
-name: "\U0001F680 Feature Request"
-about: "I have a suggestion (and may want to implement it \U0001F642)!"
-title: ''
-labels: 'i: enhancement, i: needs triage'
-assignees: ''
+name: 🚀 Feature Request
+about: I have a suggestion (and may want to implement it 🙂)!

 ---

--- a/.github/ISSUE_TEMPLATE/Regression-v7.md
+++ b/.github/ISSUE_TEMPLATE/Regression-v7.md
@ -1,16 +1,12 @@
 ---
-name: "\U0001F4A5 v7 Regression"
-about: Report an unexpected behavior in v7 from v6 (Check the upgrade guide first
-  ✌️)
-title: ''
-labels: 'i: bug, 7.x: regression, i: needs triage'
-assignees: ''
+name: 💥 v7 Regression
+about: Report an unexpected behavior in v7 from v6 (Check the upgrade guide first ✌️)

 ---

 # v7 Regression

-> First check out: https://babeljs.io/docs/en/v7-migration
+> First check out: https://new.babeljs.io/docs/en/next/v7-migration.html
 > Also a partial upgrade tool: https://github.com/babel/babel-upgrade

 **Potential Commit/PR that introduced the regression**
--- a/.github/ISSUE_TEMPLATE/Support_question.md
+++ b/.github/ISSUE_TEMPLATE/Support_question.md
@ -1,9 +1,6 @@
 ---
-name: "\U0001F917 Support Question"
-about: "If you have a question \U0001F4AC, please check out our Slack or StackOverflow!"
-title: ''
-labels: 'i: question, i: needs triage'
-assignees: ''
+name: 🤗 Support Question
+about: If you have a question 💬, please check out our Slack or StackOverflow!

 ---

--- a/.github/ISSUE_TEMPLATE/Support_us.md
+++ b/.github/ISSUE_TEMPLATE/Support_us.md
@ -1,10 +1,6 @@
 ---
-name: "\U0001F91D Support us on Babel"
-about: "If you would like to support our efforts in maintaining this community-driven
-  project \U0001F64C!"
-title: ''
-labels: ''
-assignees: ''
+name: 🤝 Support us on Babel
+about: If you would like to support our efforts in maintaining this community-driven project 🙌!

 ---

--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -2,8 +2,6 @@
 Before making a PR, please read our contributing guidelines
 https://github.com/babel/babel/blob/master/CONTRIBUTING.md

-Please note that the Babel Team requires two approvals before merging most PRs.
-
 For issue references: Add a comma-separated list of a [closing word](https://help.github.com/articles/closing-issues-via-commit-messages/) followed by the ticket number fixed by the PR. (it should be underlined in the preview if done correctly)

 If you are making a change that should have a docs update: submit another PR to https://github.com/babel/website
@ -11,7 +9,7 @@ If you are making a change that should have a docs update: submit another PR to

 | Q                        | A <!--(Can use an emoji 👍) -->
 | ------------------------ | ---
-| Fixed Issues?            | `Fixes #1, Fixes #2` <!-- remove the (`) quotes and write "Fixes" before the number to link the issues -->
+| Fixed Issues?            | `Fixes #1, Fixes #2` <!-- remove the (`) quotes to link the issues -->
 | Patch: Bug Fix?          |
 | Major: Breaking Change?  |
 | Minor: New Feature?      |
--- a/.github/lock.yml
+++ b/.github/lock.yml
@ -4,7 +4,7 @@
 daysUntilLock: 91
 # Comment to post before locking. Set to `false` to disable
 lockComment: false
-# The label to be applied when an issue is locked
+only: issues
 lockLabel: 'outdated'

 # Issues or pull requests with these labels will not be locked
--- a/.github/workflows/issue-triage.yml
+++ b/.github/workflows/issue-triage.yml
@ -1,81 +0,0 @@
-name: Issue Triage
-
-on:
-  issues:
-    types: [opened, labeled]
-
-jobs:
-  welcome:
-    name: Welcome comment
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if Babel member
-        id: is_babel_member
-        if: github.event.action == 'opened'
-        uses: babel/actions/is-org-member@v2
-        with:
-          org: babel
-          username: ${{ github.event.issue.user.login }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Welcome Comment
-        uses: babel/actions/create-comment@v2
-        if: |
-          github.event.action == 'opened' &&
-          steps.is_babel_member.outputs.result == 0
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          issue: ${{ github.event.issue.number }}
-          comment: >
-            Hey @${{ github.event.issue.user.login }}!
-            We really appreciate you taking the time to report an issue. The 
-            collaborators on this project attempt to help as many people as 
-            possible, but we're a limited number of volunteers, so it's 
-            possible this won't be addressed swiftly.
-
-
-            If you need any help, or just have general Babel or JavaScript questions, we have a 
-            vibrant [Slack community](https://babeljs.slack.com) that typically always has someone 
-            willing to help. You can sign-up [here](https://slack.babeljs.io/) for an invite."
-
-  needs_info:
-    name: Needs Info
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create Needs Info Comment
-        uses: babel/actions/create-comment@v2
-        if: |
-          github.event.action == 'labeled' &&
-          github.event.label.name == 'Needs Info'
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          issue: ${{ github.event.issue.number }}
-          comment: >
-            Hi @${{ github.event.issue.user.login }}!
-            This issue is missing some important information we'll need
-            to be able to reproduce this issue.
-
-
-            Please understand that we receive a high volume of issues,
-            and there are only a limited number of volunteers that help
-            maintain this project. The easier it is for us to decipher an
-            issue with the info provided, the more likely it is that we'll
-            be able to help.
-
-
-            Please make sure you have the following information documented in
-            this ticket:
-            
-            1. Your Babel configuration (typically from `.babelrc` or `babel.config.js`)
-
-            2. The current (incorrect) behavior you're seeing
-
-            3. The behavior you expect
-
-            4. A [short, self-contained example](http://sscce.org/)
-
-
-            Please provide either a link to the problem via the
-            [`repl`](https://babeljs.io/repl/), or if the `repl` is
-            insufficient, a new and minimal repository with instructions on
-            how to build/replicate the issue.
-        
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,53 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags: ["v*"]
-
-jobs:
-  github_release:
-    name: Trigger GitHub release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the new tag
-        uses: actions/checkout@v1.0.0
-
-      - name: Get tag info
-        id: tags
-        uses: babel/actions/get-release-tags@v2
-
-      - name: Generate the changelog
-        id: changelog
-        uses: babel/actions/generate-lerna-changelog@v2
-        with:
-          from: ${{ steps.tags.outputs.old }}
-          to: ${{ steps.tags.outputs.new }}
-        env:
-          GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create a draft GitHub release
-        uses: babel/actions/publish-github-release@v2
-        with:
-          tag: ${{ steps.tags.outputs.new }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Check if releasing from master
-        id: is_master
-        uses: babel/actions/ref-matches-branch@v2
-        with:
-          name: master
-
-      - name: Update CHANGELOG.md
-        if: steps.is_master.outputs.result == 1
-        uses: babel/actions/update-changelog@v2
-        with:
-          changelog: ${{ steps.changelog.outputs.changelog }}
-
-      - name: Commit CHANGELOG.md
-        if: steps.is_master.outputs.result == 1
-        run: |
-          git add CHANGELOG.md
-          git -c user.name="Babel Bot" -c user.email="babel-bot@users.noreply.github.com" \
-            commit -m "Add ${{ steps.tags.outputs.new }} to CHANGELOG.md [skip ci]" --no-verify --quiet
-          git push "https://babel-bot:${{ secrets.BOT_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" master
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,5 @@
-.npmrc
-
 .DS_Store
 /node_modules
-/.github/actions/*/node_modules
 /packages/*/node_modules
 /packages/*/LICENSE
 !/packages/babel-parser/LICENSE
@ -18,7 +15,6 @@ coverage
 dist
 /.package.json
 package-lock.json
-!/.github/actions/*/package-lock.json

 /packages/babel-runtime/helpers/*.js
 !/packages/babel-runtime/helpers/toArray.js
@ -35,16 +31,11 @@ package-lock.json
 !/packages/babel-runtime-corejs2/helpers/temporalRef.js
 /packages/babel-runtime-corejs2/helpers/esm/*.js
 !/packages/babel-runtime-corejs2/helpers/esm/toArray.js
-/packages/babel-runtime-corejs2/helpers/esm/iterableToArray.js
+!/packages/babel-runtime-corejs2/helpers/esm/iterableToArray.js
 !/packages/babel-runtime-corejs2/helpers/esm/temporalRef.js
 /packages/babel-runtime-corejs2/core-js/**/*.js
 !/packages/babel-runtime-corejs2/core-js/map.js

-/packages/babel-runtime-corejs3/helpers/*.js
-/packages/babel-runtime-corejs3/helpers/esm/*.js
-/packages/babel-runtime-corejs3/core-js/**/*.js
-/packages/babel-runtime-corejs3/core-js-stable/**/*.js
-
 /packages/babel-register/test/.babel
 /packages/babel-cli/test/tmp
 /packages/babel-node/test/tmp
--- a/.prettierignore
+++ b/.prettierignore
@ -1,5 +1,2 @@
 package.json
 packages/babel-preset-env/data
-packages/*/test/fixtures/**/input.*
-packages/*/test/fixtures/**/exec.*
-packages/*/test/fixtures/**/output.*
--- a/.travis.yml
+++ b/.travis.yml
@ -1,45 +1,42 @@
 git:
-  depth: 5
+  depth: 10
+sudo: false
 language: node_js
 cache:
  yarn: true
-
-os: linux
+  directories:
+    - node_modules
+node_js:
+  # We test the latest version on circleci
+  - '9'
+  - '8'
+  - '6'

 env:
  global:
    - PATH=$HOME/.yarn/bin:$PATH
    - JOB=test

-install: skip
-before_script:
+before_install:
  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
+
+install: yarn --ignore-engines
+
+before_script:
+  - 'if [ "$JOB" = "babel-parser-flow-tests" ]; then make bootstrap-flow; fi'
+  - 'if [ "$JOB" = "babel-parser-test262-tests" ]; then make bootstrap-test262; fi'

 script:
-  - if [ "$JOB" = "test" ]; then make -j test-ci; fi
-  - if [ "$JOB" = "lint" ]; then make -j code-quality-ci; fi
-  - if [ "$JOB" = "babel-parser-flow-tests" ]; then make -j test-flow-ci; fi
-  - if [ "$JOB" = "babel-parser-test262-tests" ]; then make -j test-test262-ci; fi
+  - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
+  - 'if [ "$JOB" = "lint" ]; then make lint && make flow; fi'
+  - 'if [ "$JOB" = "babel-parser-flow-tests" ]; then make test-flow-ci; fi'
+  - 'if [ "$JOB" = "babel-parser-test262-tests" ]; then make test-test262-ci; fi'

 matrix:
  fast_finish: true
  include:
    - node_js: "node"
      env: JOB=lint
-    # We test the latest version on circleci
-    - node_js: "12"
-    # Move `windows` build to be the third since it is slow
-    - os: windows
-      node_js: "node"
-      env:
-        - JOB=test
-        # https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288/9
-        - YARN_GPG=no
-    # Continue node_js matrix
-    - node_js: "6"
-    - node_js: "10"
-    - node_js: "8"
    - node_js: "node"
      env: JOB=babel-parser-flow-tests
    - node_js: "node"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -32,7 +32,6 @@ contributing, please read the
 - Follow along with what we are working on by joining our [Slack](https://babeljs.slack.com) (you can sign-up [here](https://slack.babeljs.io/)
    for an invite), following our announcements on [Twitter](https://twitter.com/babeljs), and reading (or participating!) in our [meeting notes](https://github.com/babel/notes).
 - Check out our [website](http://babeljs.io/) and the [repo](https://github.com/babel/website)
- You can contribute by triaging issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to babel on CodeTriage](https://www.codetriage.com/babel/babel). [![Open Source Helpers](https://www.codetriage.com/babel/babel/badges/users.svg)](https://www.codetriage.com/babel/babel)

 ## Chat

@ -311,7 +310,7 @@ Note that the code shown in Chrome DevTools is compiled code and therefore diffe
 - Create a new issue that describes the proposal (ex: [#538](https://github.com/babel/babylon/issues/538)). Include any relevant information like proposal repo/author, examples, parsing approaches, meeting notes, presentation slides, and more.
 - The pull request should include:
  - [ ] An update to the [plugins](https://github.com/babel/babel/tree/master/packages/babel-parser#plugins) part of the readme. Add a new entry to that list for the new plugin flag (and link to the proposal)
-  - [ ] If any new nodes or modifications need to be added to the AST, update [ast/spec.md](https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md)
+  - [ ] If any new nodes or modifications need to be added to the AST, update [ast/spec.md](https://github.com/babel/babel/bloc/master/packages/babel-parser/ast/spec.md)
  - [ ] Make sure you use the `this.hasPlugin("plugin-name-here")` check in the babel parser so that your new plugin code only runs when that flag is turned on (not default behavior)
  - [ ] Add failing/passing tests according to spec behavior
 - Start working about the Babel transform itself!
--- a/Gulpfile.js
+++ b/Gulpfile.js
@ -6,32 +6,43 @@ const chalk = require("chalk");
 const newer = require("gulp-newer");
 const babel = require("gulp-babel");
 const gulpWatch = require("gulp-watch");
-const fancyLog = require("fancy-log");
+const gutil = require("gulp-util");
 const filter = require("gulp-filter");
 const gulp = require("gulp");
 const path = require("path");
 const webpack = require("webpack");
-const rollup = require("rollup");
+const merge = require("merge-stream");
+const rollup = require("rollup-stream");
+const source = require("vinyl-source-stream");
+const buffer = require("vinyl-buffer");
 const rollupBabel = require("rollup-plugin-babel");
 const rollupNodeResolve = require("rollup-plugin-node-resolve");
-const rollupReplace = require("rollup-plugin-replace");
-const { registerStandalonePackageTask } = require("./scripts/gulp-tasks");
+const registerStandalonePackageTask = require("./scripts/gulp-tasks")
+  .registerStandalonePackageTask;

-const defaultSourcesGlob = "./@(codemods|packages)/*/src/**/*.js";
+const sources = ["codemods", "packages"];

 function swapSrcWithLib(srcPath) {
  const parts = srcPath.split(path.sep);
-  parts[2] = "lib";
+  parts[1] = "lib";
  return parts.join(path.sep);
 }

+function getGlobFromSource(source) {
+  return `./${source}/*/src/**/*.js`;
+}
+
 function getIndexFromPackage(name) {
  return `${name}/src/index.js`;
 }

-function compilationLogger() {
+function compilationLogger(rollup) {
  return through.obj(function(file, enc, callback) {
-    fancyLog(`Compiling '${chalk.cyan(file.relative)}'...`);
+    gutil.log(
+      `Compiling '${chalk.cyan(file.relative)}'${
+        rollup ? " with rollup " : ""
+      }...`
+    );
    callback(null, file);
  });
 }
@ -39,7 +50,7 @@ function compilationLogger() {
 function errorsLogger() {
  return plumber({
    errorHandler(err) {
-      fancyLog(err.stack);
+      gutil.log(err.stack);
    },
  });
 }
@ -51,68 +62,61 @@ function rename(fn) {
  });
 }

-function buildBabel(exclude, sourcesGlob = defaultSourcesGlob) {
-  const base = __dirname;
+function buildBabel(exclude) {
+  return merge(
+    sources.map(source => {
+      const base = path.join(__dirname, source);

-  let stream = gulp.src(sourcesGlob, { base: __dirname });
+      let stream = gulp.src(getGlobFromSource(source), { base: base });

-  if (exclude) {
-    const filters = exclude.map(p => `!**/${p}/**`);
-    filters.unshift("**");
-    stream = stream.pipe(filter(filters));
-  }
+      if (exclude) {
+        const filters = exclude.map(p => `!**/${p}/**`);
+        filters.unshift("**");
+        stream = stream.pipe(filter(filters));
+      }

-  return stream
-    .pipe(errorsLogger())
-    .pipe(newer({ dest: base, map: swapSrcWithLib }))
-    .pipe(compilationLogger())
-    .pipe(babel())
-    .pipe(
-      // Passing 'file.relative' because newer() above uses a relative
-      // path and this keeps it consistent.
-      rename(file => path.resolve(file.base, swapSrcWithLib(file.relative)))
-    )
-    .pipe(gulp.dest(base));
-}
-
-function buildRollup(packages) {
-  return Promise.all(
-    packages.map(pkg => {
-      const input = getIndexFromPackage(pkg);
-      fancyLog(`Compiling '${chalk.cyan(input)}' with rollup ...`);
-      return rollup
-        .rollup({
-          input,
-          plugins: [
-            rollupReplace({
-              "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV),
-            }),
-            rollupBabel({
-              envName: "babel-parser",
-            }),
-            rollupNodeResolve(),
-          ],
-        })
-        .then(bundle => {
-          return bundle.write({
-            file: path.join(pkg, "lib/index.js"),
-            format: "cjs",
-            name: "babel-parser",
-            sourcemap: process.env.NODE_ENV !== "production",
-          });
-        });
+      return stream
+        .pipe(errorsLogger())
+        .pipe(newer({ dest: base, map: swapSrcWithLib }))
+        .pipe(compilationLogger())
+        .pipe(babel())
+        .pipe(
+          // Passing 'file.relative' because newer() above uses a relative
+          // path and this keeps it consistent.
+          rename(file => path.resolve(file.base, swapSrcWithLib(file.relative)))
+        )
+        .pipe(gulp.dest(base));
    })
  );
 }

-const bundles = ["packages/babel-parser"];
+function buildRollup(packages) {
+  return merge(
+    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")));
+    })
+  );
+}

-gulp.task("build-rollup", () => buildRollup(bundles));
-gulp.task("build-babel", () => buildBabel(/* exclude */ bundles));
-gulp.task("build-babel-types", () =>
-  buildBabel(/* exclude */ bundles, "packages/babel-types/src/**/*.js")
-);
-gulp.task("build", gulp.parallel("build-rollup", "build-babel"));
+gulp.task("build", function() {
+  const bundles = ["packages/babel-parser"];
+
+  return merge([buildBabel(/* exclude */ bundles), buildRollup(bundles)]);
+});

 gulp.task("default", gulp.series("build"));

@ -122,7 +126,7 @@ gulp.task(
  "watch",
  gulp.series("build-no-bundle", function watch() {
    gulpWatch(
-      defaultSourcesGlob,
+      sources.map(getGlobFromSource),
      { debounceDelay: 200 },
      gulp.task("build-no-bundle")
    );
@ -134,7 +138,7 @@ registerStandalonePackageTask(
  "babel",
  "Babel",
  path.join(__dirname, "packages"),
-  require("./packages/babel-standalone/package.json").version
+  require("./packages/babel-core/package.json").version
 );

 const presetEnvWebpackPlugins = [
@ -163,6 +167,6 @@ registerStandalonePackageTask(
  "babel-preset-env",
  "babelPresetEnv",
  path.join(__dirname, "packages"),
-  require("./packages/babel-preset-env-standalone/package.json").version,
+  require("./packages/babel-preset-env/package.json").version,
  presetEnvWebpackPlugins
 );
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) 2014-2018 Sebastian McKenzie and other contributors

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/207
+++ b/207
@ -1,5 +1,6 @@
-FLOW_COMMIT = 09669846b7a7ca5a6c23c12d56bb3bebdafd67e9
-TEST262_COMMIT = 8688c4ab79059c3097098605e69f1ee5eda6c409
+MAKEFLAGS = -j1
+FLOW_COMMIT = bea8b83f50f597454941d2a7ecef6e93a881e576
+TEST262_COMMIT = f90a52b39609a620c0854e0bd0b3a906c930fd17

 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
 export FORCE_COLOR = true
@ -8,113 +9,53 @@ SOURCES = packages codemods

 .PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap

-build: build-bundle
+build: clean clean-lib
+	./node_modules/.bin/gulp build
+	node ./packages/babel-types/scripts/generateTypeHelpers.js
+	# call build again as the generated files might need to be compiled again.
+	./node_modules/.bin/gulp build
+	# generate flow and typescript typings
+	node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	node scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
 ifneq ("$(BABEL_COVERAGE)", "true")
-	$(MAKE) build-standalone
+	make build-standalone
+	make build-preset-env-standalone
 endif

-build-bundle: clean clean-lib
-	yarn gulp build
-	$(MAKE) generate-standalone generate-type-helpers
-	# call build again as the generated files might need to be compiled again.
-	yarn gulp build
-	$(MAKE) build-typings
-	$(MAKE) build-dist
-
-build-bundle-ci: bootstrap-only
-	$(MAKE) build-bundle
-
-generate-standalone:
-	node packages/babel-standalone/scripts/generate.js
-
-generate-type-helpers:
-	node packages/babel-types/scripts/generateTypeHelpers.js
-
-build-typings: build-flow-typings build-typescript-typings
-
-build-flow-typings:
-	node packages/babel-types/scripts/generators/flow.js > packages/babel-types/lib/index.js.flow
-
-build-typescript-typings:
-	node packages/babel-types/scripts/generators/typescript.js > packages/babel-types/lib/index.d.ts
-
-build-standalone: build-babel-standalone build-preset-env-standalone
-
-build-standalone-ci: build-bundle-ci
-	$(MAKE) build-standalone
-
-build-babel-standalone:
-	yarn gulp build-babel-standalone
+build-standalone:
+	./node_modules/.bin/gulp build-babel-standalone

 build-preset-env-standalone:
-	yarn gulp build-babel-preset-env-standalone
+	./node_modules/.bin/gulp build-babel-preset-env-standalone

-prepublish-build-standalone:
-	BABEL_ENV=production IS_PUBLISH=true yarn gulp build-babel-standalone
-
-prepublish-build-preset-env-standalone:
-	BABEL_ENV=production IS_PUBLISH=true yarn gulp build-babel-preset-env-standalone
-
-build-dist: build-polyfill-dist build-plugin-transform-runtime-dist
-
-build-polyfill-dist:
+build-dist: build
 	cd packages/babel-polyfill; \
 	scripts/build-dist.sh
-
-build-plugin-transform-runtime-dist:
 	cd packages/babel-plugin-transform-runtime; \
 	node scripts/build-dist.js

-build-no-bundle: clean clean-lib
-	BABEL_ENV=development yarn gulp build-no-bundle
+watch: clean clean-lib
+
 	# Ensure that build artifacts for types are created during local
 	# development too.
-	$(MAKE) generate-type-helpers
-	$(MAKE) build-typings
-
-watch: build-no-bundle
-	BABEL_ENV=development yarn gulp watch
-
-code-quality-ci: flowcheck-ci lint-ci
-
-flowcheck-ci: bootstrap-flowcheck
-	$(MAKE) flow
-
-code-quality: flow lint
+	BABEL_ENV=development ./node_modules/.bin/gulp build-no-bundle
+	node ./packages/babel-types/scripts/generateTypeHelpers.js
+	node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	BABEL_ENV=development ./node_modules/.bin/gulp watch

 flow:
-	yarn flow check --strip-root
+	./node_modules/.bin/flow check --strip-root

-bootstrap-flowcheck: bootstrap-only
-	yarn gulp build-babel-types
-	$(MAKE) build-typings
+lint:
+	./node_modules/.bin/eslint scripts $(SOURCES) '*.js' --format=codeframe

-lint-ci: lint-js-ci lint-ts-ci
-
-lint-js-ci: bootstrap-only
-	$(MAKE) lint-js
-
-lint-ts-ci: bootstrap-flowcheck
-	$(MAKE) lint-ts
-
-lint: lint-js lint-ts
-
-lint-js:
-	yarn eslint scripts $(SOURCES) '*.js' --format=codeframe
-
-lint-ts:
-	scripts/tests/typescript/lint.sh
-
-fix: fix-json fix-js
-
-fix-js:
-	yarn eslint scripts $(SOURCES) '*.js' --format=codeframe --fix
+fix: fix-json
+	./node_modules/.bin/eslint scripts $(SOURCES) '*.js' --format=codeframe --fix

 fix-json:
-	yarn prettier "{packages,codemod}/*/test/fixtures/**/options.json" --write --loglevel warn
+	./node_modules/.bin/prettier "{packages,codemod}/*/test/fixtures/**/options.json" --write --loglevel warn

 clean: test-clean
-	rm -f .npmrc
 	rm -rf packages/babel-polyfill/browser*
 	rm -rf packages/babel-polyfill/dist
 	rm -rf coverage
@ -124,112 +65,80 @@ test-clean:
 	$(foreach source, $(SOURCES), \
 		$(call clean-source-test, $(source)))

-# Does not work on Windows; use "yarn jest" instead
 test-only:
 	BABEL_ENV=test ./scripts/test.sh
-	$(MAKE) test-clean
+	make test-clean

 test: lint test-only

-test-ci: jest-ci
+test-ci: bootstrap test-only

-jest-ci: build-standalone-ci
-	BABEL_ENV=test yarn jest --maxWorkers=4 --ci
-	$(MAKE) test-clean
-
-# Does not work on Windows
 test-ci-coverage: SHELL:=/bin/bash
 test-ci-coverage:
-	BABEL_COVERAGE=true BABEL_ENV=test $(MAKE) bootstrap
+	BABEL_COVERAGE=true BABEL_ENV=test make bootstrap
 	BABEL_ENV=test TEST_TYPE=cov ./scripts/test-cov.sh
 	bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json

 bootstrap-flow:
-	rm -rf build/flow
-	mkdir -p build
-	git clone --branch=master --single-branch --shallow-since=2018-11-01 https://github.com/facebook/flow.git build/flow
+	rm -rf ./build/flow
+	mkdir -p ./build
+	git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/facebook/flow.git ./build/flow
 	cd build/flow && git checkout $(FLOW_COMMIT)

 test-flow:
 	node scripts/tests/flow/run_babel_parser_flow_tests.js

-test-flow-ci: build-bundle-ci bootstrap-flow
-	$(MAKE) test-flow
+test-flow-ci: bootstrap test-flow

 test-flow-update-whitelist:
 	node scripts/tests/flow/run_babel_parser_flow_tests.js --update-whitelist

 bootstrap-test262:
-	rm -rf build/test262
-	mkdir -p build
-	git clone --branch=master --single-branch --shallow-since=2019-09-01 https://github.com/tc39/test262.git build/test262
+	rm -rf ./build/test262
+	mkdir -p ./build
+	git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/tc39/test262.git ./build/test262
 	cd build/test262 && git checkout $(TEST262_COMMIT)

 test-test262:
 	node scripts/tests/test262/run_babel_parser_test262.js

-test-test262-ci: build-bundle-ci bootstrap-test262
-	$(MAKE) test-test262
+test-test262-ci: bootstrap test-test262

 test-test262-update-whitelist:
 	node scripts/tests/test262/run_babel_parser_test262.js --update-whitelist

-# Does not work on Windows
 clone-license:
 	./scripts/clone-license.sh

-prepublish-build: clean-lib clean-runtime-helpers
-	NODE_ENV=production BABEL_ENV=production $(MAKE) build
-	$(MAKE) clone-license
+prepublish-build:
+	make clean-lib
+	rm -rf packages/babel-runtime/helpers
+	rm -rf packages/babel-runtime-corejs2/helpers
+	rm -rf packages/babel-runtime-corejs2/core-js
+	BABEL_ENV=production make build-dist
+	make clone-license

 prepublish:
-	$(MAKE) bootstrap-only
-	$(MAKE) prepublish-build
-	$(MAKE) test
-
-new-version:
 	git pull --rebase
-	yarn lerna version --force-publish="@babel/runtime,@babel/runtime-corejs2,@babel/runtime-corejs3,@babel/standalone,@babel/preset-env-standalone"
+	make prepublish-build
+	make test

-publish-cerxes: prepublish
-	yarn lerna publish --registry="https://npm.cerxes.net" --force-publish --allow-branch initializers-fix --canary --preid csx --dist-tag csx
-
-# NOTE: Run make new-version first
 publish: prepublish
-	yarn lerna publish from-git
-	$(MAKE) clean
+	# --only-explicit-updates
+	./node_modules/.bin/lerna publish
+	make clean

-publish-ci: prepublish
-ifneq ("$(NPM_TOKEN)", "")
-	echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-else
-	echo "Missing NPM_TOKEN env var"
-	exit 1
-endif
-	yarn lerna publish from-git --yes
-	rm -f .npmrc
-	$(MAKE) clean
-
-bootstrap-only: lerna-bootstrap
-
-yarn-install: clean-all
+bootstrap: clean-all
 	yarn --ignore-engines
-
-lerna-bootstrap: yarn-install
-	yarn lerna bootstrap
-
-bootstrap: bootstrap-only
-	$(MAKE) build
+	./node_modules/.bin/lerna bootstrap -- --ignore-engines
+	make build
+	cd packages/babel-plugin-transform-runtime; \
+	node scripts/build-dist.js

 clean-lib:
 	$(foreach source, $(SOURCES), \
 		$(call clean-source-lib, $(source)))

-clean-runtime-helpers:
-	rm -rf packages/babel-runtime/helpers
-	rm -rf packages/babel-runtime-corejs2/helpers
-	rm -rf packages/babel-runtime-corejs2/core-js
-
 clean-all:
 	rm -rf node_modules
 	rm -rf package-lock.json
@ -238,7 +147,7 @@ clean-all:
 	$(foreach source, $(SOURCES), \
 		$(call clean-source-all, $(source)))

-	$(MAKE) clean
+	make clean

 define clean-source-lib
 	rm -rf $(1)/*/lib
--- a/README.md
+++ b/README.md
@ -4,27 +4,16 @@
  </a>
 </p>

-<p align="center">
-  <span style="color:darkred">
-    <b><i>WARNING</i> This is a fork of babel to test a fix for initializer-variables with class-properties (proposals-stuff)</b>
-  </span>
-</p>
-
 <p align="center">
  The compiler for writing next generation JavaScript.
 </p>

-
 <p align="center">
-    <a href="https://www.npmjs.com/package/@babel/core"><img alt="v7 npm Downloads" src="https://img.shields.io/npm/dm/@babel/core.svg?maxAge=43200&label=v7%20downloads"></a>
-  <a href="https://www.npmjs.com/package/babel-core"><img alt="v6 npm Downloads" src="https://img.shields.io/npm/dm/babel-core.svg?maxAge=43200&label=v6%20downloads"></a>
-</p>
-<p align="center">
-  <a href="https://travis-ci.com/babel/babel"><img alt="Travis Status" src="https://img.shields.io/travis/com/babel/babel/master.svg?label=travis&maxAge=43200"></a>
+  <a href="https://travis-ci.org/babel/babel"><img alt="Travis Status" src="https://img.shields.io/travis/babel/babel/master.svg?label=travis&maxAge=43200"></a>
  <a href="https://circleci.com/gh/babel/babel"><img alt="CircleCI Status" src="https://img.shields.io/circleci/project/github/babel/babel/master.svg?label=circle&maxAge=43200"></a>
  <a href="https://codecov.io/github/babel/babel"><img alt="Coverage Status" src="https://img.shields.io/codecov/c/github/babel/babel/master.svg?maxAge=43200"></a>
  <a href="https://slack.babeljs.io/"><img alt="Slack Status" src="https://slack.babeljs.io/badge.svg"></a>
-  <a href="https://twitter.com/intent/follow?screen_name=babeljs"><img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/babeljs.svg?style=social&label=Follow"></a>
+  <a href="https://www.npmjs.com/package/babel-core"><img alt="npm Downloads" src="https://img.shields.io/npm/dm/babel-core.svg?maxAge=43200"></a>
 </p>

 <h2 align="center">Supporting Babel</h2>
@ -38,11 +27,11 @@
 Babel (pronounced ["babble"](https://soundcloud.com/sebmck/how-to-pronounce-babel))  is a community-driven project used by many companies and projects, and is maintained by a group of [volunteers](https://babeljs.io/team). If you'd like to help support the future of the project, please consider:

 - Giving developer time on the project. (Message us on [Twitter](https://twitter.com/babeljs) or [Slack](https://slack.babeljs.io/) for guidance!)
- Giving funds by becoming a sponsor on [Open Collective](https://opencollective.com/babel) or [Patreon](https://www.patreon.com/henryzhu)!
+- Giving funds by becoming a sponsor (see below)!

-## Sponsors
+## Open Collective Sponsors

-Our top sponsors are shown below! [[Become a sponsor](https://opencollective.com/babel#sponsor)]
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/babel#sponsor)]

 <a href="https://opencollective.com/babel/sponsor/0/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/0/avatar.svg"></a>
 <a href="https://opencollective.com/babel/sponsor/1/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/1/avatar.svg"></a>
@ -59,6 +48,35 @@ Our top sponsors are shown below! [[Become a sponsor](https://opencollective.com
  <a href="https://opencollective.com/babel/sponsor/12/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/12/avatar.svg"></a>
  <a href="https://opencollective.com/babel/sponsor/13/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/13/avatar.svg"></a>
  <a href="https://opencollective.com/babel/sponsor/14/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/14/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/15/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/15/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/16/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/16/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/17/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/17/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/18/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/18/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/19/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/19/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/20/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/20/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/21/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/21/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/22/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/22/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/23/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/23/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/24/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/24/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/25/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/25/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/26/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/26/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/27/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/27/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/28/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/28/avatar.svg"></a>
+  <a href="https://opencollective.com/babel/sponsor/29/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/29/avatar.svg"></a>
+
+## Patreon Sponsors
+
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://www.patreon.com/henryzhu)]
+
+## Silver
+
+<a href="https://issue.sh/?utm_medium=github&utm_campaign=babel" target="_blank"><img src="https://user-images.githubusercontent.com/5557143/43912065-c8cdff78-9c33-11e8-829a-0b4166ccc215.png"></a>
+
+## Bronze
+
+<a href="http://teamextension.io/" target="_blank"><img src="https://teamextension.io/dist/img/logo/te-logo-compact.png" height="64"></a>
+<a href="https://webflow.com/" target="_blank"><img src="https://opencollective.com/proxy/images/?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F4a5024b0-8cf2-11e7-b1a2-b30b1de1463c.png&height=64"></a>
+<p><a href="https://twitter.com/mikesherov">Mike Sherov</a></p>

 ## Intro

@ -85,16 +103,16 @@ Try it out at our [REPL](https://babeljs.io/repl/build/master#?code_lz=NoRgNATGD

 ### Who maintains Babel?

-Mostly a handful of volunteers, funded by you! Please check out our [team page](https://babeljs.io/team)!
+Mostly a handful of volunteers! Please check out our [team page](https://babeljs.io/team)!
+
+### Looking for support?
+
+For questions and support please visit join our [Slack Community](https://slack.babeljs.io/) (you can sign-up [here](https://slack.babeljs.io/) for an invite), ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/babeljs), or ping us on [Twitter](https://twitter.com/babeljs).

 ### Is there a Babel song?

 I'm so glad you asked: [Hallelujah —— In Praise of Babel](SONG.md) by [@angus-c](https://github.com/angus-c), [audio version](https://youtu.be/40abpedBKK8) by [@swyx](https://twitter.com/@swyx). Tweet us your recordings!

-### Looking for support?
-
-For questions and support please join our [Slack Community](https://slack.babeljs.io/) (you can sign-up [here](https://slack.babeljs.io/) for an invite), ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/babeljs), or ping us on [Twitter](https://twitter.com/babeljs).
-
 ### Where are the docs?

 Check out our website: [babeljs.io](https://babeljs.io/), and report issues/features at [babel/website](https://github.com/babel/website/issues).
@ -105,19 +123,12 @@ Please read through our [CONTRIBUTING.md](CONTRIBUTING.md) and fill out the issu

 ### Want to contribute to Babel?

-Check out:
+Check out our [CONTRIBUTING.md](CONTRIBUTING.md) to get started with setting up the repo.

- Our [#development](https://babeljs.slack.com/messages/development) Slack channel and say hi ([signup](https://slack.babeljs.io))!
- Issues with the [good first issue](https://github.com/babel/babel/labels/good%20first%20issue) and [help wanted](https://github.com/babel/babel/labels/help%20wanted) label. We suggest also looking at the [closed ones](https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aclosed+label%3A%22good+first+issue%22) to get a sense of the kinds of issues you can tackle.
-
-Some resources:
-
- Our [CONTRIBUTING.md](CONTRIBUTING.md) to get started with setting up the repo.
+- If you have already joined Slack, join our [#development](https://babeljs.slack.com/messages/development) channel and say hi!
+- Check out the issues with the [good first issue](https://github.com/babel/babel/labels/good%20first%20issue) and [help wanted](https://github.com/babel/babel/labels/help%20wanted) label. We suggest also looking at the closed ones to get a sense of the kinds of issues you can tackle.
 - Our discussions/notes/roadmap: [babel/notes](https://github.com/babel/notes)
 - Our progress on TC39 proposals: [babel/proposals](https://github.com/babel/proposals)
- Our blog which contains release posts and explainations: [/blog](https://babeljs.io/blog)
- Our videos page with talks about open source and Babel: [/videos](https://babeljs.io/videos)
- Our [podcast](https://podcast.babeljs.io)

 ### How is the repo structured?

--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,19 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-This is the list of versions of `babel` which are
-currently being supported with security updates.
-
-| Version  | Supported          |
-| -------- | ------------------ |
-| 7.x      | :white_check_mark: |
-| 6.26.x   | :white_check_mark: |
-| < 6.26.0 | :x:                |
-
-## Reporting a Vulnerability
-
-To report a vulnerability please send an email with the details to security@babeljs.io. 
-This will help us to assess the risk and start the necessary steps.
-
-Thanks for helping to keep babel secure.
--- a/SONG.md
+++ b/SONG.md
@ -19,8 +19,7 @@ Generators, const and let
 I used them all without regret  
 And it’s a terse and a destructured Hallelujah  

-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 Well my faith was strong but I needed proof  
 The standard was my source of truth  
@ -29,9 +28,7 @@ So even though you weren’t impressed
 I checked the build against the spec  
 And it’s a more-or-less compliant Hallelujah  

-
-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 Now you say the build step’s too complex  
 And you claim no need for ES Next  
@ -40,9 +37,7 @@ But your code grows older with each line
 It’s a joyless dirge on a withered vine  
 It’s a threnody for a bygone Hallelujah  

-
-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 Yes I learned about the danger signs  
 How they’d polyfilled a thousand lines  
@ -51,9 +46,7 @@ Still I disregarded common sense
 Now my source is small but the build’s immense  
 And it’s a slow and unresponsive Hallelujah  

-
-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 There was a time when they let me know  
 What’s really going on below  
@ -62,9 +55,7 @@ And debugging’s not a progress march
 It’s a frenzied fumble in the dark  
 It’s a labyrinthine search for Hallelujah  

-
-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 Well, maybe there’s a god up there  
 But all I ever got from prayers  
@ -73,8 +64,6 @@ And that anguished cry you hear at night
 Is the plugin I forgot to write  
 It’s a cold and it’s a broken Hallelujah  

-
-Hallelujah, Hallelujah  
-Hallelujah, Hallelujah
+Hallelujah etc.

 [Angus Croll](https://github.com/angus-c)  
--- a/babel.config.js
+++ b/babel.config.js
@ -5,26 +5,21 @@ module.exports = function(api) {

  const includeCoverage = process.env.BABEL_COVERAGE === "true";

-  const envOptsNoTargets = {
+  const envOpts = {
    loose: true,
    modules: false,
    exclude: ["transform-typeof-symbol"],
  };
-  const envOpts = Object.assign({}, envOptsNoTargets);

  let convertESM = true;
  let ignoreLib = true;
  let includeRuntime = false;
-  const nodeVersion = "6.9";

  switch (env) {
    // Configs used during bundling builds.
    case "babel-parser":
      convertESM = false;
      ignoreLib = false;
-      envOpts.targets = {
-        node: nodeVersion,
-      };
      break;
    case "standalone":
      convertESM = false;
@ -34,7 +29,7 @@ module.exports = function(api) {
    case "production":
      // Config during builds before publish.
      envOpts.targets = {
-        node: nodeVersion,
+        node: "6.9",
      };
      break;
    case "development":
@ -77,10 +72,9 @@ module.exports = function(api) {
        "@babel/proposal-object-rest-spread",
        { useBuiltIns: true, loose: true },
      ],
-      "@babel/plugin-proposal-optional-chaining",
-      "@babel/plugin-proposal-nullish-coalescing-operator",

-      convertESM ? "@babel/transform-modules-commonjs" : null,
+      // Explicitly use the lazy version of CommonJS modules.
+      convertESM ? ["@babel/transform-modules-commonjs", { lazy: true }] : null,
    ].filter(Boolean),
    overrides: [
      {
@ -91,18 +85,14 @@ module.exports = function(api) {
        ],
      },
      {
-        test: ["./packages/babel-cli", "./packages/babel-core"],
+        test: "./packages/babel-register",
        plugins: [
-          // Explicitly use the lazy version of CommonJS modules.
-          convertESM
-            ? ["@babel/transform-modules-commonjs", { lazy: true }]
-            : null,
+          // Override the root options to disable lazy imports for babel-register
+          // because otherwise the require hook will try to lazy-import things
+          // leading to dependency cycles.
+          convertESM ? "@babel/transform-modules-commonjs" : null,
        ].filter(Boolean),
      },
-      {
-        test: "./packages/babel-polyfill",
-        presets: [["@babel/env", envOptsNoTargets]],
-      },
      {
        // The vast majority of our src files are modules, but we use
        // unambiguous to keep things simple until we get around to renaming
@ -121,11 +111,9 @@ module.exports = function(api) {
          "packages/babel-runtime",
          /[\\/]node_modules[\\/](?:@babel\/runtime|babel-runtime|core-js)[\\/]/,
        ],
-        plugins: [
-          includeRuntime
-            ? ["@babel/transform-runtime", { version: "7.4.4" }]
-            : null,
-        ].filter(Boolean),
+        plugins: [includeRuntime ? "@babel/transform-runtime" : null].filter(
+          Boolean
+        ),
      },
    ].filter(Boolean),
  };
--- a/codecov.yml
+++ b/codecov.yml
@ -8,5 +8,3 @@ coverage:
        target: "80%"
    patch:
      enabled: false
-ignore:
-  - packages/babel-types/src/*/generated/index.js
--- a/codemods/babel-plugin-codemod-object-assign-to-object-spread/package.json
+++ b/codemods/babel-plugin-codemod-object-assign-to-object-spread/package.json
@ -16,7 +16,7 @@
    "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
  },
  "peerDependencies": {
-    "@babel/core": "^7.0.0-0 || csx"
+    "@babel/core": "^7.0.0-0"
  },
  "devDependencies": {
    "@babel/core": "^7.0.0",
--- a/codemods/babel-plugin-codemod-optional-catch-binding/package.json
+++ b/codemods/babel-plugin-codemod-optional-catch-binding/package.json
@ -16,7 +16,7 @@
    "@babel/plugin-syntax-optional-catch-binding": "^7.0.0"
  },
  "peerDependencies": {
-    "@babel/core": "^7.0.0-0 || csx"
+    "@babel/core": "^7.0.0-0"
  },
  "devDependencies": {
    "@babel/core": "^7.0.0",
--- a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/input.js
+++ b/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/input.js
@ -0,0 +1,5 @@
+try {
+  throw 0;
+} catch (e) {
+  let e = new TypeError('Duplicate variable declaration; will throw an error.');
+}
--- a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/options.json
+++ b/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/options.json
@ -0,0 +1,4 @@
+{
+  "plugins": ["../../../../lib"],
+  "throws": "Duplicate declaration \"e\""
+}
--- a/doc/design/monorepo.md
+++ b/doc/design/monorepo.md
@ -15,7 +15,7 @@ This is quite taboo but let's look at the pros and cons:
 * Easy to coordinate changes across modules.
 * Single place to report issues.
 * Easier to setup a development environment.
- * Tests across modules are run together which finds bugs that touch multiple modules more easily.
+ * Tests across modules are run together which finds bugs that touch multiple modules easier.

 **Cons:**

--- a/eslint-local-rules.js
+++ b/eslint-local-rules.js
@ -0,0 +1,9 @@
+"use strict";
+
+const noDeprecatedClone = require("./scripts/eslint_rules/no-deprecated-clone");
+const noUndefinedIdentifier = require("./scripts/eslint_rules/no-undefined-identifier");
+
+module.exports = {
+  "no-deprecated-clone": noDeprecatedClone,
+  "no-undefined-identifier": noUndefinedIdentifier,
+};
--- a/lerna.json
+++ b/lerna.json
@ -1,40 +1,37 @@
 {
-  "version": "7.7.3",
+  "lerna": "2.11.0",
+  "version": "7.1.0",
  "changelog": {
    "repo": "babel/babel",
    "cacheDir": ".changelog",
    "labels": {
-      "PR: Spec Compliance :eyeglasses:": ":eyeglasses: Spec Compliance",
+      "PR: Spec Compliancy :eyeglasses:": ":eyeglasses: Spec Compliancy",
      "PR: Breaking Change :boom:": ":boom: Breaking Change",
      "PR: New Feature :rocket:": ":rocket: New Feature",
      "PR: Bug Fix :bug:": ":bug: Bug Fix",
      "PR: Polish :nail_care:": ":nail_care: Polish",
      "PR: Docs :memo:": ":memo: Documentation",
-      "PR: Internal :house:": ":house: Internal",
-      "PR: Performance :running_woman:": ":running_woman: Performance"
+      "PR: Internal :house:": ":house: Internal"
    }
  },
-  "command": {
+  "commands": {
    "publish": {
-      "ignoreChanges": [
+      "ignore": [
        "*.md",
+        "*.json",
        "*.txt",
        "test/**",
        "codemods/**",
-        "# We ignore every JSON file, except for built-in-modules, built-ins and plugins defined in babel-preset-env/data.",
-        "@(!(built-in-modules|built-ins|plugins|package)).json"
+        "package.json"
      ]
    }
  },
  "packages": [
-    "codemods/*",
-    "packages/*"
+    "packages/*",
+    "codemods/*"
  ],
  "npmClient": "yarn",
  "npmClientArgs": [
    "--no-lockfile"
-  ],
-  "publishConfig": {
-    "registry": "https://npm.cerxes.net"
-  }
+  ]
 }
--- a/lib/third-party-libs.js.flow
+++ b/lib/third-party-libs.js.flow
@ -2,6 +2,12 @@
 * Basic declarations for the npm modules we use.
 */

+declare module "micromatch" {
+  declare module.exports: {
+    (Array<string>, Array<string>, ?{ nocase: boolean }): Array<string>,
+  };
+}
+
 declare module "resolve" {
  declare export default {
    sync: (string, {| basedir: string |}) => string;
@ -27,31 +33,16 @@ declare module "lodash/merge" {
 }

 declare module "semver" {
-  declare class SemVer {
-    build: Array<string>;
-    loose: ?boolean;
-    major: number;
-    minor: number;
-    patch: number;
-    prerelease: Array<string | number>;
-    raw: string;
-    version: string;
-
-    constructor(version: string | SemVer): SemVer;
-  }
-
  declare module.exports: {
-    SemVer: SemVer;
-
-    coerce(version: string | SemVer): SemVer | null;
+    valid(v: string): boolean;
    gt(v1: string, v2: string): boolean;
-    intersects(r1: string, r2: string): boolean;
    lt(v1: string, v2: string): boolean;
    major(v: string): number;
    minor(v: string): number;
    patch(v: string): number;
    satisfies(v1: string, r1: string): boolean;
-    valid(v: string): boolean;
+
+    intersects(r1: string, r2: string): boolean;
  }
 }

@ -165,7 +156,7 @@ declare module "source-map" {
 }

 declare module "convert-source-map" {
-  import type { SourceMap, SourceMapGenerator } from "source-map";
+  import type { SourceMap } from "source-map";

  declare class Converter {
    toJSON(): string;
@ -177,11 +168,11 @@ declare module "convert-source-map" {
  declare module.exports: {
    SourceMap: SourceMap,
    Converter: Converter,
-    fromObject(obj: SourceMap | SourceMapGenerator): Converter,
+    fromObject(obj: SourceMap): Converter,
    fromJSON(str: string): Converter,
    fromBase64(str: string): Converter,
    fromComment(str: string): Converter,
-    fromMapFileComment(str: string, dir: string): Converter,
+    fromMapFileComment(str: string): Converter,
    fromSource(str: string): Converter,
    fromMapFileSource(str: string, dir: string): Converter,
    removeComments(str: string): string,
@ -195,13 +186,3 @@ declare module "js-levenshtein" {
    (string, string): number,
  };
 }
-
-declare module "core-js-compat/data" {
-  declare type Target = "node" | "chrome" | "opera" | "edge" | "firefox" | "safari" | "ie" | "ios" | "android" | "electron" | "samsung";
-
-  declare module.exports: {
-    [key: string]: {
-      [target: Target]: string;
-    }
-  }
-}
--- a/package.json
+++ b/package.json
@ -6,77 +6,73 @@
    "build": "make build",
    "fix": "make fix",
    "lint": "make lint",
+    "precommit": "lint-staged",
    "test": "make test"
  },
  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.6.0",
-    "@babel/eslint-plugin-development": "^1.0.1",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
-    "@babel/plugin-proposal-numeric-separator": "^7.2.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.6.0",
-    "@babel/plugin-transform-runtime": "^7.6.0",
-    "@babel/preset-env": "^7.6.0",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
    "@babel/preset-flow": "^7.0.0",
-    "@babel/register": "^7.6.0",
-    "@babel/runtime": "^7.6.0",
-    "babel-eslint": "^11.0.0-beta.0",
-    "babel-jest": "^24.9.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-transform-charcodes": "^0.2.0",
-    "browserify": "^16.2.3",
+    "@babel/register": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
+    "babel-core": "^7.0.0-0",
+    "babel-eslint": "^9.0.0",
+    "babel-jest": "^23.4.0",
+    "babel-loader": "8.0.0-beta.4",
+    "babel-plugin-transform-charcodes": "^0.1.0",
+    "browserify": "^16.2.2",
    "bundle-collapser": "^1.2.1",
-    "chalk": "^2.4.2",
-    "charcodes": "^0.2.0",
+    "chalk": "^2.3.2",
+    "charcodes": "^0.1.0",
    "derequire": "^2.0.2",
-    "duplicate-package-checker-webpack-plugin": "^2.1.0",
    "enhanced-resolve": "^3.0.0",
-    "eslint": "^6.0.1",
-    "eslint-config-babel": "^9.0.0",
-    "eslint-plugin-flowtype": "^3.8.2",
-    "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-prettier": "^3.1.0",
-    "fancy-log": "^1.3.3",
-    "flow-bin": "^0.108.0",
-    "graceful-fs": "^4.1.15",
-    "gulp": "^4.0.2",
-    "gulp-babel": "^8.0.0",
+    "eslint": "^5.3.0",
+    "eslint-config-babel": "^8.0.0",
+    "eslint-plugin-flowtype": "^2.50.0",
+    "eslint-plugin-local-rules": "0.1.0",
+    "eslint-plugin-prettier": "^2.6.2",
+    "flow-bin": "^0.80.0",
+    "graceful-fs": "^4.1.11",
+    "gulp": "^4.0.0",
+    "gulp-babel": "^8.0.0-beta.2",
    "gulp-filter": "^5.1.0",
    "gulp-newer": "^1.0.0",
-    "gulp-plumber": "^1.2.1",
-    "gulp-rename": "^1.4.0",
-    "gulp-uglify": "^3.0.2",
-    "gulp-watch": "^5.0.1",
-    "husky": "^3.0.0",
-    "jest": "^24.9.0",
-    "lerna": "^3.16.0",
+    "gulp-plumber": "^1.0.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^3.0.0",
+    "gulp-util": "^3.0.7",
+    "gulp-watch": "^5.0.0",
+    "husky": "^0.14.3",
+    "jest": "^23.4.1",
+    "lerna": "^2.11.0",
    "lerna-changelog": "^0.5.0",
-    "lint-staged": "^9.2.0",
-    "lodash": "^4.17.13",
+    "lint-staged": "^6.0.1",
+    "lodash": "^4.17.10",
+    "merge-stream": "^1.0.1",
    "output-file-sync": "^2.0.0",
-    "prettier": "^1.17.1",
-    "pump": "^3.0.0",
-    "rimraf": "^2.6.3",
-    "rollup": "^1.12.0",
-    "rollup-plugin-babel": "^4.0.0",
-    "rollup-plugin-node-resolve": "^5.0.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "test262-stream": "^1.3.0",
+    "prettier": "^1.13.7",
+    "pump": "^1.0.2",
+    "rimraf": "^2.4.3",
+    "rollup-plugin-babel": "^4.0.0-beta.0",
+    "rollup-plugin-node-resolve": "^3.0.2",
+    "rollup-stream": "^1.24.1",
+    "test262-stream": "^1.2.0",
    "through2": "^2.0.0",
-    "typescript": "^3.6.3",
-    "warnings-to-errors-webpack-plugin": "^2.0.0",
+    "uglify-js": "^2.4.16",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
    "webpack": "^3.4.1",
    "webpack-dependency-suite": "^2.4.4",
    "webpack-stream": "^4.0.0"
  },
-  "resolutions": {
-    "@lerna/**/@lerna/collect-updates": "https://github.com/babel/lerna.git#babel-collect-updates"
-  },
  "engines": {
-    "node": ">= 6.9.0 < 14.0.0",
+    "node": ">= 6.9.0 <= 11.0.0-0",
    "npm": ">= 3.x <= 6.x",
    "yarn": ">=0.27.5 || >=1.0.0-20170811"
  },
@ -85,11 +81,6 @@
      "eslint --format=codeframe"
    ]
  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
  "jest": {
    "collectCoverageFrom": [
      "packages/*/src/**/*.mjs",
@ -111,12 +102,9 @@
      "_browser\\.js"
    ],
    "testEnvironment": "node",
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/testSetupFile.js"
-    ],
+    "setupTestFrameworkScriptFile": "<rootDir>/test/testSetupFile.js",
    "transformIgnorePatterns": [
      "/node_modules/",
-      "/packages/babel-standalone/babel.js",
      "<rootDir>/packages/babel-standalone/babel(\\.min)?\\.js",
      "<rootDir>/packages/babel-preset-env-standalone/babel-preset-env(\\.min)?\\.js",
      "/test/(fixtures|tmp|__data__)/",
@ -133,9 +121,6 @@
      "/test/tmp/",
      "/test/__data__/",
      "<rootDir>/build/"
-    ],
-    "moduleNameMapper": {
-      "^@babel/([a-zA-Z0-9_-]+)$": "<rootDir>/packages/babel-$1/"
-    }
+    ]
  }
 }
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@babel/cli",
-  "version": "7.7.0",
+  "version": "7.1.0",
  "description": "Babel command line.",
  "author": "Sebastian McKenzie <sebmck@gmail.com>",
  "homepage": "https://babeljs.io/",
@ -23,20 +23,21 @@
    "convert-source-map": "^1.1.0",
    "fs-readdir-recursive": "^1.1.0",
    "glob": "^7.0.0",
-    "lodash": "^4.17.13",
-    "make-dir": "^2.1.0",
+    "lodash": "^4.17.10",
+    "mkdirp": "^0.5.1",
+    "output-file-sync": "^2.0.0",
    "slash": "^2.0.0",
    "source-map": "^0.5.0"
  },
  "optionalDependencies": {
-    "chokidar": "^2.1.8"
+    "chokidar": "^2.0.3"
  },
  "peerDependencies": {
-    "@babel/core": "^7.0.0-0 || csx"
+    "@babel/core": "^7.0.0-0"
  },
  "devDependencies": {
-    "@babel/core": "^7.7.0",
-    "@babel/helper-fixtures": "^7.6.3"
+    "@babel/core": "^7.0.0",
+    "@babel/helper-fixtures": "^7.0.0"
  },
  "bin": {
    "babel": "./bin/babel.js",
--- a/packages/babel-cli/src/babel-external-helpers.js
+++ b/packages/babel-cli/src/babel-external-helpers.js
@ -1,12 +1,7 @@
-// @flow
-
 import commander from "commander";
 import { buildExternalHelpers } from "@babel/core";

-function collect(
-  value: string | any,
-  previousValue: Array<string>,
-): Array<string> {
+function collect(value, previousValue): Array<string> {
  // If the user passed the option with no value, like "babel-external-helpers --whitelist", do nothing.
  if (typeof value !== "string") return previousValue;

--- a/packages/babel-cli/src/babel/dir.js
+++ b/packages/babel-cli/src/babel/dir.js
@ -1,26 +1,16 @@
-// @flow
-
 import defaults from "lodash/defaults";
-import { sync as makeDirSync } from "make-dir";
+import outputFileSync from "output-file-sync";
+import { sync as mkdirpSync } from "mkdirp";
 import slash from "slash";
 import path from "path";
 import fs from "fs";

 import * as util from "./util";
-import { type CmdOptions } from "./options";

-function outputFileSync(filePath: string, data: string | Buffer): void {
-  makeDirSync(path.dirname(filePath));
-  fs.writeFileSync(filePath, data);
-}
-
-export default async function({
-  cliOptions,
-  babelOptions,
-}: CmdOptions): Promise<void> {
+export default async function({ cliOptions, babelOptions }) {
  const filenames = cliOptions.filenames;

-  async function write(src: string, base: string): Promise<boolean> {
+  async function write(src, base) {
    let relative = path.relative(base, src);

    if (!util.isCompilableExtension(relative, cliOptions.extensions)) {
@ -75,14 +65,14 @@ export default async function({
    }
  }

-  function getDest(filename: string, base: string): string {
+  function getDest(filename, base) {
    if (cliOptions.relative) {
      return path.join(base, cliOptions.outDir, filename);
    }
    return path.join(cliOptions.outDir, filename);
  }

-  async function handleFile(src: string, base: string): Promise<boolean> {
+  async function handleFile(src, base) {
    const written = await write(src, base);

    if (!written && cliOptions.copyFiles) {
@ -94,7 +84,7 @@ export default async function({
    return written;
  }

-  async function handle(filenameOrDir: string): Promise<number> {
+  async function handle(filenameOrDir) {
    if (!fs.existsSync(filenameOrDir)) return 0;

    const stat = fs.statSync(filenameOrDir);
@ -126,20 +116,18 @@ export default async function({
      util.deleteDir(cliOptions.outDir);
    }

-    makeDirSync(cliOptions.outDir);
+    mkdirpSync(cliOptions.outDir);

    let compiledFiles = 0;
    for (const filename of cliOptions.filenames) {
      compiledFiles += await handle(filename);
    }

-    if (!cliOptions.quiet) {
-      console.log(
-        `Successfully compiled ${compiledFiles} ${
-          compiledFiles !== 1 ? "files" : "file"
-        } with Babel.`,
-      );
-    }
+    console.log(
+      `Successfully compiled ${compiledFiles} ${
+        compiledFiles !== 1 ? "files" : "file"
+      } with Babel.`,
+    );
  }

  if (cliOptions.watch) {
--- a/packages/babel-cli/src/babel/file.js
+++ b/packages/babel-cli/src/babel/file.js
@ -1,26 +1,14 @@
-// @flow
-
 import convertSourceMap from "convert-source-map";
 import defaults from "lodash/defaults";
 import sourceMap from "source-map";
 import slash from "slash";
-import { sync as makeDirSync } from "make-dir";
 import path from "path";
 import fs from "fs";

 import * as util from "./util";
-import { type CmdOptions } from "./options";

-type CompilationOutput = {
-  code: string,
-  map: Object,
-};
-
-export default async function({
-  cliOptions,
-  babelOptions,
-}: CmdOptions): Promise<void> {
-  function buildResult(fileResults: Array<Object>): CompilationOutput {
+export default async function({ cliOptions, babelOptions }) {
+  function buildResult(fileResults) {
    const map = new sourceMap.SourceMapGenerator({
      file:
        cliOptions.sourceMapTarget ||
@ -86,12 +74,10 @@ export default async function({
    };
  }

-  function output(fileResults: Array<string>): void {
+  function output(fileResults) {
    const result = buildResult(fileResults);

    if (cliOptions.outFile) {
-      makeDirSync(path.dirname(cliOptions.outFile));
-
      // we've requested for a sourcemap to be written to disk
      if (babelOptions.sourceMaps && babelOptions.sourceMaps !== "inline") {
        const mapLoc = cliOptions.outFile + ".map";
@ -105,15 +91,14 @@ export default async function({
    }
  }

-  function readStdin(): Promise<string> {
-    return new Promise((resolve: Function, reject: Function): void => {
+  function readStdin() {
+    return new Promise((resolve, reject) => {
      let code = "";

      process.stdin.setEncoding("utf8");

      process.stdin.on("readable", function() {
        const chunk = process.stdin.read();
-        // $FlowIgnore
        if (chunk !== null) code += chunk;
      });

@ -124,7 +109,7 @@ export default async function({
    });
  }

-  async function stdin(): Promise<void> {
+  async function stdin() {
    const code = await readStdin();

    const res = await util.transform(
@ -141,7 +126,7 @@ export default async function({
    output([res]);
  }

-  async function walk(filenames: Array<string>): Promise<void> {
+  async function walk(filenames) {
    const _filenames = [];

    filenames.forEach(function(filename) {
@ -152,11 +137,7 @@ export default async function({
        const dirname = filename;

        util
-          .readdirForCompilable(
-            filename,
-            cliOptions.includeDotfiles,
-            cliOptions.extensions,
-          )
+          .readdirForCompilable(filename, cliOptions.includeDotfiles)
          .forEach(function(filename) {
            _filenames.push(path.join(dirname, filename));
          });
@ -166,7 +147,7 @@ export default async function({
    });

    const results = await Promise.all(
-      _filenames.map(async function(filename: string): Promise<Object> {
+      _filenames.map(async function(filename) {
        let sourceFilename = filename;
        if (cliOptions.outFile) {
          sourceFilename = path.relative(
@ -183,7 +164,7 @@ export default async function({
              {
                sourceFileName: sourceFilename,
                // Since we're compiling everything to be merged together,
-                // "inline" applies to the final output file, but not to the individual
+                // "inline" applies to the final output file, but to the individual
                // files being concatenated.
                sourceMaps:
                  babelOptions.sourceMaps === "inline"
@ -207,7 +188,7 @@ export default async function({
    output(results);
  }

-  async function files(filenames: Array<string>): Promise<void> {
+  async function files(filenames) {
    if (!cliOptions.skipInitialBuild) {
      await walk(filenames);
    }
@ -223,7 +204,7 @@ export default async function({
            pollInterval: 10,
          },
        })
-        .on("all", function(type: string, filename: string) {
+        .on("all", function(type, filename) {
          if (!util.isCompilableExtension(filename, cliOptions.extensions)) {
            return;
          }
--- a/packages/babel-cli/src/babel/index.js
+++ b/packages/babel-cli/src/babel/index.js
@ -6,12 +6,8 @@ import fileCommand from "./file";

 const opts = parseArgv(process.argv);

-if (opts) {
-  const fn = opts.cliOptions.outDir ? dirCommand : fileCommand;
-  fn(opts).catch(err => {
-    console.error(err);
-    process.exitCode = 1;
-  });
-} else {
-  process.exitCode = 2;
-}
+const fn = opts.cliOptions.outDir ? dirCommand : fileCommand;
+fn(opts).catch(err => {
+  console.error(err);
+  process.exit(1);
+});
--- a/packages/babel-cli/src/babel/options.js
+++ b/packages/babel-cli/src/babel/options.js
@ -1,5 +1,3 @@
-// @flow
-
 import fs from "fs";

 import commander from "commander";
@ -12,19 +10,19 @@ import pkg from "../../package.json";
 // Standard Babel input configs.
 commander.option(
  "-f, --filename [filename]",
-  "The filename to use when reading from stdin. This will be used in source-maps, errors etc.",
+  "filename to use when reading from stdin - this will be used in source-maps, errors etc",
 );
 commander.option(
  "--presets [list]",
-  "A comma-separated list of preset names.",
+  "comma-separated list of preset names",
  collect,
 );
 commander.option(
  "--plugins [list]",
-  "A comma-separated list of plugin names.",
+  "comma-separated list of plugin names",
  collect,
 );
-commander.option("--config-file [path]", "Path to a .babelrc file to use.");
+commander.option("--config-file [path]", "Path a to .babelrc file to use");
 commander.option(
  "--env-name [name]",
  "The name of the 'env' to use when loading configs and plugins. " +
@ -40,101 +38,97 @@ commander.option(
 commander.option("--source-type [script|module]", "");
 commander.option(
  "--no-babelrc",
-  "Whether or not to look up .babelrc and .babelignore files.",
+  "Whether or not to look up .babelrc and .babelignore files",
 );
 commander.option(
  "--ignore [list]",
-  "List of glob paths to **not** compile.",
+  "list of glob paths to **not** compile",
  collect,
 );
 commander.option(
  "--only [list]",
-  "List of glob paths to **only** compile.",
+  "list of glob paths to **only** compile",
  collect,
 );

 // Misc babel config.
 commander.option(
  "--no-highlight-code",
-  "Enable or disable ANSI syntax highlighting of code frames. (on by default)",
+  "enable/disable ANSI syntax highlighting of code frames (on by default)",
 );

 // General output formatting.
 commander.option(
  "--no-comments",
-  "Write comments to generated output. (true by default)",
+  "write comments to generated output (true by default)",
 );
 commander.option(
  "--retain-lines",
-  "Retain line numbers. This will result in really ugly code.",
+  "retain line numbers - will result in really ugly code",
 );
 commander.option(
  "--compact [true|false|auto]",
-  "Do not include superfluous whitespace characters and line terminators.",
+  "do not include superfluous whitespace characters and line terminators",
  booleanify,
 );
-commander.option(
-  "--minified [true|false]",
-  "Save as many bytes when printing.",
-);
+commander.option("--minified", "save as much bytes when printing [true|false]");
 commander.option(
  "--auxiliary-comment-before [string]",
-  "Print a comment before any injected non-user code.",
+  "print a comment before any injected non-user code",
 );
 commander.option(
  "--auxiliary-comment-after [string]",
-  "Print a comment after any injected non-user code.",
+  "print a comment after any injected non-user code",
 );

-// General source map formatting.
+// General soucemap formatting.
 commander.option("-s, --source-maps [true|false|inline|both]", "", booleanify);
 commander.option(
  "--source-map-target [string]",
-  "Set `file` on returned source map.",
+  "set `file` on returned source map",
 );
 commander.option(
  "--source-file-name [string]",
-  "Set `sources[0]` on returned source map.",
+  "set `sources[0]` on returned source map",
 );
 commander.option(
  "--source-root [filename]",
-  "The root from which all sources are relative.",
+  "the root from which all sources are relative",
 );

 // Config params for certain module output formats.
 commander.option(
  "--module-root [filename]",
-  // eslint-disable-next-line max-len
-  "Optional prefix for the AMD module formatter that will be prepended to the filename on module definitions.",
+  "optional prefix for the AMD module formatter that will be prepend to the filename on module definitions",
 );
-commander.option("-M, --module-ids", "Insert an explicit id for modules.");
+commander.option("-M, --module-ids", "insert an explicit id for modules");
 commander.option(
  "--module-id [string]",
-  "Specify a custom name for module ids.",
+  "specify a custom name for module ids",
 );

 // "babel" command specific arguments that are not passed to @babel/core.
 commander.option(
  "-x, --extensions [extensions]",
-  "List of extensions to compile when a directory has been the input. [.es6,.js,.es,.jsx,.mjs]",
+  "List of extensions to compile when a directory has been input [.es6,.js,.es,.jsx,.mjs]",
  collect,
 );
 commander.option(
  "--keep-file-extension",
-  "Preserve the file extensions of the input files.",
+  "Preserve the file extensions of the input files",
 );
-commander.option("-w, --watch", "Recompile files on changes.");
+commander.option("-w, --watch", "Recompile files on changes");
 commander.option(
  "--skip-initial-build",
-  "Do not compile files before watching.",
+  "Do not compile files before watching",
 );
 commander.option(
  "-o, --out-file [out]",
-  "Compile all input files into a single file.",
+  "Compile all input files into a single file",
 );
 commander.option(
  "-d, --out-dir [out]",
-  "Compile an input directory of modules into an output directory.",
+  "Compile an input directory of modules into an output directory",
 );
 commander.option(
  "--relative",
@ -142,34 +136,22 @@ commander.option(
 );
 commander.option(
  "-D, --copy-files",
-  "When compiling a directory copy over non-compilable files.",
+  "When compiling a directory copy over non-compilable files",
 );
 commander.option(
  "--include-dotfiles",
-  "Include dotfiles when compiling and copying non-compilable files.",
-);
-commander.option(
-  "--verbose",
-  "Log everything. This option conflicts with --quiet",
-);
-commander.option(
-  "--quiet",
-  "Don't log anything. This option conflicts with --verbose",
+  "Include dotfiles when compiling and copying non-compilable files",
 );
+commander.option("--verbose", "Log everything");
 commander.option(
  "--delete-dir-on-start",
-  "Delete the out directory before compilation.",
+  "Delete the out directory before compilation",
 );

 commander.version(pkg.version + " (@babel/core " + version + ")");
 commander.usage("[options] <files ...>");

-export type CmdOptions = {
-  babelOptions: Object,
-  cliOptions: Object,
-};
-
-export default function parseArgv(args: Array<string>): CmdOptions | null {
+export default function parseArgv(args: Array<string>) {
  //
  commander.parse(args);

@ -218,10 +200,6 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
    errors.push("--delete-dir-on-start requires --out-dir");
  }

-  if (commander.verbose && commander.quiet) {
-    errors.push("--verbose and --quiet cannot be used together");
-  }
-
  if (
    !commander.outDir &&
    filenames.length === 0 &&
@ -238,52 +216,41 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
    errors.forEach(function(e) {
      console.error("  " + e);
    });
-    return null;
+    process.exit(2);
  }

  const opts = commander.opts();

-  const babelOptions = {
-    presets: opts.presets,
-    plugins: opts.plugins,
-    rootMode: opts.rootMode,
-    configFile: opts.configFile,
-    envName: opts.envName,
-    sourceType: opts.sourceType,
-    ignore: opts.ignore,
-    only: opts.only,
-    retainLines: opts.retainLines,
-    compact: opts.compact,
-    minified: opts.minified,
-    auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
-    auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
-    sourceMaps: opts.sourceMaps,
-    sourceFileName: opts.sourceFileName,
-    sourceRoot: opts.sourceRoot,
-    moduleRoot: opts.moduleRoot,
-    moduleIds: opts.moduleIds,
-    moduleId: opts.moduleId,
-
-    // Commander will default the "--no-" arguments to true, but we want to
-    // leave them undefined so that @babel/core can handle the
-    // default-assignment logic on its own.
-    babelrc: opts.babelrc === true ? undefined : opts.babelrc,
-    highlightCode: opts.highlightCode === true ? undefined : opts.highlightCode,
-    comments: opts.comments === true ? undefined : opts.comments,
-  };
-
-  // If the @babel/cli version is newer than the @babel/core version, and we have added
-  // new options for @babel/core, we'll potentially get option validation errors from
-  // @babel/core. To avoid that, we delete undefined options, so @babel/core will only
-  // give the error if users actually pass an unsupported CLI option.
-  for (const key of Object.keys(babelOptions)) {
-    if (babelOptions[key] === undefined) {
-      delete babelOptions[key];
-    }
-  }
-
  return {
-    babelOptions,
+    babelOptions: {
+      presets: opts.presets,
+      plugins: opts.plugins,
+      rootMode: opts.rootMode,
+      configFile: opts.configFile,
+      envName: opts.envName,
+      sourceType: opts.sourceType,
+      ignore: opts.ignore,
+      only: opts.only,
+      retainLines: opts.retainLines,
+      compact: opts.compact,
+      minified: opts.minified,
+      auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
+      auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
+      sourceMaps: opts.sourceMaps,
+      sourceFileName: opts.sourceFileName,
+      sourceRoot: opts.sourceRoot,
+      moduleRoot: opts.moduleRoot,
+      moduleIds: opts.moduleIds,
+      moduleId: opts.moduleId,
+
+      // Commander will default the "--no-" arguments to true, but we want to
+      // leave them undefined so that @babel/core can handle the
+      // default-assignment logic on its own.
+      babelrc: opts.babelrc === true ? undefined : opts.babelrc,
+      highlightCode:
+        opts.highlightCode === true ? undefined : opts.highlightCode,
+      comments: opts.comments === true ? undefined : opts.comments,
+    },
    cliOptions: {
      filename: opts.filename,
      filenames,
@ -297,7 +264,6 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
      copyFiles: opts.copyFiles,
      includeDotfiles: opts.includeDotfiles,
      verbose: opts.verbose,
-      quiet: opts.quiet,
      deleteDirOnStart: opts.deleteDirOnStart,
      sourceMapTarget: opts.sourceMapTarget,
    },
--- a/packages/babel-cli/src/babel/util.js
+++ b/packages/babel-cli/src/babel/util.js
@ -1,12 +1,10 @@
-// @flow
-
 import readdirRecursive from "fs-readdir-recursive";
 import * as babel from "@babel/core";
 import includes from "lodash/includes";
 import path from "path";
 import fs from "fs";

-export function chmod(src: string, dest: string): void {
+export function chmod(src, dest) {
  fs.chmodSync(dest, fs.statSync(src).mode);
 }

@ -15,8 +13,8 @@ type ReaddirFilter = (filename: string) => boolean;
 export function readdir(
  dirname: string,
  includeDotfiles: boolean,
-  filter?: ReaddirFilter,
-): Array<string> {
+  filter: ReaddirFilter,
+) {
  return readdirRecursive(dirname, (filename, _index, currentDirectory) => {
    const stat = fs.statSync(path.join(currentDirectory, filename));

@ -31,11 +29,8 @@ export function readdir(
 export function readdirForCompilable(
  dirname: string,
  includeDotfiles: boolean,
-  altExts?: Array<string>,
-): Array<string> {
-  return readdir(dirname, includeDotfiles, function(filename) {
-    return isCompilableExtension(filename, altExts);
-  });
+) {
+  return readdir(dirname, includeDotfiles, isCompilableExtension);
 }

 /**
@ -50,7 +45,7 @@ export function isCompilableExtension(
  return includes(exts, ext);
 }

-export function addSourceMappingUrl(code: string, loc: string): string {
+export function addSourceMappingUrl(code, loc) {
  return code + "\n//# sourceMappingURL=" + path.basename(loc);
 }

@ -58,11 +53,7 @@ const CALLER = {
  name: "@babel/cli",
 };

-export function transform(
-  filename: string,
-  code: string,
-  opts: Object,
-): Promise<Object> {
+export function transform(filename, code, opts) {
  opts = {
    ...opts,
    caller: CALLER,
@ -77,10 +68,7 @@ export function transform(
  });
 }

-export function compile(
-  filename: string,
-  opts: Object | Function,
-): Promise<Object> {
+export function compile(filename, opts) {
  opts = {
    ...opts,
    caller: CALLER,
@ -94,7 +82,7 @@ export function compile(
  });
 }

-export function deleteDir(path: string): void {
+export function deleteDir(path) {
  if (fs.existsSync(path)) {
    fs.readdirSync(path).forEach(function(file) {
      const curPath = path + "/" + file;
@ -112,10 +100,10 @@ export function deleteDir(path: string): void {

 process.on("uncaughtException", function(err) {
  console.error(err);
-  process.exitCode = 1;
+  process.exit(1);
 });

-export function requireChokidar(): Object {
+export function requireChokidar() {
  try {
    return require("chokidar");
  } catch (err) {
@ -127,10 +115,7 @@ export function requireChokidar(): Object {
  }
 }

-export function adjustRelative(
-  relative: string,
-  keepFileExtension: boolean,
-): string {
+export function adjustRelative(relative, keepFileExtension) {
  if (keepFileExtension) {
    return relative;
  }
--- a/packages/babel-cli/test/fixtures/babel/dir
+++ b/packages/babel-cli/test/fixtures/babel/dir
@ -1 +0,0 @@
- (() => 42)
--- a/packages/babel-cli/test/fixtures/babel/dir
+++ b/packages/babel-cli/test/fixtures/babel/dir
@ -1 +0,0 @@
-arr.map(x => x * MULTIPLIER);
--- a/packages/babel-cli/test/fixtures/babel/dir
+++ b/packages/babel-cli/test/fixtures/babel/dir
@ -1,3 +0,0 @@
-{
-  "args": ["src", "--out-file", "test.js", "--extensions", ".es"]
-}
--- a/packages/babel-cli/test/fixtures/babel/dir
+++ b/packages/babel-cli/test/fixtures/babel/dir
@ -1,10 +0,0 @@
-"use strict";
-
-(function () {
-  return 42;
-});
-"use strict";
-
-arr.map(function (x) {
-  return x * MULTIPLIER;
-});
--- a/packages/babel-cli/test/fixtures/babel/dir
+++ b/packages/babel-cli/test/fixtures/babel/dir
--- a/packages/babel-cli/test/fixtures/babel/filename
+++ b/packages/babel-cli/test/fixtures/babel/filename
@ -1 +0,0 @@
-arr.map(x => x * MULTIPLIER);
--- a/packages/babel-cli/test/fixtures/babel/filename
+++ b/packages/babel-cli/test/fixtures/babel/filename
@ -1,3 +0,0 @@
-{
-  "args": ["script.js", "--out-file", "folder/nested/script.js"]
-}
--- a/packages/babel-cli/test/fixtures/babel/filename
+++ b/packages/babel-cli/test/fixtures/babel/filename
@ -1,5 +0,0 @@
-"use strict";
-
-arr.map(function (x) {
-  return x * MULTIPLIER;
-});
--- a/packages/babel-cli/test/fixtures/babel/stdin
+++ b/packages/babel-cli/test/fixtures/babel/stdin
@ -1,5 +0,0 @@
-{
-  "args": ["--filename", "test.js"],
-  "stderrContains": true,
-  "os": ["win32"]
-}
--- a/packages/babel-cli/test/fixtures/babel/stdin
+++ b/packages/babel-cli/test/fixtures/babel/stdin
@ -1 +0,0 @@
-SyntaxError: <CWD>\test.js: Unexpected token, expected ";" (2:10)
--- a/packages/babel-cli/test/fixtures/babel/stdin
+++ b/packages/babel-cli/test/fixtures/babel/stdin
@ -1,3 +0,0 @@
-arr.map(function () {
-  return $]!;
-});
--- a/packages/babel-cli/test/fixtures/babel/stdin
+++ b/packages/babel-cli/test/fixtures/babel/stdin
@ -1,5 +1,4 @@
 {
  "args": ["--filename", "test.js"],
-  "stderrContains": true,
-  "os": ["linux", "darwin"]
+  "stderrContains": true
 }
--- a/packages/babel-cli/test/index.js
+++ b/packages/babel-cli/test/index.js
@ -1,7 +1,7 @@
 const readdir = require("fs-readdir-recursive");
 const helper = require("@babel/helper-fixtures");
 const rimraf = require("rimraf");
-const { sync: makeDirSync } = require("make-dir");
+const outputFileSync = require("output-file-sync");
 const child = require("child_process");
 const merge = require("lodash/merge");
 const path = require("path");
@ -14,11 +14,6 @@ const fileFilter = function(x) {
  return x !== ".DS_Store";
 };

-const outputFileSync = function(filePath, data) {
-  makeDirSync(path.dirname(filePath));
-  fs.writeFileSync(filePath, data);
-};
-
 const presetLocs = [path.join(__dirname, "../../babel-preset-react")];

 const pluginLocs = [
@ -91,13 +86,13 @@ const assertTest = function(stdout, stderr, opts, cwd) {
  }

  if (opts.outFiles) {
-    const actualFiles = readDir(tmpLoc, fileFilter);
+    const actualFiles = readDir(path.join(tmpLoc), fileFilter);

    Object.keys(actualFiles).forEach(function(filename) {
      if (
        // saveInFiles always creates an empty .babelrc, so lets exclude for now
        filename !== ".babelrc" &&
-        !Object.prototype.hasOwnProperty.call(opts.inFiles, filename)
+        !opts.inFiles.hasOwnProperty(filename)
      ) {
        const expected = opts.outFiles[filename];
        const actual = actualFiles[filename];
@ -120,6 +115,13 @@ const buildTest = function(binName, testName, opts) {
  const binLoc = path.join(__dirname, "../lib", binName);

  return function(callback) {
+    const dir = process.cwd();
+
+    process.chdir(__dirname);
+    if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
+    fs.mkdirSync(tmpLoc);
+    process.chdir(tmpLoc);
+
    saveInFiles(opts.inFiles);

    let args = [binLoc];
@ -157,6 +159,7 @@ const buildTest = function(binName, testName, opts) {
          args.map(arg => `"${arg}"`).join(" ") + ": " + err.message;
      }

+      process.chdir(dir);
      callback(err);
    });

@ -168,32 +171,12 @@ const buildTest = function(binName, testName, opts) {
 };

 fs.readdirSync(fixtureLoc).forEach(function(binName) {
-  if (binName.startsWith(".")) return;
+  if (binName[0] === ".") return;

  const suiteLoc = path.join(fixtureLoc, binName);
  describe("bin/" + binName, function() {
-    let cwd;
-
-    beforeEach(() => {
-      cwd = process.cwd();
-
-      if (fs.existsSync(tmpLoc)) {
-        for (const child of fs.readdirSync(tmpLoc)) {
-          rimraf.sync(path.join(tmpLoc, child));
-        }
-      } else {
-        fs.mkdirSync(tmpLoc);
-      }
-
-      process.chdir(tmpLoc);
-    });
-
-    afterEach(() => {
-      process.chdir(cwd);
-    });
-
    fs.readdirSync(suiteLoc).forEach(function(testName) {
-      if (testName.startsWith(".")) return;
+      if (testName[0] === ".") return;

      const testLoc = path.join(suiteLoc, testName);

@ -202,29 +185,7 @@ fs.readdirSync(fixtureLoc).forEach(function(binName) {
      };

      const optionsLoc = path.join(testLoc, "options.json");
-      if (fs.existsSync(optionsLoc)) {
-        const taskOpts = require(optionsLoc);
-        if (taskOpts.os) {
-          let os = taskOpts.os;
-
-          if (!Array.isArray(os) && typeof os !== "string") {
-            throw new Error(
-              `'os' should be either string or string array: ${taskOpts.os}`,
-            );
-          }
-
-          if (typeof os === "string") {
-            os = [os];
-          }
-
-          if (!os.includes(process.platform)) {
-            return;
-          }
-
-          delete taskOpts.os;
-        }
-        merge(opts, taskOpts);
-      }
+      if (fs.existsSync(optionsLoc)) merge(opts, require(optionsLoc));

      ["stdout", "stdin", "stderr"].forEach(function(key) {
        const loc = path.join(testLoc, key + ".txt");
@ -244,7 +205,7 @@ fs.readdirSync(fixtureLoc).forEach(function(binName) {
        opts.inFiles[".babelrc"] = helper.readFile(babelrcLoc);
      }

-      it(testName, buildTest(binName, testName, opts), 20000);
+      it(testName, buildTest(binName, testName, opts));
    });
  });
 });
--- a/packages/babel-code-frame/package.json
+++ b/packages/babel-code-frame/package.json
@ -1,6 +1,6 @@
 {
  "name": "@babel/code-frame",
-  "version": "7.5.5",
+  "version": "7.0.0",
  "description": "Generate errors that contain a code frame that point to source locations.",
  "author": "Sebastian McKenzie <sebmck@gmail.com>",
  "homepage": "https://babeljs.io/",
--- a/packages/babel-code-frame/src/index.js
+++ b/packages/babel-code-frame/src/index.js
@ -76,7 +76,7 @@ function getMarkerLines(
      } else if (i === 0) {
        const sourceLength = source[lineNumber - 1].length;

-        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
+        markerLines[lineNumber] = [startColumn, sourceLength - startColumn];
      } else if (i === lineDiff) {
        markerLines[lineNumber] = [0, endColumn];
      } else {
@ -112,16 +112,15 @@ export function codeFrameColumns(
  const maybeHighlight = (chalkFn, string) => {
    return highlighted ? chalkFn(string) : string;
  };
+  if (highlighted) rawLines = highlight(rawLines, opts);
+
  const lines = rawLines.split(NEWLINE);
  const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
  const hasColumns = loc.start && typeof loc.start.column === "number";

  const numberMaxWidth = String(end).length;

-  const highlightedLines = highlighted ? highlight(rawLines, opts) : rawLines;
-
-  let frame = highlightedLines
-    .split(NEWLINE)
+  let frame = lines
    .slice(start, end)
    .map((line, index) => {
      const number = start + 1 + index;
--- a/packages/babel-code-frame/test/index.js
+++ b/packages/babel-code-frame/test/index.js
@ -102,45 +102,6 @@ describe("@babel/code-frame", function() {
    );
  });

-  test("opts.highlightCode with multiple columns and lines", function() {
-    // prettier-ignore
-    const rawLines = [
-      "function a(b, c) {", 
-      "  return b + c;", 
-      "}"
-    ].join("\n");
-
-    const result = codeFrameColumns(
-      rawLines,
-      {
-        start: {
-          line: 1,
-          column: 1,
-        },
-        end: {
-          line: 3,
-          column: 1,
-        },
-      },
-      {
-        highlightCode: true,
-        message: "Message about things",
-      },
-    );
-    const stripped = stripAnsi(result);
-    expect(stripped).toEqual(
-      // prettier-ignore
-      [
-        "> 1 | function a(b, c) {",
-        "    | ^^^^^^^^^^^^^^^^^^",
-        "> 2 |   return b + c;",
-        "    | ^^^^^^^^^^^^^^^",
-        "> 3 | }",
-        "    | ^ Message about things",
-      ].join('\n'),
-    );
-  });
-
  test("opts.linesAbove", function() {
    const rawLines = [
      "/**",
--- a/packages/babel-core/package.json
+++ b/packages/babel-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@babel/core",
-  "version": "7.7.2",
+  "version": "7.1.0",
  "description": "Babel compiler core.",
  "main": "lib/index.js",
  "author": "Sebastian McKenzie <sebmck@gmail.com>",
@ -33,22 +33,23 @@
    "./lib/transform-file.js": "./lib/transform-file-browser.js"
  },
  "dependencies": {
-    "@babel/code-frame": "^7.5.5",
-    "@babel/generator": "^7.7.2",
-    "@babel/helpers": "^7.7.0",
-    "@babel/parser": "^7.7.2",
-    "@babel/template": "^7.7.0",
-    "@babel/traverse": "^7.7.2",
-    "@babel/types": "^7.7.2",
-    "convert-source-map": "^1.7.0",
-    "debug": "^4.1.0",
-    "json5": "^2.1.0",
-    "lodash": "^4.17.13",
+    "@babel/code-frame": "^7.0.0",
+    "@babel/generator": "^7.0.0",
+    "@babel/helpers": "^7.1.0",
+    "@babel/parser": "^7.1.0",
+    "@babel/template": "^7.1.0",
+    "@babel/traverse": "^7.1.0",
+    "@babel/types": "^7.0.0",
+    "convert-source-map": "^1.1.0",
+    "debug": "^3.1.0",
+    "json5": "^0.5.0",
+    "lodash": "^4.17.10",
    "resolve": "^1.3.2",
    "semver": "^5.4.1",
    "source-map": "^0.5.0"
  },
  "devDependencies": {
-    "@babel/helper-transform-fixture-test-runner": "^7.6.4"
+    "@babel/helper-transform-fixture-test-runner": "^7.0.0",
+    "@babel/register": "^7.0.0"
  }
 }
--- a/packages/babel-core/src/config/caching.js
+++ b/packages/babel-core/src/config/caching.js
@ -54,7 +54,6 @@ function makeCachedFunction<
  ArgT,
  ResultT,
  SideChannel,
-  // $FlowIssue https://github.com/facebook/flow/issues/4528
  Cache: CacheMap<ArgT, ResultT, SideChannel>,
 >(
  callCache: Cache,
--- a/packages/babel-core/src/config/config-chain.js
+++ b/packages/babel-core/src/config/config-chain.js
@ -67,7 +67,7 @@ export function buildPresetChain(
  return {
    plugins: dedupDescriptors(chain.plugins),
    presets: dedupDescriptors(chain.presets),
-    options: chain.options.map(o => normalizeOptions(o)),
+    options: chain.options,
  };
 }

@ -155,7 +155,6 @@ export function buildRootChain(
  }

  let { babelrc, babelrcRoots } = opts;
-  let babelrcRootsDirectory = context.cwd;

  const configFileChain = emptyChain();
  if (configFile) {
@ -169,7 +168,6 @@ export function buildRootChain(
      babelrc = validatedFile.options.babelrc;
    }
    if (babelrcRoots === undefined) {
-      babelrcRootsDirectory = validatedFile.dirname;
      babelrcRoots = validatedFile.options.babelrcRoots;
    }

@ -187,7 +185,7 @@ export function buildRootChain(
  if (
    (babelrc === true || babelrc === undefined) &&
    pkgData &&
-    babelrcLoadEnabled(context, pkgData, babelrcRoots, babelrcRootsDirectory)
+    babelrcLoadEnabled(context, pkgData, babelrcRoots)
  ) {
    ({ ignore: ignoreFile, config: babelrcFile } = findRelativeConfig(
      pkgData,
@ -231,7 +229,6 @@ function babelrcLoadEnabled(
  context: ConfigContext,
  pkgData: FilePackageData,
  babelrcRoots: BabelrcSearch | void,
-  babelrcRootsDirectory: string,
 ): boolean {
  if (typeof babelrcRoots === "boolean") return babelrcRoots;

@ -246,9 +243,7 @@ function babelrcLoadEnabled(
  let babelrcPatterns = babelrcRoots;
  if (!Array.isArray(babelrcPatterns)) babelrcPatterns = [babelrcPatterns];
  babelrcPatterns = babelrcPatterns.map(pat => {
-    return typeof pat === "string"
-      ? path.resolve(babelrcRootsDirectory, pat)
-      : pat;
+    return typeof pat === "string" ? path.resolve(context.cwd, pat) : pat;
  });

  // Fast path to avoid having to match patterns if the babelrc is just
@ -258,21 +253,21 @@ function babelrcLoadEnabled(
  }

  return babelrcPatterns.some(pat => {
-    if (typeof pat === "string") {
-      pat = pathPatternToRegex(pat, babelrcRootsDirectory);
-    }
+    if (typeof pat === "string") pat = pathPatternToRegex(pat, context.cwd);

    return pkgData.directories.some(directory => {
-      return matchPattern(pat, babelrcRootsDirectory, directory, context);
+      return matchPattern(pat, context.cwd, directory, context);
    });
  });
 }

-const validateConfigFile = makeWeakCache((file: ConfigFile): ValidatedFile => ({
-  filepath: file.filepath,
-  dirname: file.dirname,
-  options: validate("configfile", file.options),
-}));
+const validateConfigFile = makeWeakCache(
+  (file: ConfigFile): ValidatedFile => ({
+    filepath: file.filepath,
+    dirname: file.dirname,
+    options: validate("configfile", file.options),
+  }),
+);

 const validateBabelrcFile = makeWeakCache(
  (file: ConfigFile): ValidatedFile => ({
@ -282,11 +277,13 @@ const validateBabelrcFile = makeWeakCache(
  }),
 );

-const validateExtendFile = makeWeakCache((file: ConfigFile): ValidatedFile => ({
-  filepath: file.filepath,
-  dirname: file.dirname,
-  options: validate("extendsfile", file.options),
-}));
+const validateExtendFile = makeWeakCache(
+  (file: ConfigFile): ValidatedFile => ({
+    filepath: file.filepath,
+    dirname: file.dirname,
+    options: validate("extendsfile", file.options),
+  }),
+);

 /**
 * Build a config chain for just the programmatic options passed into Babel.
@ -545,7 +542,7 @@ function normalizeOptions(opts: ValidatedOptions): ValidatedOptions {

  // "sourceMap" is just aliased to sourceMap, so copy it over as
  // we merge the options together.
-  if (Object.prototype.hasOwnProperty.call(options, "sourceMap")) {
+  if (options.hasOwnProperty("sourceMap")) {
    options.sourceMaps = options.sourceMap;
    delete options.sourceMap;
  }
--- a/packages/babel-core/src/config/config-descriptors.js
+++ b/packages/babel-core/src/config/config-descriptors.js
@ -345,7 +345,6 @@ function assertNoDuplicates(items: Array<UnloadedDescriptor>): void {
    }

    if (nameMap.has(item.name)) {
-      const conflicts = items.filter(i => i.value === item.value);
      throw new Error(
        [
          `Duplicate plugin/preset detected.`,
@ -356,9 +355,6 @@ function assertNoDuplicates(items: Array<UnloadedDescriptor>): void {
          `    ['some-plugin', {}],`,
          `    ['some-plugin', {}, 'some unique name'],`,
          `  ]`,
-          ``,
-          `Duplicates detected are:`,
-          `${JSON.stringify(conflicts, null, 2)}`,
        ].join("\n"),
      );
    }
--- a/packages/babel-core/src/config/files/configuration.js
+++ b/packages/babel-core/src/config/files/configuration.js
@ -10,7 +10,7 @@ import {
  makeWeakCache,
  type CacheConfigurator,
 } from "../caching";
-import makeAPI, { type PluginAPI } from "../helpers/config-api";
+import makeAPI from "../helpers/config-api";
 import { makeStaticFileCache } from "./utils";
 import pathPatternToRegex from "../pattern-to-regex";
 import type { FilePackageData, RelativeConfig, ConfigFile } from "./types";
@ -18,22 +18,18 @@ import type { CallerMetadata } from "../validation/options";

 const debug = buildDebug("babel:config:loading:files:configuration");

-const ROOT_CONFIG_FILENAMES = [
-  "babel.config.js",
-  "babel.config.cjs",
-  "babel.config.json",
-];
-const RELATIVE_CONFIG_FILENAMES = [".babelrc", ".babelrc.js", ".babelrc.cjs"];
+const BABEL_CONFIG_JS_FILENAME = "babel.config.js";

+const BABELRC_FILENAME = ".babelrc";
+const BABELRC_JS_FILENAME = ".babelrc.js";
 const BABELIGNORE_FILENAME = ".babelignore";

 export function findConfigUpwards(rootDir: string): string | null {
  let dirname = rootDir;
  while (true) {
-    const configFileFound = ROOT_CONFIG_FILENAMES.some(filename =>
-      fs.existsSync(path.join(dirname, filename)),
-    );
-    if (configFileFound) return dirname;
+    if (fs.existsSync(path.join(dirname, BABEL_CONFIG_JS_FILENAME))) {
+      return dirname;
+    }

    const nextDir = path.dirname(dirname);
    if (dirname === nextDir) break;
@ -55,15 +51,45 @@ export function findRelativeConfig(

  for (const loc of packageData.directories) {
    if (!config) {
-      config = loadOneConfig(
-        RELATIVE_CONFIG_FILENAMES,
-        loc,
-        envName,
-        caller,
+      config = [BABELRC_FILENAME, BABELRC_JS_FILENAME].reduce(
+        (previousConfig: ConfigFile | null, name) => {
+          const filepath = path.join(loc, name);
+          const config = readConfig(filepath, envName, caller);
+
+          if (config && previousConfig) {
+            throw new Error(
+              `Multiple configuration files found. Please remove one:\n` +
+                ` - ${path.basename(previousConfig.filepath)}\n` +
+                ` - ${name}\n` +
+                `from ${loc}`,
+            );
+          }
+
+          return config || previousConfig;
+        },
+        null,
+      );
+
+      const pkgConfig =
        packageData.pkg && packageData.pkg.dirname === loc
          ? packageToBabelConfig(packageData.pkg)
-          : null,
-      );
+          : null;
+
+      if (pkgConfig) {
+        if (config) {
+          throw new Error(
+            `Multiple configuration files found. Please remove one:\n` +
+              ` - ${path.basename(pkgConfig.filepath)}#babel\n` +
+              ` - ${path.basename(config.filepath)}\n` +
+              `from ${loc}`,
+          );
+        }
+        config = pkgConfig;
+      }
+
+      if (config) {
+        debug("Found configuration %o from %o.", config.filepath, dirname);
+      }
    }

    if (!ignore) {
@ -84,36 +110,13 @@ export function findRootConfig(
  envName: string,
  caller: CallerMetadata | void,
 ): ConfigFile | null {
-  return loadOneConfig(ROOT_CONFIG_FILENAMES, dirname, envName, caller);
-}
+  const filepath = path.resolve(dirname, BABEL_CONFIG_JS_FILENAME);

-function loadOneConfig(
-  names: string[],
-  dirname: string,
-  envName: string,
-  caller: CallerMetadata | void,
-  previousConfig?: ConfigFile | null = null,
-): ConfigFile | null {
-  const config = names.reduce((previousConfig: ConfigFile | null, name) => {
-    const filepath = path.resolve(dirname, name);
-    const config = readConfig(filepath, envName, caller);
-
-    if (config && previousConfig) {
-      throw new Error(
-        `Multiple configuration files found. Please remove one:\n` +
-          ` - ${path.basename(previousConfig.filepath)}\n` +
-          ` - ${name}\n` +
-          `from ${dirname}`,
-      );
-    }
-
-    return config || previousConfig;
-  }, previousConfig);
-
-  if (config) {
-    debug("Found configuration %o from %o.", config.filepath, dirname);
+  const conf = readConfig(filepath, envName, caller);
+  if (conf) {
+    debug("Found root config %o in $o.", BABEL_CONFIG_JS_FILENAME, dirname);
  }
-  return config;
+  return conf;
 }

 export function loadConfig(
@ -129,7 +132,7 @@ export function loadConfig(
    throw new Error(`Config file ${filepath} contains no configuration data`);
  }

-  debug("Loaded config %o from %o.", name, dirname);
+  debug("Loaded config %o from $o.", name, dirname);
  return conf;
 }

@ -138,8 +141,7 @@ export function loadConfig(
 * throw if there are parsing errors while loading a config.
 */
 function readConfig(filepath, envName, caller): ConfigFile | null {
-  const ext = path.extname(filepath);
-  return ext === ".js" || ext === ".cjs"
+  return path.extname(filepath) === ".js"
    ? readConfigJS(filepath, { envName, caller })
    : readConfigJSON5(filepath);
 }
@ -148,7 +150,7 @@ const LOADING_CONFIGS = new Set();

 const readConfigJS = makeStrongCache(
  (
-    filepath: string,
+    filepath,
    cache: CacheConfigurator<{
      envName: string,
      caller: CallerMetadata | void,
@ -191,7 +193,7 @@ const readConfigJS = makeStrongCache(
    }

    if (typeof options === "function") {
-      options = ((options: any): (api: PluginAPI) => {})(makeAPI(cache));
+      options = options(makeAPI(cache));

      if (!cache.configured()) throwConfigError();
    }
--- a/packages/babel-core/src/config/files/plugins.js
+++ b/packages/babel-core/src/config/files/plugins.js
@ -132,7 +132,7 @@ function resolveStandardizedName(
    } catch (e2) {}

    if (resolvedOppositeType) {
-      e.message += `\n- Did you accidentally pass a ${oppositeType} as a ${type}?`;
+      e.message += `\n- Did you accidentally pass a ${type} as a ${oppositeType}?`;
    }

    throw e;
--- a/packages/babel-core/src/config/full.js
+++ b/packages/babel-core/src/config/full.js
@ -18,7 +18,6 @@ import { validatePluginObject } from "./validation/plugins";
 import makeAPI from "./helpers/config-api";

 import loadPrivatePartialConfig from "./partial";
-import type { ValidatedOptions } from "./validation/options";

 type LoadedDescriptor = {
  value: {},
@ -203,7 +202,7 @@ const loadDescriptor = makeWeakCache(
    if (typeof item.then === "function") {
      throw new Error(
        `You appear to be using an async plugin, ` +
-          `which your current version of Babel does not support. ` +
+          `which your current version of Babel does not support.` +
          `If you're using a published plugin, ` +
          `you may need to upgrade your @babel/core version.`,
      );
@ -279,42 +278,6 @@ const instantiatePlugin = makeWeakCache(
  },
 );

-const validateIfOptionNeedsFilename = (
-  options: ValidatedOptions,
-  descriptor: UnloadedDescriptor,
-): void => {
-  if (options.test || options.include || options.exclude) {
-    const formattedPresetName = descriptor.name
-      ? `"${descriptor.name}"`
-      : "/* your preset */";
-    throw new Error(
-      [
-        `Preset ${formattedPresetName} requires a filename to be set when babel is called directly,`,
-        `\`\`\``,
-        `babel.transform(code, { filename: 'file.ts', presets: [${formattedPresetName}] });`,
-        `\`\`\``,
-        `See https://babeljs.io/docs/en/options#filename for more information.`,
-      ].join("\n"),
-    );
-  }
-};
-
-const validatePreset = (
-  preset: PresetInstance,
-  context: ConfigContext,
-  descriptor: UnloadedDescriptor,
-): void => {
-  if (!context.filename) {
-    const { options } = preset;
-    validateIfOptionNeedsFilename(options, descriptor);
-    if (options.overrides) {
-      options.overrides.forEach(overrideOptions =>
-        validateIfOptionNeedsFilename(overrideOptions, descriptor),
-      );
-    }
-  }
-};
-
 /**
 * Generate a config object that will act as the root of a new nested config.
 */
@ -322,9 +285,10 @@ const loadPresetDescriptor = (
  descriptor: UnloadedDescriptor,
  context: ConfigContext,
 ): ConfigChain | null => {
-  const preset = instantiatePreset(loadDescriptor(descriptor, context));
-  validatePreset(preset, context, descriptor);
-  return buildPresetChain(preset, context);
+  return buildPresetChain(
+    instantiatePreset(loadDescriptor(descriptor, context)),
+    context,
+  );
 };

 const instantiatePreset = makeWeakCache(
--- a/packages/babel-core/src/config/helpers/config-api.js
+++ b/packages/babel-core/src/config/helpers/config-api.js
@ -55,7 +55,6 @@ export default function makeAPI(
    async: () => false,
    caller,
    assertVersion,
-    tokTypes: undefined,
  };
 }

@ -70,7 +69,7 @@ function assertVersion(range: string | number): void {
    throw new Error("Expected string or integer value.");
  }

-  if (semver.satisfies(semver.coerce(coreVersion).raw, range)) return;
+  if (semver.satisfies(coreVersion, range)) return;

  const limit = Error.stackTraceLimit;

--- a/packages/babel-core/src/config/validation/option-assertions.js
+++ b/packages/babel-core/src/config/validation/option-assertions.js
@ -231,7 +231,7 @@ function assertIgnoreItem(loc: GeneralPath, value: mixed): IgnoreItem {
    throw new Error(
      `${msg(
        loc,
-      )} must be an array of string/Function/RegExp values, or undefined`,
+      )} must be an array of string/Funtion/RegExp values, or undefined`,
    );
  }
  return value;
@ -278,7 +278,7 @@ export function assertConfigFileSearch(
  ) {
    throw new Error(
      `${msg(loc)} must be a undefined, a boolean, a string, ` +
-        `got ${JSON.stringify((value: any))}`,
+        `got ${JSON.stringify(value)}`,
    );
  }

@ -302,7 +302,7 @@ export function assertBabelrcSearch(
  } else if (!checkValidTest(value)) {
    throw new Error(
      `${msg(loc)} must be a undefined, a boolean, a string/Function/RegExp ` +
-        `or an array of those, got ${JSON.stringify((value: any))}`,
+        `or an array of those, got ${JSON.stringify(value)}`,
    );
  }
  return (value: any);
@ -337,7 +337,7 @@ function assertPluginItem(loc: GeneralPath, value: mixed): PluginItem {
      if (
        opts !== undefined &&
        opts !== false &&
-        (typeof opts !== "object" || Array.isArray(opts) || opts === null)
+        (typeof opts !== "object" || Array.isArray(opts))
      ) {
        throw new Error(
          `${msg(access(loc, 1))} must be an object, false, or undefined`,
--- a/packages/babel-core/src/config/validation/options.js
+++ b/packages/babel-core/src/config/validation/options.js
@ -272,8 +272,7 @@ export type OptionsSource =
  | "configfile"
  | "babelrcfile"
  | "extendsfile"
-  | "preset"
-  | "plugin";
+  | "preset";

 type RootPath = $ReadOnly<{
  type: "root",
@ -351,7 +350,7 @@ function validateNested(loc: NestingPath, opts: {}) {
      NONPRESET_VALIDATORS[key] ||
      BABELRC_VALIDATORS[key] ||
      ROOT_VALIDATORS[key] ||
-      (throwUnknownError: Validator<void>);
+      throwUnknownError;

    validator(optLoc, opts[key]);
  });
--- a/packages/babel-core/src/config/validation/plugins.js
+++ b/packages/babel-core/src/config/validation/plugins.js
@ -84,19 +84,10 @@ export type PluginObject = {
 };

 export function validatePluginObject(obj: {}): PluginObject {
-  const rootPath: RootPath = {
-    type: "root",
-    source: "plugin",
-  };
  Object.keys(obj).forEach(key => {
    const validator = VALIDATORS[key];
-    const optLoc = {
-      type: "option",
-      name: key,
-      parent: rootPath,
-    };

-    if (validator) validator(optLoc, obj[key]);
+    if (validator) validator(key, obj[key]);
    else throw new Error(`.${key} is not a valid Plugin property`);
  });

--- a/packages/babel-core/src/index.js
+++ b/packages/babel-core/src/index.js
@ -10,8 +10,6 @@ export { version } from "../package.json";
 export { getEnv } from "./config/helpers/environment";

 export * as types from "@babel/types";
-export { tokTypes } from "@babel/parser";
-
 export { default as traverse } from "@babel/traverse";
 export { default as template } from "@babel/template";

--- a/packages/babel-core/src/transform-file-browser.js
+++ b/packages/babel-core/src/transform-file-browser.js
@ -1,29 +1,14 @@
 // @flow
+import type { FileResult } from "./transformation";

-// duplicated from transform-file so we do not have to import anything here
-type TransformFile = {
-  (filename: string, callback: Function): void,
-  (filename: string, opts: ?Object, callback: Function): void,
-};
-
-export const transformFile: TransformFile = (function transformFile(
-  filename,
-  opts,
-  callback,
+export default function transformFile(
+  filename: string,
+  opts?: Object = {},
+  callback: (?Error, FileResult | null) => void,
 ) {
  if (typeof opts === "function") {
    callback = opts;
  }

  callback(new Error("Transforming files is not supported in browsers"), null);
-}: Function);
-
-export function transformFileSync() {
-  throw new Error("Transforming files is not supported in browsers");
-}
-
-export function transformFileAsync() {
-  return Promise.reject(
-    new Error("Transforming files is not supported in browsers"),
-  );
 }
--- a/packages/babel-core/src/transform-file-sync-browser.js
+++ b/packages/babel-core/src/transform-file-sync-browser.js
@ -0,0 +1,5 @@
+// @flow
+
+export default function transformFileSync() {
+  throw new Error("Transforming files is not supported in browsers");
+}
--- a/packages/babel-core/src/transform-file.js
+++ b/packages/babel-core/src/transform-file.js
@ -9,14 +9,6 @@ import {
  type FileResultCallback,
 } from "./transformation";

-import typeof * as transformFileBrowserType from "./transform-file-browser";
-import typeof * as transformFileType from "./transform-file";
-
-// Kind of gross, but essentially asserting that the exports of this module are the same as the
-// exports of transform-file-browser, since this file may be replaced at bundle time with
-// transform-file-browser.
-((({}: any): $Exact<transformFileBrowserType>): $Exact<transformFileType>);
-
 type TransformFile = {
  (filename: string, callback: FileResultCallback): void,
  (filename: string, opts: ?InputOptions, callback: FileResultCallback): void,
--- a/packages/babel-core/src/transformation/file/file.js
+++ b/packages/babel-core/src/transformation/file/file.js
@ -19,17 +19,6 @@ const errorVisitor = {
  },
 };

-export type NodeLocation = {
-  loc?: {
-    end?: { line: number, column: number },
-    start: { line: number, column: number },
-  },
-  _loc?: {
-    end?: { line: number, column: number },
-    start: { line: number, column: number },
-  },
-};
-
 export default class File {
  _map: Map<any, any> = new Map();
  opts: Object;
@ -194,7 +183,7 @@ export default class File {
    // and this fails because a prerelease version can only satisfy a range
    // if it is a prerelease within the same major/minor/patch range.
    //
-    // Note: If this is found to have issues, please also revisit the logic in
+    // Note: If this is found to have issues, please also revist the logic in
    // transform-runtime's definitions.js file.
    if (semver.valid(versionRange)) versionRange = `^${versionRange}`;

@ -214,9 +203,6 @@ export default class File {
      if (res) return res;
    }

-    // make sure that the helper exists
-    helpers.ensure(name);
-
    const uid = (this.declarations[name] = this.scope.generateUidIdentifier(
      name,
    ));
@ -261,12 +247,17 @@ export default class File {
  }

  buildCodeFrameError(
-    node: ?NodeLocation,
+    node: ?{
+      loc?: { start: { line: number, column: number } },
+      _loc?: { start: { line: number, column: number } },
+    },
    msg: string,
    Error: typeof Error = SyntaxError,
  ): Error {
    let loc = node && (node.loc || node._loc);

+    msg = `${this.opts.filename}: ${msg}`;
+
    if (!loc && node) {
      const state = {
        loc: null,
@ -293,13 +284,6 @@ export default class File {
              line: loc.start.line,
              column: loc.start.column + 1,
            },
-            end:
-              loc.end && loc.start.line === loc.end.line
-                ? {
-                    line: loc.end.line,
-                    column: loc.end.column + 1,
-                  }
-                : undefined,
          },
          { highlightCode },
        );
--- a/packages/babel-core/src/transformation/file/generate.js
+++ b/packages/babel-core/src/transformation/file/generate.js
@ -1,7 +1,7 @@
 // @flow

 import type { PluginPasses } from "../../config";
-import convertSourceMap, { typeof SourceMap } from "convert-source-map";
+import convertSourceMap, { type SourceMap } from "convert-source-map";
 import generate from "@babel/generator";

 import type File from "./file";
@ -41,7 +41,7 @@ export default function generateCode(

    if (typeof result.then === "function") {
      throw new Error(
-        `You appear to be using an async codegen plugin, ` +
+        `You appear to be using an async parser plugin, ` +
          `which your current version of Babel does not support. ` +
          `If you're using a published plugin, ` +
          `you may need to upgrade your @babel/core version.`,
--- a/packages/babel-core/src/transformation/file/merge-map.js
+++ b/packages/babel-core/src/transformation/file/merge-map.js
@ -1,6 +1,6 @@
 // @flow

-import typeof { SourceMap } from "convert-source-map";
+import type { SourceMap } from "convert-source-map";
 import sourceMap from "source-map";

 export default function mergeSourceMap(
@ -94,7 +94,7 @@ export default function mergeSourceMap(
 }

 function makeMappingKey(item: { line: number, columnStart: number }) {
-  return `${item.line}/${item.columnStart}`;
+  return JSON.stringify([item.line, item.columnStart]);
 }

 function eachOverlappingGeneratedOutputRange(
--- a/packages/babel-core/src/transformation/index.js
+++ b/packages/babel-core/src/transformation/index.js
@ -1,6 +1,6 @@
 // @flow
 import traverse from "@babel/traverse";
-import typeof { SourceMap } from "convert-source-map";
+import type { SourceMap } from "convert-source-map";

 import type { ResolvedConfig, PluginPasses } from "../config";

@ -55,29 +55,11 @@ export function runSync(
    ast,
  );

-  const opts = file.opts;
-  try {
-    transformFile(file, config.passes);
-  } catch (e) {
-    e.message = `${opts.filename ?? "unknown"}: ${e.message}`;
-    if (!e.code) {
-      e.code = "BABEL_TRANSFORM_ERROR";
-    }
-    throw e;
-  }
+  transformFile(file, config.passes);

-  let outputCode, outputMap;
-  try {
-    if (opts.code !== false) {
-      ({ outputCode, outputMap } = generateCode(config.passes, file));
-    }
-  } catch (e) {
-    e.message = `${opts.filename ?? "unknown"}: ${e.message}`;
-    if (!e.code) {
-      e.code = "BABEL_GENERATE_ERROR";
-    }
-    throw e;
-  }
+  const opts = file.opts;
+  const { outputCode, outputMap } =
+    opts.code !== false ? generateCode(config.passes, file) : {};

  return {
    metadata: file.metadata,
@ -111,7 +93,7 @@ function transformFile(file: File, pluginPasses: PluginPasses): void {
        if (isThenable(result)) {
          throw new Error(
            `You appear to be using an plugin with an async .pre, ` +
-              `which your current version of Babel does not support. ` +
+              `which your current version of Babel does not support.` +
              `If you're using a published plugin, you may need to upgrade ` +
              `your @babel/core version.`,
          );
@ -135,7 +117,7 @@ function transformFile(file: File, pluginPasses: PluginPasses): void {
        if (isThenable(result)) {
          throw new Error(
            `You appear to be using an plugin with an async .post, ` +
-              `which your current version of Babel does not support. ` +
+              `which your current version of Babel does not support.` +
              `If you're using a published plugin, you may need to upgrade ` +
              `your @babel/core version.`,
          );
@ -149,7 +131,6 @@ function isThenable(val: mixed): boolean {
  return (
    !!val &&
    (typeof val === "object" || typeof val === "function") &&
-    !!val.then &&
    typeof val.then === "function"
  );
 }
--- a/packages/babel-core/src/transformation/normalize-file.js
+++ b/packages/babel-core/src/transformation/normalize-file.js
@ -27,6 +27,49 @@ export default function normalizeFile(
 ): File {
  code = `${code || ""}`;

+  let inputMap = null;
+  if (options.inputSourceMap !== false) {
+    // If an explicit object is passed in, it overrides the processing of
+    // source maps that may be in the file itself.
+    if (typeof options.inputSourceMap === "object") {
+      inputMap = convertSourceMap.fromObject(options.inputSourceMap);
+    }
+
+    if (!inputMap) {
+      try {
+        inputMap = convertSourceMap.fromSource(code);
+
+        if (inputMap) {
+          code = convertSourceMap.removeComments(code);
+        }
+      } catch (err) {
+        debug("discarding unknown inline input sourcemap", err);
+        code = convertSourceMap.removeComments(code);
+      }
+    }
+
+    if (!inputMap) {
+      if (typeof options.filename === "string") {
+        try {
+          inputMap = convertSourceMap.fromMapFileSource(
+            code,
+            path.dirname(options.filename),
+          );
+
+          if (inputMap) {
+            code = convertSourceMap.removeMapFileComments(code);
+          }
+        } catch (err) {
+          debug("discarding unknown file input sourcemap", err);
+          code = convertSourceMap.removeMapFileComments(code);
+        }
+      } else {
+        debug("discarding un-loadable file input sourcemap");
+        code = convertSourceMap.removeMapFileComments(code);
+      }
+    }
+  }
+
  if (ast) {
    if (ast.type === "Program") {
      ast = t.file(ast, [], []);
@ -41,43 +84,6 @@ export default function normalizeFile(
    ast = parser(pluginPasses, options, code);
  }

-  let inputMap = null;
-  if (options.inputSourceMap !== false) {
-    // If an explicit object is passed in, it overrides the processing of
-    // source maps that may be in the file itself.
-    if (typeof options.inputSourceMap === "object") {
-      inputMap = convertSourceMap.fromObject(options.inputSourceMap);
-    }
-
-    if (!inputMap) {
-      const lastComment = extractComments(INLINE_SOURCEMAP_REGEX, ast);
-      if (lastComment) {
-        try {
-          inputMap = convertSourceMap.fromComment(lastComment);
-        } catch (err) {
-          debug("discarding unknown inline input sourcemap", err);
-        }
-      }
-    }
-
-    if (!inputMap) {
-      const lastComment = extractComments(EXTERNAL_SOURCEMAP_REGEX, ast);
-      if (typeof options.filename === "string" && lastComment) {
-        try {
-          inputMap = convertSourceMap.fromMapFileComment(
-            // fromMapFileComment requires the whole comment block
-            `//${lastComment}`,
-            path.dirname(options.filename),
-          );
-        } catch (err) {
-          debug("discarding unknown file input sourcemap", err);
-        }
-      } else if (lastComment) {
-        debug("discarding un-loadable file input sourcemap");
-      }
-    }
-  }
-
  return new File(options, {
    code,
    ast,
@ -108,7 +114,7 @@ function parser(
    } else if (results.length === 1) {
      if (typeof results[0].then === "function") {
        throw new Error(
-          `You appear to be using an async parser plugin, ` +
+          `You appear to be using an async codegen plugin, ` +
            `which your current version of Babel does not support. ` +
            `If you're using a published plugin, you may need to upgrade ` +
            `your @babel/core version.`,
@ -122,7 +128,6 @@ function parser(
      err.message +=
        "\nConsider renaming the file to '.mjs', or setting sourceType:module " +
        "or sourceType:unambiguous in your Babel config for this file.";
-      // err.code will be changed to BABEL_PARSE_ERROR later.
    }

    const { loc, missingPlugin } = err;
@ -151,48 +156,3 @@ function parser(
    throw err;
  }
 }
-
-// These regexps are copied from the convert-source-map package,
-// but without // or /* at the beginning of the comment.
-
-// eslint-disable-next-line max-len
-const INLINE_SOURCEMAP_REGEX = /^[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/;
-const EXTERNAL_SOURCEMAP_REGEX = /^[@#][ \t]+sourceMappingURL=(?:[^\s'"`]+?)[ \t]*$/;
-
-function extractCommentsFromList(regex, comments, lastComment) {
-  if (comments) {
-    comments = comments.filter(({ value }) => {
-      if (regex.test(value)) {
-        lastComment = value;
-        return false;
-      }
-      return true;
-    });
-  }
-  return [comments, lastComment];
-}
-
-function extractComments(regex, ast) {
-  let lastComment = null;
-  t.traverseFast(ast, node => {
-    // $FlowIgnore destructuring with expressions is not supported
-    [node.leadingComments, lastComment] = extractCommentsFromList(
-      regex,
-      node.leadingComments,
-      lastComment,
-    );
-    // $FlowIgnore destructuring with expressions is not supported
-    [node.innerComments, lastComment] = extractCommentsFromList(
-      regex,
-      node.innerComments,
-      lastComment,
-    );
-    // $FlowIgnore destructuring with expressions is not supported
-    [node.trailingComments, lastComment] = extractCommentsFromList(
-      regex,
-      node.trailingComments,
-      lastComment,
-    );
-  });
-  return lastComment;
-}
--- a/packages/babel-core/src/transformation/plugin-pass.js
+++ b/packages/babel-core/src/transformation/plugin-pass.js
@ -1,7 +1,6 @@
 // @flow

 import type File from "./file/file";
-import type NodeLocation from "./file/file";

 export default class PluginPass {
  _map: Map<mixed, mixed> = new Map();
@ -48,7 +47,14 @@ export default class PluginPass {
    return this.file.getModuleName();
  }

-  buildCodeFrameError(node: ?NodeLocation, msg: string, Error?: typeof Error) {
+  buildCodeFrameError(
+    node: ?{
+      loc?: { start: { line: number, column: number } },
+      _loc?: { start: { line: number, column: number } },
+    },
+    msg: string,
+    Error?: typeof Error,
+  ) {
    return this.file.buildCodeFrameError(node, msg, Error);
  }
 }
--- a/packages/babel-core/src/transformation/util/missing-plugin-helper.js
+++ b/packages/babel-core/src/transformation/util/missing-plugin-helper.js
@ -1,6 +1,16 @@
 // @flow

 const pluginNameMap = {
+  asyncGenerators: {
+    syntax: {
+      name: "@babel/plugin-syntax-async-generators",
+      url: "https://git.io/vb4SY",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-async-generator-functions",
+      url: "https://git.io/vb4yp",
+    },
+  },
  classProperties: {
    syntax: {
      name: "@babel/plugin-syntax-class-properties",
@ -133,6 +143,26 @@ const pluginNameMap = {
      url: "https://git.io/vb4yS",
    },
  },
+  objectRestSpread: {
+    syntax: {
+      name: "@babel/plugin-syntax-object-rest-spread",
+      url: "https://git.io/vb4y5",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-object-rest-spread",
+      url: "https://git.io/vb4Ss",
+    },
+  },
+  optionalCatchBinding: {
+    syntax: {
+      name: "@babel/plugin-syntax-optional-catch-binding",
+      url: "https://git.io/vb4Sn",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-optional-catch-binding",
+      url: "https://git.io/vb4SI",
+    },
+  },
  optionalChaining: {
    syntax: {
      name: "@babel/plugin-syntax-optional-chaining",
@ -173,41 +203,6 @@ const pluginNameMap = {
      url: "https://git.io/vb4Sm",
    },
  },
-
-  // TODO: This plugins are now supported by default by @babel/parser: they can
-  // be removed from this list. Although removing them isn't a breaking change,
-  // it's better to keep a nice error message for users using older versions of
-  // the parser. They can be removed in Babel 8.
-  asyncGenerators: {
-    syntax: {
-      name: "@babel/plugin-syntax-async-generators",
-      url: "https://git.io/vb4SY",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-async-generator-functions",
-      url: "https://git.io/vb4yp",
-    },
-  },
-  objectRestSpread: {
-    syntax: {
-      name: "@babel/plugin-syntax-object-rest-spread",
-      url: "https://git.io/vb4y5",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-object-rest-spread",
-      url: "https://git.io/vb4Ss",
-    },
-  },
-  optionalCatchBinding: {
-    syntax: {
-      name: "@babel/plugin-syntax-optional-catch-binding",
-      url: "https://git.io/vb4Sn",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-optional-catch-binding",
-      url: "https://git.io/vb4SI",
-    },
-  },
 };

 const getNameURLCombination = ({ name, url }) => `${name} (${url})`;
--- a/packages/babel-core/test/api.js
+++ b/packages/babel-core/test/api.js
@ -154,14 +154,6 @@ describe("api", function() {
    );
  });

-  it("exposes types", function() {
-    expect(babel.types).toBeDefined();
-  });
-
-  it("exposes the parser's token types", function() {
-    expect(babel.tokTypes).toBeDefined();
-  });
-
  it("transformFile", function(done) {
    const options = {
      babelrc: false,
@ -777,10 +769,10 @@ describe("api", function() {
        options,
        function(err) {
          expect(err.message).toMatch(
-            "Support for the experimental syntax 'logicalAssignment' isn't currently enabled (1:3):",
+            "Support for the experimental syntax 'asyncGenerators' isn't currently enabled (1:15):",
          );
          expect(err.message).toMatch(
-            "Add @babel/plugin-proposal-logical-assignment-operators (https://git.io/vAlRe) to the " +
+            "Add @babel/plugin-proposal-async-generator-functions (https://git.io/vb4yp) to the " +
              "'plugins' section of your Babel config to enable transformation.",
          );
          done();
@ -788,28 +780,4 @@ describe("api", function() {
      );
    });
  });
-
-  describe("missing helpers", function() {
-    it("should always throw", function() {
-      expect(() =>
-        babel.transformSync(``, {
-          configFile: false,
-          plugins: [
-            function() {
-              return {
-                visitor: {
-                  Program(path) {
-                    try {
-                      path.pushContainer("body", this.addHelper("fooBar"));
-                    } catch {}
-                    path.pushContainer("body", this.addHelper("fooBar"));
-                  },
-                },
-              };
-            },
-          ],
-        }),
-      ).toThrow();
-    });
-  });
 });
--- a/packages/babel-register/test/browserify.js
+++ b/packages/babel-register/test/browserify.js
--- a/packages/babel-core/test/config-chain.js
+++ b/packages/babel-core/test/config-chain.js
@ -1,44 +1,7 @@
 import fs from "fs";
-import os from "os";
 import path from "path";
-import escapeRegExp from "lodash/escapeRegExp";
 import { loadOptions as loadOptionsOrig } from "../lib";

-// TODO: In Babel 8, we can directly uses fs.promises which is supported by
-// node 8+
-const pfs =
-  fs.promises ??
-  new Proxy(fs, {
-    get(target, name) {
-      if (name === "copyFile") {
-        // fs.copyFile is only supported since node 8.5
-        // https://stackoverflow.com/a/30405105/2359289
-        return function copyFile(source, target) {
-          const rd = fs.createReadStream(source);
-          const wr = fs.createWriteStream(target);
-          return new Promise(function(resolve, reject) {
-            rd.on("error", reject);
-            wr.on("error", reject);
-            wr.on("finish", resolve);
-            rd.pipe(wr);
-          }).catch(function(error) {
-            rd.destroy();
-            wr.end();
-            throw error;
-          });
-        };
-      }
-
-      return (...args) =>
-        new Promise((resolve, reject) =>
-          target[name](...args, (error, result) => {
-            if (error) reject(error);
-            else resolve(result);
-          }),
-        );
-    },
-  });
-
 function fixture(...args) {
  return path.join(__dirname, "fixtures", "config", ...args);
 }
@ -50,24 +13,6 @@ function loadOptions(opts) {
  });
 }

-function pairs(items) {
-  const pairs = [];
-  for (let i = 0; i < items.length - 1; i++) {
-    for (let j = i + 1; j < items.length; j++) {
-      pairs.push([items[i], items[j]]);
-    }
-  }
-  return pairs;
-}
-
-async function getTemp(name) {
-  const cwd = await pfs.mkdtemp(os.tmpdir() + path.sep + name);
-  const tmp = name => path.join(cwd, name);
-  const config = name =>
-    pfs.copyFile(fixture("config-files-templates", name), tmp(name));
-  return { cwd, tmp, config };
-}
-
 describe("buildConfigChain", function() {
  describe("test", () => {
    describe("single", () => {
@ -88,7 +33,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          test: new RegExp(escapeRegExp(fixture("nonexistant-fake"))),
+          test: new RegExp(fixture("nonexistant-fake")),
          comments: true,
        });

@ -124,7 +69,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          test: new RegExp(escapeRegExp(fixture("nonexistant-unknown"))),
+          test: new RegExp(fixture("nonexistant-unknown")),
          comments: true,
        });

@ -162,7 +107,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          test: [new RegExp(escapeRegExp(fixture("nonexistant-fake")))],
+          test: [new RegExp(fixture("nonexistant-fake"))],
          comments: true,
        });

@ -198,7 +143,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          test: [new RegExp(escapeRegExp(fixture("nonexistant-unknown")))],
+          test: [new RegExp(fixture("nonexistant-unknown"))],
          comments: true,
        });

@ -238,7 +183,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          include: new RegExp(escapeRegExp(fixture("nonexistant-fake"))),
+          include: new RegExp(fixture("nonexistant-fake")),
          comments: true,
        });

@ -274,7 +219,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          include: new RegExp(escapeRegExp(fixture("nonexistant-unknown"))),
+          include: new RegExp(fixture("nonexistant-unknown")),
          comments: true,
        });

@ -312,7 +257,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          include: [new RegExp(escapeRegExp(fixture("nonexistant-fake")))],
+          include: [new RegExp(fixture("nonexistant-fake"))],
          comments: true,
        });

@ -348,7 +293,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          include: [new RegExp(escapeRegExp(fixture("nonexistant-unknown")))],
+          include: [new RegExp(fixture("nonexistant-unknown"))],
          comments: true,
        });

@ -388,7 +333,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          exclude: new RegExp(escapeRegExp(fixture("nonexistant-fake"))),
+          exclude: new RegExp(fixture("nonexistant-fake")),
          comments: true,
        });

@ -424,7 +369,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          exclude: new RegExp(escapeRegExp(fixture("nonexistant-unknown"))),
+          exclude: new RegExp(fixture("nonexistant-unknown")),
          comments: true,
        });

@ -462,7 +407,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          exclude: [new RegExp(escapeRegExp(fixture("nonexistant-fake")))],
+          exclude: [new RegExp(fixture("nonexistant-fake"))],
          comments: true,
        });

@ -498,7 +443,7 @@ describe("buildConfigChain", function() {
          cwd: fixture("nonexistant-fake"),
          filename: fixture("nonexistant-fake", "src.js"),
          babelrc: false,
-          exclude: [new RegExp(escapeRegExp(fixture("nonexistant-unknown")))],
+          exclude: [new RegExp(fixture("nonexistant-unknown"))],
          comments: true,
        });

@ -998,142 +943,111 @@ describe("buildConfigChain", function() {
      }
    });

-    describe("root", () => {
-      test.each(["babel.config.json", "babel.config.js", "babel.config.cjs"])(
-        "should load %s",
-        async name => {
-          const { cwd, tmp, config } = await getTemp(
-            `babel-test-load-config-${name}`,
-          );
-          const filename = tmp("src.js");
+    it("should load .babelrc", () => {
+      const filename = fixture("config-files", "babelrc", "src.js");

-          await config(name);
-
-          expect(
-            loadOptions({
-              filename,
-              cwd,
-            }),
-          ).toEqual({
-            ...getDefaults(),
-            filename,
-            cwd,
-            root: cwd,
-            comments: true,
-          });
-        },
-      );
-
-      test.each(
-        pairs(["babel.config.json", "babel.config.js", "babel.config.cjs"]),
-      )("should throw if both %s and %s are used", async (name1, name2) => {
-        const { cwd, tmp, config } = await getTemp(
-          `babel-test-dup-config-${name1}-${name2}`,
-        );
-
-        await Promise.all([config(name1), config(name2)]);
-
-        expect(() => loadOptions({ filename: tmp("src.js"), cwd })).toThrow(
-          /Multiple configuration files found/,
-        );
-      });
-    });
-
-    describe("relative", () => {
-      test.each(["package.json", ".babelrc", ".babelrc.js", ".babelrc.cjs"])(
-        "should load %s",
-        async name => {
-          const { cwd, tmp, config } = await getTemp(
-            `babel-test-load-config-${name}`,
-          );
-          const filename = tmp("src.js");
-
-          await config(name);
-
-          expect(
-            loadOptions({
-              filename,
-              cwd,
-            }),
-          ).toEqual({
-            ...getDefaults(),
-            filename,
-            cwd,
-            root: cwd,
-            comments: true,
-          });
-        },
-      );
-
-      it("should load .babelignore", () => {
-        const filename = fixture("config-files", "babelignore", "src.js");
-
-        expect(
-          loadOptions({ filename, cwd: path.dirname(filename) }),
-        ).toBeNull();
-      });
-
-      test.each(
-        pairs(["package.json", ".babelrc", ".babelrc.js", ".babelrc.cjs"]),
-      )("should throw if both %s and %s are used", async (name1, name2) => {
-        const { cwd, tmp, config } = await getTemp(
-          `babel-test-dup-config-${name1}-${name2}`,
-        );
-
-        await Promise.all([config(name1), config(name2)]);
-
-        expect(() => loadOptions({ filename: tmp("src.js"), cwd })).toThrow(
-          /Multiple configuration files found/,
-        );
-      });
-
-      it("should ignore package.json without a 'babel' property", () => {
-        const filename = fixture("config-files", "pkg-ignored", "src.js");
-
-        expect(loadOptions({ filename, cwd: path.dirname(filename) })).toEqual({
-          ...getDefaults(),
-          filename: filename,
+      expect(
+        loadOptions({
+          filename,
          cwd: path.dirname(filename),
-          root: path.dirname(filename),
-          comments: true,
-        });
-      });
-
-      test.each`
-        config            | dir                    | error
-        ${".babelrc"}     | ${"babelrc-error"}     | ${/Error while parsing config - /}
-        ${".babelrc.js"}  | ${"babelrc-js-error"}  | ${/Babelrc threw an error/}
-        ${".babelrc.cjs"} | ${"babelrc-cjs-error"} | ${/Babelrc threw an error/}
-        ${"package.json"} | ${"pkg-error"}         | ${/Error while parsing JSON - /}
-      `("should show helpful errors for $config", ({ dir, error }) => {
-        const filename = fixture("config-files", dir, "src.js");
-
-        expect(() =>
-          loadOptions({ filename, cwd: path.dirname(filename) }),
-        ).toThrow(error);
+        }),
+      ).toEqual({
+        ...getDefaults(),
+        filename: filename,
+        cwd: path.dirname(filename),
+        root: path.dirname(filename),
+        comments: true,
      });
    });

-    it("should throw when `test` presents but `filename` is not passed", () => {
-      expect(() => loadOptions({ test: /\.ts$/, plugins: [] })).toThrow(
-        /Configuration contains string\/RegExp pattern/,
-      );
+    it("should load .babelrc.js", () => {
+      const filename = fixture("config-files", "babelrc-js", "src.js");
+
+      expect(loadOptions({ filename, cwd: path.dirname(filename) })).toEqual({
+        ...getDefaults(),
+        filename: filename,
+        cwd: path.dirname(filename),
+        root: path.dirname(filename),
+        comments: true,
+      });
    });

-    it("should throw when `preset` requires `filename` but it was not passed", () => {
-      expect(() => {
-        loadOptions({
-          presets: [require("./fixtures/config-loading/preset4")],
-        });
-      }).toThrow(/Preset \/\* your preset \*\/ requires a filename/);
+    it("should load package.json#babel", () => {
+      const filename = fixture("config-files", "pkg", "src.js");
+
+      expect(loadOptions({ filename, cwd: path.dirname(filename) })).toEqual({
+        ...getDefaults(),
+        filename: filename,
+        cwd: path.dirname(filename),
+        root: path.dirname(filename),
+        comments: true,
+      });
    });

-    it("should throw when `preset.overrides` requires `filename` but it was not passed", () => {
-      expect(() => {
-        loadOptions({
-          presets: [require("./fixtures/config-loading/preset5")],
-        });
-      }).toThrow(/Preset \/\* your preset \*\/ requires a filename/);
+    it("should load .babelignore", () => {
+      const filename = fixture("config-files", "babelignore", "src.js");
+
+      expect(loadOptions({ filename, cwd: path.dirname(filename) })).toBeNull();
+    });
+
+    it("should throw if there are both .babelrc and .babelrc.js", () => {
+      const filename = fixture("config-files", "both-babelrc", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Multiple configuration files found/);
+    });
+
+    it("should throw if there are both .babelrc and package.json", () => {
+      const filename = fixture("config-files", "pkg-babelrc", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Multiple configuration files found/);
+    });
+
+    it("should throw if there are both .babelrc.js and package.json", () => {
+      const filename = fixture("config-files", "pkg-babelrc-js", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Multiple configuration files found/);
+    });
+
+    it("should ignore package.json without a 'babel' property", () => {
+      const filename = fixture("config-files", "pkg-ignored", "src.js");
+
+      expect(loadOptions({ filename, cwd: path.dirname(filename) })).toEqual({
+        ...getDefaults(),
+        filename: filename,
+        cwd: path.dirname(filename),
+        root: path.dirname(filename),
+        comments: true,
+      });
+    });
+
+    it("should show helpful errors for .babelrc", () => {
+      const filename = fixture("config-files", "babelrc-error", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Error while parsing config - /);
+    });
+
+    it("should show helpful errors for .babelrc.js", () => {
+      const filename = fixture("config-files", "babelrc-js-error", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Babelrc threw an error/);
+    });
+
+    it("should show helpful errors for package.json", () => {
+      const filename = fixture("config-files", "pkg-error", "src.js");
+
+      expect(() =>
+        loadOptions({ filename, cwd: path.dirname(filename) }),
+      ).toThrow(/Error while parsing JSON - /);
    });
  });
 });
--- a/packages/babel-core/test/config-loading.js
+++ b/packages/babel-core/test/config-loading.js
@ -322,21 +322,6 @@ describe("@babel/core config loading", () => {
        }
      }
    });
-
-    it("should thrown when plugin is not valid", () => {
-      const fooPlugin = {
-        inherits: "inhertis-should-not-be-string",
-      };
-      const opts = {
-        cwd: path.dirname(FILEPATH),
-        filename: FILEPATH,
-        plugins: [fooPlugin],
-      };
-
-      expect(() => loadConfig(opts)).toThrow(
-        /\.inherits must be a function, or undefined/,
-      );
-    });
  });

  describe("caller metadata", () => {
--- a/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js
+++ b/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js
@ -1 +1,4 @@
-a ||= 2;
+async function* agf() {
+  await 1;
+  yield 2;
+}
--- a/packages/babel-register/test/fixtures/browserify/register.js
+++ b/packages/babel-register/test/fixtures/browserify/register.js
--- a/packages/babel-core/test/fixtures/config-loading/preset4.js
+++ b/packages/babel-core/test/fixtures/config-loading/preset4.js
@ -1,6 +0,0 @@
-module.exports = function() {
-  return {
-    test: /\.ts$/,
-    plugins: []
-  }
-};
--- a/packages/babel-core/test/fixtures/config-loading/preset5.js
+++ b/packages/babel-core/test/fixtures/config-loading/preset5.js
@ -1,8 +0,0 @@
-module.exports = function() {
-  return {
-    overrides: [{
-      test: /\.ts$/,
-      plugins: []
-    }]
-  }
-};
--- a/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc
@ -1,3 +0,0 @@
-{
-  "comments": true
-}
--- a/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc.cjs
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc.cjs
@ -1,3 +0,0 @@
-module.exports = {
-  comments: true
-};
--- a/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc.js
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/.babelrc.js
@ -1,3 +0,0 @@
-module.exports = {
-  comments: true
-};
--- a/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.cjs
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.cjs
@ -1,3 +0,0 @@
-module.exports = {
-  comments: true
-};
--- a/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.js
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.js
@ -1,3 +0,0 @@
-module.exports = {
-  comments: true
-};
--- a/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.json
+++ b/packages/babel-core/test/fixtures/config/config-files-templates/babel.config.json
@ -1,3 +0,0 @@
-{
-  "comments": true
-}
--- a/packages/babel-core/test/fixtures/config/config-files/babelrc-cjs-error/.babelrc.cjs
+++ b/packages/babel-core/test/fixtures/config/config-files/babelrc-cjs-error/.babelrc.cjs
@ -1,3 +0,0 @@
-module.exports = function() {
-  throw new Error("Babelrc threw an error");
-};
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`SyntaxError: <CWD>\test.js: Unexpected token, expected ";" (2:10)`