v7.0.0-rc.2

Usage of a `finally` instance method should trigger import of the `es7.promise.finally` polyfill, but it doesn't. This PR adds the missing definition and a test.

.eslintignore

@@ -4,8 +4,9 @@
 package.json
 lerna.json
 packages/babel-runtime
-!packages/babel-runtime/scripts
-!packages/babel-runtime/core-js.js
+!packages/babel-plugin-transform-runtime/scripts
+!packages/babel-runtime-corejs2/core-js.js
+packages/babel-runtime-corejs2
 packages/*/node_modules
 packages/*/lib
 packages/*/dist

.flowconfig

@@ -5,6 +5,7 @@
 .*/codemods/.*/lib
 .*/codemods/.*/test
 .*/node_modules/conventional-changelog-core/
+.*/node_modules/module-deps/
 
 [include]
 packages/*/src

.gitignore

@@ -12,24 +12,27 @@ coverage
 dist
 /.package.json
 package-lock.json
-/packages/babel-runtime/core-js/**/*.js
-!/packages/babel-runtime/core-js/map.js
+
 /packages/babel-runtime/helpers/*.js
 !/packages/babel-runtime/helpers/toArray.js
 !/packages/babel-runtime/helpers/iterableToArray.js
 !/packages/babel-runtime/helpers/temporalRef.js
-/packages/babel-runtime/helpers/builtin/*.js
-!/packages/babel-runtime/helpers/builtin/toArray.js
-!/packages/babel-runtime/helpers/builtin/iterableToArray.js
-!/packages/babel-runtime/helpers/builtin/temporalRef.js
-/packages/babel-runtime/helpers/builtin/es6/*.js
-!/packages/babel-runtime/helpers/builtin/es6/toArray.js
-!/packages/babel-runtime/helpers/builtin/es6/iterableToArray.js
-!/packages/babel-runtime/helpers/builtin/es6/temporalRef.js
-/packages/babel-runtime/helpers/es6/*.js
-!/packages/babel-runtime/helpers/es6/toArray.js
-!/packages/babel-runtime/helpers/es6/iterableToArray.js
-!/packages/babel-runtime/helpers/es6/temporalRef.js
+/packages/babel-runtime/helpers/esm/*.js
+!/packages/babel-runtime/helpers/esm/toArray.js
+!/packages/babel-runtime/helpers/esm/iterableToArray.js
+!/packages/babel-runtime/helpers/esm/temporalRef.js
+
+/packages/babel-runtime-corejs2/helpers/*.js
+!/packages/babel-runtime-corejs2/helpers/toArray.js
+!/packages/babel-runtime-corejs2/helpers/iterableToArray.js
+!/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/temporalRef.js
+/packages/babel-runtime-corejs2/core-js/**/*.js
+!/packages/babel-runtime-corejs2/core-js/map.js
+
 /packages/babel-register/test/.babel
 /packages/babel-cli/test/tmp
 /packages/babel-node/test/tmp

CHANGELOG.md

@@ -15,6 +15,68 @@ See [CHANGELOG - v4-v6](/.github/CHANGELOG-v4-v6.md) for the v4.x-v6.x changelog
 See [CHANGELOG - 6to5](/.github/CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 See [Babylon's CHANGELOG](packages/babylon/CHANGELOG.md) for the Babylon pre-7.0.0-beta.29 version changelog.
 
+## v7.0.0-beta.54 (2018-07-16)
+
+> Regarding https://github.com/babel/babel/issues/8184, we aren't using `micromatch` for paths, just basic `*/**` substitution now. For anything more complicated we will recommend using a regex/`.js` config.
+> Fixed a bug in the stage presets (https://github.com/babel/babel/issues/8307), so we just removed the requirements for setting options in the meantime for ease of use. We are removing the Stage presets next release. https://github.com/babel/babel/pull/8293
+
+#### :boom: Breaking Change
+* `babel-core`, `babel-register`, `babel-traverse`
+  * [#8327](https://github.com/babel/babel/pull/8327) Treat string ignore/only/test/include/exclude values as paths with only basic pattern matching. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :bug: Bug Fix
+* `babel-core`, `babel-register`, `babel-traverse`
+  * [#8327](https://github.com/babel/babel/pull/8327) Treat string ignore/only/test/include/exclude values as paths with only basic pattern matching. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-preset-stage-0`, `babel-preset-stage-1`
+  * [#8317](https://github.com/babel/babel/pull/8317) Fix stage-0/1 import of pipeline proposals array. ([@mAAdhaTTah](https://github.com/mAAdhaTTah))
+* `babel-helper-module-transforms`, `babel-plugin-transform-modules-commonjs`
+  * [#8316](https://github.com/babel/babel/pull/8316) Ensure that the wildcard interop is used with re-export + default.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-core`
+  * [#8315](https://github.com/babel/babel/pull/8315) Remove option-filtering options from the final options results.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :memo: Documentation
+* [#8320](https://github.com/babel/babel/pull/8320) Add link to audio version of song. ([@rugk](https://github.com/rugk))
+
+## v7.0.0-beta.53 (2018-07-11)
+
+- Fix for regression with paths on windows due to micromatch upgrade, remove yearly presets (not published)
+- (There was an issue with the Stage presets in this release, but it is also deprecated) 
+
+#### :boom: Breaking Change
+* `babel-*`
+  * [#8274](https://github.com/babel/babel/pull/8274) Remove yearly presets from repo. ([@hzoo](https://github.com/hzoo))
+
+#### :rocket: New Feature
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-typescript`, `babel-types`
+  * [#7799](https://github.com/babel/babel/pull/7799) TypeScript: Support type arguments on JSX opening and self-closing tags. ([@andy-ms](https://github.com/andy-ms))
+* `babel-parser`
+  * [#8291](https://github.com/babel/babel/pull/8291) Support pipeline proposal flag in  `@babel/parser`. ([@mAAdhaTTah](https://github.com/mAAdhaTTah))
+* `babel-plugin-proposal-object-rest-spread`
+  * [#8264](https://github.com/babel/babel/pull/8264) Remove unused bindings when excluding keys with rest in loose mode. ([@Andarist](https://github.com/Andarist))
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-destructuring`, `babel-preset-env`
+  * [#8261](https://github.com/babel/babel/pull/8261) Introduce objectWithoutPropertiesLoose helper. ([@Andarist](https://github.com/Andarist))
+
+#### :bug: Bug Fix
+* `babel-core`
+  * [#8281](https://github.com/babel/babel/pull/8281) Revert micromatch upgrade (regression) [skip ci]. ([@hzoo](https://github.com/hzoo))
+* `babel-types`
+  * [#8165](https://github.com/babel/babel/pull/8165) [babel-types] Fix isNodesEquivalent() behavior for TemplateElements. ([@timkendrick](https://github.com/timkendrick))
+
+#### :nail_care: Polish
+* `babel-plugin-syntax-pipeline-operator`, `babel-preset-stage-0`, `babel-preset-stage-1`
+  * [#8279](https://github.com/babel/babel/pull/8279) Improve error messages around pipeline option. ([@mAAdhaTTah](https://github.com/mAAdhaTTah))
+
+#### :memo: Documentation
+* [#8286](https://github.com/babel/babel/pull/8286) Move v4-v6 changelog to another file and all prerelease 7.0 logs [ski…. ([@hzoo](https://github.com/hzoo))
+
+#### :house: Internal
+* `babel-preset-env`
+  * [#8299](https://github.com/babel/babel/pull/8299) Make env preset build-data scripts reproducible. ([@rtsao](https://github.com/rtsao))
+* `babel-plugin-proposal-object-rest-spread`
+  * [#8287](https://github.com/babel/babel/pull/8287) Fixed fixture tests after merge. ([@Andarist](https://github.com/Andarist))
+* Other
+  * [#8187](https://github.com/babel/babel/pull/8187) Invoke Jest main file directly. ([@ishitatsuyuki](https://github.com/ishitatsuyuki))
+
 ## v7.0.0-beta.52 (2018-07-06)
 
 Deprecating the yearly/stage presets in v7 (will remove next beta). Ran `npm deprecate` on `@babel/preset-es2015`, `@babel/preset-es2016`, `@babel/preset-es2017`, `@babel/preset-stage-0`, `@babel/preset-stage-1`, `@babel/preset-stage-2`, `@babel/preset-stage-3` only for versions `>v7.0.0-beta.52`. This means this will only break your build if you are using `^` in Babel v7 beta (which we have recommended against each release). (It is unfortunate that the default behavior of npm is to use `^` when using `npm install` though; haven't made an RFC for it yet).

CODE_OF_CONDUCT.md

@@ -3,7 +3,7 @@
 ## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
+contributors and maintainers pledge to make participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, gender identity and expression, level of experience,
 nationality, personal appearance, race, religion, or sexual identity and

CONTRIBUTING.md

@@ -186,7 +186,7 @@ For example, in [`@babel/plugin-transform-exponentiation-operator/test`](https:/
    - If you need to expect an error, you can ignore creating the `output.js` file and pass a new `throws` key to the `options.json` that contains the error string that is created.
    - The second and preferred type is a test that actually evaluates the produced code and asserts that certain properties are true or false. We do this by creating an [`exec.js`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/comprehensive/exec.js) file.
 
-In a fixture test, you simply write out the code you want transformed in `input.js`.
+In a fixture test, you simply write out the code you want to transform in `input.js`.
 
 ```js
 // input.js
@@ -230,7 +230,7 @@ If the test requires a minimum Node version, you can add `minNodeVersion` (must
 
 Writing tests for the babel parser is very
 similar to the other packages.
-Inside the `packages/babel-parser/tests/fixtures` folder are categories/groupings of test fixtures (es2015, flow,
+Inside the `packages/babel-parser/test/fixtures` folder are categories/groupings of test fixtures (es2015, flow,
 etc.). To add a test, create a folder under one of these groupings (or create a new one) with a
 descriptive name, and add the following:
 

Makefile

@@ -1,5 +1,5 @@
 MAKEFLAGS = -j1
-FLOW_COMMIT = 395e045c18d537fcbbc552a96ef2cdcd70b4ab52
+FLOW_COMMIT = bea8b83f50f597454941d2a7ecef6e93a881e576
 TEST262_COMMIT = f90a52b39609a620c0854e0bd0b3a906c930fd17
 
 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
@@ -31,7 +31,7 @@ build-preset-env-standalone:
 build-dist: build
 	cd packages/babel-polyfill; \
 	scripts/build-dist.sh
-	cd packages/babel-runtime; \
+	cd packages/babel-plugin-transform-runtime; \
 	node scripts/build-dist.js
 
 watch: clean clean-lib
@@ -108,7 +108,8 @@ publish:
 	git pull --rebase
 	make clean-lib
 	rm -rf packages/babel-runtime/helpers
-	rm -rf packages/babel-runtime/core-js
+	rm -rf packages/babel-runtime-corejs2/helpers
+	rm -rf packages/babel-runtime-corejs2/core-js
 	BABEL_ENV=production make build-dist
 	make test
 	# not using lerna independent mode atm, so only update packages that have changed since we use ^
@@ -120,7 +121,7 @@ bootstrap: clean-all
 	yarn --ignore-engines
 	./node_modules/.bin/lerna bootstrap -- --ignore-engines
 	make build
-	cd packages/babel-runtime; \
+	cd packages/babel-plugin-transform-runtime; \
 	node scripts/build-dist.js
 
 clean-lib:

README.md

@@ -72,6 +72,7 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 
 <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>
+<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>
 <p><a href="https://twitter.com/mikesherov">Mike Sherov</a></p>
 
 ## Intro
@@ -107,7 +108,7 @@ For questions and support please visit join our [Slack Community](https://slack.
 
 ### 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). Tweet us your recordings!
+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!
 
 ### Where are the docs?
 

SONG.md

@@ -1,5 +1,7 @@
 ## Hallelujah—In Praise of Babel
 
+➤ [🎶 Audio version here!](https://youtu.be/40abpedBKK8)
+
 I heard there was a clever trick  
 That rewrote all your JavaScript  
 But you don’t really care for magic, do you  

babel.config.js

@@ -13,13 +13,18 @@ module.exports = function(api) {
 
   let convertESM = true;
   let ignoreLib = true;
+  let includeRuntime = false;
 
   switch (env) {
     // Configs used during bundling builds.
     case "babel-parser":
+      convertESM = false;
+      ignoreLib = false;
+      break;
     case "standalone":
       convertESM = false;
       ignoreLib = false;
+      includeRuntime = true;
       break;
     case "production":
       // Config during builds before publish.
@@ -41,6 +46,10 @@ module.exports = function(api) {
   }
 
   const config = {
+    // Our dependencies are all standard CommonJS, along with all sorts of
+    // other random files in Babel's codebase, so we use script as the default,
+    // and then mark actual modules as modules farther down.
+    sourceType: "script",
     comments: false,
     ignore: [
       // These may not be strictly necessary with the newly-limited scope of
@@ -84,7 +93,29 @@ module.exports = function(api) {
           convertESM ? "@babel/transform-modules-commonjs" : null,
         ].filter(Boolean),
       },
-    ],
+      {
+        // The vast majority of our src files are modules, but we use
+        // unambiguous to keep things simple until we get around to renaming
+        // the modules to be more easily distinguished from CommonJS
+        test: [
+          "packages/*/src",
+          "packages/*/test",
+          "codemods/*/src",
+          "codemods/*/test",
+        ],
+        sourceType: "unambiguous",
+      },
+      {
+        // The runtime transform shouldn't process its own runtime or core-js.
+        exclude: [
+          "packages/babel-runtime",
+          /[\\/]node_modules[\\/](?:@babel\/runtime|babel-runtime|core-js)[\\/]/,
+        ],
+        plugins: [includeRuntime ? "@babel/transform-runtime" : null].filter(
+          Boolean
+        ),
+      },
+    ].filter(Boolean),
   };
 
   // we need to do this as long as we do not test everything from source

codemods/babel-plugin-codemod-object-assign-to-object-spread/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-codemod-object-assign-to-object-spread",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Transforms Object.assign into object spread syntax",
   "repository": "https://github.com/babel/babel/tree/master/codemods/babel-plugin-codemod-object-assign-to-object-spread",
   "license": "MIT",
@@ -10,14 +10,14 @@
     "@babel/plugin"
   ],
   "dependencies": {
-    "@babel/plugin-syntax-object-rest-spread": "7.0.0-beta.53"
+    "@babel/plugin-syntax-object-rest-spread": "7.0.0-rc.2"
   },
   "peerDependencies": {
-    "@babel/core": ">=7.0.0-beta.50 <7.0.0-rc.0"
+    "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.53",
-    "@babel/helper-plugin-test-runner": "7.0.0-beta.53"
+    "@babel/core": "7.0.0-rc.2",
+    "@babel/helper-plugin-test-runner": "7.0.0-rc.2"
   },
   "publishConfig": {
     "access": "public"

codemods/babel-plugin-codemod-optional-catch-binding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-codemod-optional-catch-binding",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Remove unused catch bindings",
   "repository": "https://github.com/babel/babel/tree/master/codemods/babel-plugin-codemod-remove-unused-catch-binding",
   "license": "MIT",
@@ -10,13 +10,13 @@
     "@babel/plugin"
   ],
   "dependencies": {
-    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.53"
+    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-rc.2"
   },
   "peerDependencies": {
-    "@babel/core": ">=7.0.0-beta.50 <7.0.0-rc.0"
+    "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.53",
-    "@babel/helper-plugin-test-runner": "7.0.0-beta.53"
+    "@babel/core": "7.0.0-rc.2",
+    "@babel/helper-plugin-test-runner": "7.0.0-rc.2"
   }
 }

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.11.0",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "changelog": {
     "repo": "babel/babel",
     "cacheDir": ".changelog",

lib/third-party-libs.js.flow

@@ -32,6 +32,20 @@ declare module "lodash/merge" {
   declare export default <T: Object>(T, Object) => T;
 }
 
+declare module "semver" {
+  declare module.exports: {
+    valid(v: string): boolean;
+    gt(v1: string, v2: string): boolean;
+    lt(v1: string, v2: string): boolean;
+    major(v: string): number;
+    minor(v: string): number;
+    patch(v: string): number;
+    satisfies(v1: string, r1: string): boolean;
+
+    intersects(r1: string, r2: string): boolean;
+  }
+}
+
 declare module "source-map" {
   declare export type SourceMap = {
     version: 3,

package.json

@@ -10,29 +10,33 @@
     "test": "make test"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.52",
-    "@babel/core": "7.0.0-beta.52",
-    "@babel/plugin-transform-modules-commonjs": "7.0.0-beta.52",
-    "@babel/preset-env": "7.0.0-beta.52",
-    "@babel/preset-flow": "7.0.0-beta.52",
-    "@babel/preset-stage-0": "7.0.0-beta.52",
-    "@babel/register": "7.0.0-beta.52",
+    "@babel/cli": "7.0.0-rc.1",
+    "@babel/core": "7.0.0-rc.1",
+    "@babel/plugin-transform-runtime": "7.0.0-rc.1",
+    "@babel/plugin-proposal-class-properties": "7.0.0-rc.1",
+    "@babel/plugin-proposal-export-namespace-from": "7.0.0-rc.1",
+    "@babel/plugin-proposal-numeric-separator": "7.0.0-rc.1",
+    "@babel/plugin-transform-modules-commonjs": "7.0.0-rc.1",
+    "@babel/preset-env": "7.0.0-rc.1",
+    "@babel/preset-flow": "7.0.0-rc.1",
+    "@babel/register": "7.0.0-rc.1",
+    "@babel/runtime": "7.0.0-rc.1",
     "babel-core": "^7.0.0-0",
-    "babel-eslint": "^8.2.5",
-    "babel-jest": "^22.4.1",
-    "babel-loader": "8.0.0-beta.0",
+    "babel-eslint": "^8.2.6",
+    "babel-jest": "^23.4.0",
+    "babel-loader": "8.0.0-beta.4",
     "babel-plugin-transform-charcodes": "^0.1.0",
-    "browserify": "^13.1.1",
+    "browserify": "^16.2.2",
     "bundle-collapser": "^1.2.1",
     "chalk": "^2.3.2",
     "charcodes": "^0.1.0",
     "derequire": "^2.0.2",
     "enhanced-resolve": "^3.0.0",
-    "eslint": "^5.0.1",
+    "eslint": "^5.3.0",
     "eslint-config-babel": "^7.0.2",
-    "eslint-plugin-flowtype": "^2.49.3",
-    "eslint-plugin-prettier": "^2.6.1",
-    "flow-bin": "^0.75.0",
+    "eslint-plugin-flowtype": "^2.50.0",
+    "eslint-plugin-prettier": "^2.6.2",
+    "flow-bin": "^0.79.0",
     "graceful-fs": "^4.1.11",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0-beta.2",
@@ -44,14 +48,14 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^5.0.0",
     "husky": "^0.14.3",
-    "jest": "^22.4.2",
+    "jest": "^23.4.1",
     "lerna": "^2.11.0",
     "lerna-changelog": "^0.5.0",
     "lint-staged": "^6.0.1",
-    "lodash": "^4.17.5",
+    "lodash": "^4.17.10",
     "merge-stream": "^1.0.1",
     "output-file-sync": "^2.0.0",
-    "prettier": "1.13.2",
+    "prettier": "^1.13.7",
     "pump": "^1.0.2",
     "rimraf": "^2.4.3",
     "rollup-plugin-babel": "^4.0.0-beta.0",

packages/README.md

@@ -14,7 +14,7 @@ A monorepo, muhahahahahaha. See the [monorepo design doc](/doc/design/monorepo.m
 | Package | Version | Dependencies |
 |--------|-------|------------|
 | [`@babel/core`](/packages/babel-core) | [![npm](https://img.shields.io/npm/v/@babel/core.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/core) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-core)](https://david-dm.org/babel/babel?path=packages/babel-core) |
-| [`@babel/parser`](/packages/@babel/parser) | [![npm](https://img.shields.io/npm/v/@babel/parser.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/parser) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-parser)](https://david-dm.org/babel/babel?path=packages/babel-parser) |
+| [`@babel/parser`](/packages/babel-parser) | [![npm](https://img.shields.io/npm/v/@babel/parser.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/parser) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-parser)](https://david-dm.org/babel/babel?path=packages/babel-parser) |
 | [`@babel/traverse`](/packages/babel-traverse) | [![npm](https://img.shields.io/npm/v/@babel/traverse.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/traverse) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-traverse)](https://david-dm.org/babel/babel?path=packages/babel-traverse) |
 | [`@babel/generator`](/packages/babel-generator) | [![npm](https://img.shields.io/npm/v/@babel/generator.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/generator) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-generator)](https://david-dm.org/babel/babel?path=packages/babel-generator) |
 

packages/babel-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/cli",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Babel command line.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -18,9 +18,9 @@
   "dependencies": {
     "commander": "^2.8.1",
     "convert-source-map": "^1.1.0",
-    "fs-readdir-recursive": "^1.0.0",
+    "fs-readdir-recursive": "^1.1.0",
     "glob": "^7.0.0",
-    "lodash": "^4.17.5",
+    "lodash": "^4.17.10",
     "mkdirp": "^0.5.1",
     "output-file-sync": "^2.0.0",
     "slash": "^1.0.0",
@@ -30,11 +30,11 @@
     "chokidar": "^2.0.3"
   },
   "peerDependencies": {
-    "@babel/core": ">=7.0.0-beta.50 <7.0.0-rc.0"
+    "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.53",
-    "@babel/helper-fixtures": "7.0.0-beta.53"
+    "@babel/core": "7.0.0-rc.2",
+    "@babel/helper-fixtures": "7.0.0-rc.2"
   },
   "bin": {
     "babel": "./bin/babel.js",

packages/babel-cli/src/babel/dir.js

@@ -89,7 +89,7 @@ export default async function({ cliOptions, babelOptions }) {
 
     const stat = fs.statSync(filenameOrDir);
 
-    if (stat.isDirectory(filenameOrDir)) {
+    if (stat.isDirectory()) {
       const dirname = filenameOrDir;
 
       let count = 0;

packages/babel-cli/src/babel/util.js

@@ -15,11 +15,15 @@ export function readdir(
   includeDotfiles: boolean,
   filter: ReaddirFilter,
 ) {
-  return readdirRecursive(
-    dirname,
-    filename =>
-      (includeDotfiles || filename[0] !== ".") && (!filter || filter(filename)),
-  );
+  return readdirRecursive(dirname, (filename, _index, currentDirectory) => {
+    const stat = fs.statSync(path.join(currentDirectory, filename));
+
+    if (stat.isDirectory()) return true;
+
+    return (
+      (includeDotfiles || filename[0] !== ".") && (!filter || filter(filename))
+    );
+  });
 }
 
 export function readdirForCompilable(
@@ -45,9 +49,14 @@ export function addSourceMappingUrl(code, loc) {
   return code + "\n//# sourceMappingURL=" + path.basename(loc);
 }
 
+const CALLER = {
+  name: "@babel/cli",
+};
+
 export function transform(filename, code, opts) {
   opts = {
     ...opts,
+    caller: CALLER,
     filename,
   };
 
@@ -60,6 +69,11 @@ export function transform(filename, code, opts) {
 }
 
 export function compile(filename, opts) {
+  opts = {
+    ...opts,
+    caller: CALLER,
+  };
+
   return new Promise((resolve, reject) => {
     babel.transformFile(filename, opts, (err, result) => {
       if (err) reject(err);

packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/out-files/lib/foo.js

@@ -3,4 +3,4 @@
 arr.map(function (x) {
   return x * MULTIPLIER;
 });
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9mb28uanMiXSwibmFtZXMiOlsiYXJyIiwibWFwIiwieCIsIk1VTFRJUExJRVIiXSwibWFwcGluZ3MiOiI7O0FBQUFBLElBQUlDLEdBQUosQ0FBUTtBQUFBLFNBQUtDLElBQUlDLFVBQVQ7QUFBQSxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9mb28uanMiXSwibmFtZXMiOlsiYXJyIiwibWFwIiwieCIsIk1VTFRJUExJRVIiXSwibWFwcGluZ3MiOiI7O0FBQUFBLEdBQUcsQ0FBQ0MsR0FBSixDQUFRLFVBQUFDLENBQUM7QUFBQSxTQUFJQSxDQUFDLEdBQUdDLFVBQVI7QUFBQSxDQUFUIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=

packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/out-files/lib/foo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/foo.js"],"names":["arr","map","x","MULTIPLIER"],"mappings":";;AAAAA,IAAIC,GAAJ,CAAQ;AAAA,SAAKC,IAAIC,UAAT;AAAA,CAAR","sourcesContent":["arr.map(x => x * MULTIPLIER);"],"file":"foo.js"}
+{"version":3,"sources":["../src/foo.js"],"names":["arr","map","x","MULTIPLIER"],"mappings":";;AAAAA,GAAG,CAACC,GAAJ,CAAQ,UAAAC,CAAC;AAAA,SAAIA,CAAC,GAAGC,UAAR;AAAA,CAAT","sourcesContent":["arr.map(x => x * MULTIPLIER);"],"file":"foo.js"}

packages/babel-cli/test/fixtures/babel/dir --out-file/in-files/src/bar/bar.js

@@ -0,0 +1 @@
+ (() => 42)

packages/babel-cli/test/fixtures/babel/dir --out-file/in-files/src/foo.js

@@ -0,0 +1 @@
+arr.map(x => x * MULTIPLIER);

packages/babel-cli/test/fixtures/babel/dir --out-file/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-file", "test.js"]
+}

packages/babel-cli/test/fixtures/babel/dir --out-file/out-files/test.js

@@ -0,0 +1,10 @@
+"use strict";
+
+(function () {
+  return 42;
+});
+"use strict";
+
+arr.map(function (x) {
+  return x * MULTIPLIER;
+});

packages/babel-cli/test/fixtures/babel/filename --out-file --source-maps inline/out-files/script2.js

@@ -4,4 +4,4 @@ arr.map(function (x) {
   return x * MULTIPLIER;
 });
 
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLElBQUksR0FBSixDQUFRO0FBQUEsU0FBSyxJQUFJLFVBQVQ7QUFBQSxDQUFSIiwiZmlsZSI6InNjcmlwdDIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLEdBQUcsQ0FBQyxHQUFKLENBQVEsVUFBQSxDQUFDO0FBQUEsU0FBSSxDQUFDLEdBQUcsVUFBUjtBQUFBLENBQVQiLCJmaWxlIjoic2NyaXB0Mi5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19

packages/babel-cli/test/fixtures/babel/filename-sourcemap --out-file --source-maps inline/out-files/script2.js

@@ -4,4 +4,4 @@ arr.map(function (x) {
   return x * MULTIPLIER;
 });
 
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9yaWdpbmFsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsSUFBQSxHQUFBLENBQUE7QUFBQSxTQUFVLElBQUEsVUFBVjtBQUFBLENBQUEiLCJmaWxlIjoic2NyaXB0Mi5qcyIsInNvdXJjZXNDb250ZW50IjpbInZhciBmb28gPSAoKSA9PiA0OyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9yaWdpbmFsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsR0FBQSxDQUFBLEdBQUEsQ0FBQSxVQUFBLENBQUE7QUFBQSxTQUFVLENBQUEsR0FBQSxVQUFWO0FBQUEsQ0FBQSIsImZpbGUiOiJzY3JpcHQyLmpzIiwic291cmNlc0NvbnRlbnQiOlsidmFyIGZvbyA9ICgpID0+IDQ7Il19

packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps inline/out-files/script3.js

@@ -9,4 +9,4 @@ arr.map(function (x) {
   return x * MULTIPLIER;
 });
 
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxDQUFDO0FBQUEsU0FBTSxFQUFOO0FBQUEsQ0FBRDs7O0FDQUEsSUFBSSxHQUFKLENBQVE7QUFBQSxTQUFLLElBQUksVUFBVDtBQUFBLENBQVIiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbIigoKSA9PiA0MikiLCJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxDQUFDO0FBQUEsU0FBTSxFQUFOO0FBQUEsQ0FBRDs7O0FDQUEsR0FBRyxDQUFDLEdBQUosQ0FBUSxVQUFBLENBQUM7QUFBQSxTQUFJLENBQUMsR0FBRyxVQUFSO0FBQUEsQ0FBVCIsImZpbGUiOiJzY3JpcHQzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiKCgpID0+IDQyKSIsImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19

packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;AAAA,CAAC;AAAA,SAAM,EAAN;AAAA,CAAD;;;ACAA,IAAI,GAAJ,CAAQ;AAAA,SAAK,IAAI,UAAT;AAAA,CAAR","file":"script3.js","sourcesContent":["(() => 42)","arr.map(x => x * MULTIPLIER);"]}
+{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;AAAA,CAAC;AAAA,SAAM,EAAN;AAAA,CAAD;;;ACAA,GAAG,CAAC,GAAJ,CAAQ,UAAA,CAAC;AAAA,SAAI,CAAC,GAAG,UAAR;AAAA,CAAT","file":"script3.js","sourcesContent":["(() => 42)","arr.map(x => x * MULTIPLIER);"]}

packages/babel-code-frame/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/code-frame",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Generate errors that contain a code frame that point to source locations.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -8,7 +8,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-code-frame",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/highlight": "7.0.0-beta.53"
+    "@babel/highlight": "7.0.0-rc.2"
   },
   "devDependencies": {
     "chalk": "^2.0.0",

packages/babel-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/core",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Babel compiler core.",
   "main": "lib/index.js",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
@@ -30,24 +30,23 @@
     "./lib/transform-file.js": "./lib/transform-file-browser.js"
   },
   "dependencies": {
-    "@babel/code-frame": "7.0.0-beta.53",
-    "@babel/generator": "7.0.0-beta.53",
-    "@babel/helpers": "7.0.0-beta.53",
-    "@babel/parser": "7.0.0-beta.53",
-    "@babel/template": "7.0.0-beta.53",
-    "@babel/traverse": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53",
+    "@babel/code-frame": "7.0.0-rc.2",
+    "@babel/generator": "7.0.0-rc.2",
+    "@babel/helpers": "7.0.0-rc.2",
+    "@babel/parser": "7.0.0-rc.2",
+    "@babel/template": "7.0.0-rc.2",
+    "@babel/traverse": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2",
     "convert-source-map": "^1.1.0",
     "debug": "^3.1.0",
     "json5": "^0.5.0",
-    "lodash": "^4.17.5",
-    "micromatch": "^2.3.11",
+    "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.0.0-beta.53",
-    "@babel/register": "7.0.0-beta.53"
+    "@babel/helper-transform-fixture-test-runner": "7.0.0-rc.2",
+    "@babel/register": "7.0.0-rc.2"
   }
 }

packages/babel-core/src/config/caching.js

@@ -206,12 +206,29 @@ function makeSimpleConfigurator(
       return;
     }
 
-    return cache.using(val);
+    return cache.using(() => assertSimpleType(val()));
   }
   cacheFn.forever = () => cache.forever();
   cacheFn.never = () => cache.never();
-  cacheFn.using = cb => cache.using(() => cb());
-  cacheFn.invalidate = cb => cache.invalidate(() => cb());
+  cacheFn.using = cb => cache.using(() => assertSimpleType(cb()));
+  cacheFn.invalidate = cb => cache.invalidate(() => assertSimpleType(cb()));
 
   return (cacheFn: any);
 }
+
+// Types are limited here so that in the future these values can be used
+// as part of Babel's caching logic.
+type SimpleType = string | boolean | number | null | void;
+export function assertSimpleType(value: mixed): SimpleType {
+  if (
+    value != null &&
+    typeof value !== "string" &&
+    typeof value !== "boolean" &&
+    typeof value !== "number"
+  ) {
+    throw new Error(
+      "Cache keys must be either string, boolean, number, null, or undefined.",
+    );
+  }
+  return value;
+}

packages/babel-core/src/config/config-chain.js

@@ -1,7 +1,6 @@
 // @flow
 
 import path from "path";
-import micromatch from "micromatch";
 import buildDebug from "debug";
 import {
   validate,
@@ -9,7 +8,9 @@ import {
   type IgnoreList,
   type ConfigApplicableTest,
   type BabelrcSearch,
+  type CallerMetadata,
 } from "./validation/options";
+import pathPatternToRegex from "./pattern-to-regex";
 
 const debug = buildDebug("babel:config:config-chain");
 
@@ -50,17 +51,27 @@ export type ConfigContext = {
   cwd: string,
   root: string,
   envName: string,
-};
-
-type ConfigContextNamed = {
-  ...ConfigContext,
-  filename: string,
+  caller: CallerMetadata | void,
 };
 
 /**
  * Build a config chain for a given preset.
  */
-export const buildPresetChain: (
+export function buildPresetChain(
+  arg: PresetInstance,
+  context: *,
+): ConfigChain | null {
+  const chain = buildPresetChainWalker(arg, context);
+  if (!chain) return null;
+
+  return {
+    plugins: dedupDescriptors(chain.plugins),
+    presets: dedupDescriptors(chain.presets),
+    options: chain.options,
+  };
+}
+
+export const buildPresetChainWalker: (
   arg: PresetInstance,
   context: *,
 ) => * = makeChainWalker({
@@ -133,9 +144,14 @@ export function buildRootChain(
 
   let configFile;
   if (typeof opts.configFile === "string") {
-    configFile = loadConfig(opts.configFile, context.cwd, context.envName);
+    configFile = loadConfig(
+      opts.configFile,
+      context.cwd,
+      context.envName,
+      context.caller,
+    );
   } else if (opts.configFile !== false) {
-    configFile = findRootConfig(context.root, context.envName);
+    configFile = findRootConfig(context.root, context.envName, context.caller);
   }
 
   let { babelrc, babelrcRoots } = opts;
@@ -217,7 +233,7 @@ function babelrcLoadEnabled(
 
   const absoluteRoot = context.root;
 
-  // Fast path to avoid having to load micromatch if the babelrc is just
+  // Fast path to avoid having to match patterns if the babelrc is just
   // loading in the standard root directory.
   if (babelrcRoots === undefined) {
     return pkgData.directories.indexOf(absoluteRoot) !== -1;
@@ -225,15 +241,23 @@ function babelrcLoadEnabled(
 
   let babelrcPatterns = babelrcRoots;
   if (!Array.isArray(babelrcPatterns)) babelrcPatterns = [babelrcPatterns];
-  babelrcPatterns = babelrcPatterns.map(pat => path.resolve(context.cwd, pat));
+  babelrcPatterns = babelrcPatterns.map(pat => {
+    return typeof pat === "string" ? path.resolve(context.cwd, pat) : pat;
+  });
 
-  // Fast path to avoid having to load micromatch if the babelrc is just
+  // Fast path to avoid having to match patterns if the babelrc is just
   // loading in the standard root directory.
   if (babelrcPatterns.length === 1 && babelrcPatterns[0] === absoluteRoot) {
     return pkgData.directories.indexOf(absoluteRoot) !== -1;
   }
 
-  return micromatch(pkgData.directories, babelrcPatterns).length > 0;
+  return babelrcPatterns.some(pat => {
+    if (typeof pat === "string") pat = pathPatternToRegex(pat, context.cwd);
+
+    return pkgData.directories.some(directory => {
+      return matchPattern(pat, context.cwd, directory, context);
+    });
+  });
 }
 
 const validateConfigFile = makeWeakCache(
@@ -446,7 +470,12 @@ function mergeExtendsChain(
 ): boolean {
   if (opts.extends === undefined) return true;
 
-  const file = loadConfig(opts.extends, dirname, context.envName);
+  const file = loadConfig(
+    opts.extends,
+    dirname,
+    context.envName,
+    context.caller,
+  );
 
   if (files.has(file)) {
     throw new Error(
@@ -500,11 +529,15 @@ function normalizeOptions(opts: ValidatedOptions): ValidatedOptions {
   };
   delete options.extends;
   delete options.env;
+  delete options.overrides;
   delete options.plugins;
   delete options.presets;
   delete options.passPerPreset;
   delete options.ignore;
   delete options.only;
+  delete options.test;
+  delete options.include;
+  delete options.exclude;
 
   // "sourceMap" is just aliased to sourceMap, so copy it over as
   // we merge the options together.
@@ -520,7 +553,7 @@ function dedupDescriptors(
 ): Array<UnloadedDescriptor> {
   const map: Map<
     Function,
-    Map<string | void, { value: UnloadedDescriptor | null }>,
+    Map<string | void, { value: UnloadedDescriptor }>,
   > = new Map();
 
   const descriptors = [];
@@ -535,16 +568,12 @@ function dedupDescriptors(
       }
       let desc = nameMap.get(item.name);
       if (!desc) {
-        desc = { value: null };
+        desc = { value: item };
         descriptors.push(desc);
 
         // Treat passPerPreset presets as unique, skipping them
         // in the merge processing steps.
         if (!item.ownPass) nameMap.set(item.name, desc);
-      }
-
-      if (item.options === false) {
-        desc.value = null;
       } else {
         desc.value = item;
       }
@@ -554,7 +583,7 @@ function dedupDescriptors(
   }
 
   return descriptors.reduce((acc, desc) => {
-    if (desc.value) acc.push(desc.value);
+    acc.push(desc.value);
     return acc;
   }, []);
 }
@@ -579,20 +608,9 @@ function configFieldIsApplicable(
   test: ConfigApplicableTest,
   dirname: string,
 ): boolean {
-  if (typeof context.filename !== "string") {
-    throw new Error(
-      `Configuration contains explicit test/include/exclude checks, but no filename was passed to Babel`,
-    );
-  }
-  // $FlowIgnore - Flow refinements aren't quite smart enough for this :(
-  const ctx: ConfigContextNamed = context;
-
   const patterns = Array.isArray(test) ? test : [test];
 
-  // Disabling negation here because it's a bit buggy from
-  // https://github.com/babel/babel/issues/6907 and it's not clear that it is
-  // needed since users can use 'exclude' alongside 'test'/'include'.
-  return matchesPatterns(ctx, patterns, dirname, false /* allowNegation */);
+  return matchesPatterns(context, patterns, dirname);
 }
 
 /**
@@ -604,43 +622,24 @@ function shouldIgnore(
   only: ?IgnoreList,
   dirname: string,
 ): boolean {
-  if (ignore) {
-    if (typeof context.filename !== "string") {
-      throw new Error(
-        `Configuration contains ignore checks, but no filename was passed to Babel`,
-      );
-    }
-    // $FlowIgnore - Flow refinements aren't quite smart enough for this :(
-    const ctx: ConfigContextNamed = context;
-    if (matchesPatterns(ctx, ignore, dirname)) {
-      debug(
-        "Ignored %o because it matched one of %O from %o",
-        context.filename,
-        ignore,
-        dirname,
-      );
-      return true;
-    }
+  if (ignore && matchesPatterns(context, ignore, dirname)) {
+    debug(
+      "Ignored %o because it matched one of %O from %o",
+      context.filename,
+      ignore,
+      dirname,
+    );
+    return true;
   }
 
-  if (only) {
-    if (typeof context.filename !== "string") {
-      throw new Error(
-        `Configuration contains ignore checks, but no filename was passed to Babel`,
-      );
-    }
-    // $FlowIgnore - Flow refinements aren't quite smart enough for this :(
-    const ctx: ConfigContextNamed = context;
-
-    if (!matchesPatterns(ctx, only, dirname)) {
-      debug(
-        "Ignored %o because it failed to match one of %O from %o",
-        context.filename,
-        only,
-        dirname,
-      );
-      return true;
-    }
+  if (only && !matchesPatterns(context, only, dirname)) {
+    debug(
+      "Ignored %o because it failed to match one of %O from %o",
+      context.filename,
+      only,
+      dirname,
+    );
+    return true;
   }
 
   return false;
@@ -651,64 +650,37 @@ function shouldIgnore(
  * Otherwise returns result of matching pattern Regex with filename.
  */
 function matchesPatterns(
-  context: ConfigContextNamed,
+  context: ConfigContext,
   patterns: IgnoreList,
   dirname: string,
-  allowNegation?: boolean = true,
 ): boolean {
-  const res = [];
-  const strings = [];
-  const fns = [];
-
-  patterns.forEach(pattern => {
-    if (typeof pattern === "string") strings.push(pattern);
-    else if (typeof pattern === "function") fns.push(pattern);
-    else res.push(pattern);
-  });
-
-  const filename = context.filename;
-  if (res.some(re => re.test(context.filename))) return true;
-  if (fns.some(fn => fn(filename))) return true;
-
-  if (strings.length > 0) {
-    const possibleDirs = getPossibleDirs(context);
-
-    const absolutePatterns = strings.map(pattern => {
-      // Preserve the "!" prefix so that micromatch can use it for negation.
-      const negate = pattern[0] === "!";
-      if (negate && !allowNegation) {
-        throw new Error(`Negation of file paths is not supported.`);
-      }
-      if (negate) pattern = pattern.slice(1);
-
-      return (negate ? "!" : "") + path.resolve(dirname, pattern);
-    });
-
-    if (
-      micromatch(possibleDirs, absolutePatterns, {
-        nocase: true,
-        nonegate: !allowNegation,
-      }).length > 0
-    ) {
-      return true;
-    }
-  }
-
-  return false;
+  return patterns.some(pattern =>
+    matchPattern(pattern, dirname, context.filename, context),
+  );
 }
 
-const getPossibleDirs = makeWeakCache((context: ConfigContextNamed) => {
-  let current = context.filename;
-  if (typeof current !== "string") return [];
-
-  const possibleDirs = [current];
-  while (true) {
-    const previous = current;
-    current = path.dirname(current);
-    if (previous === current) break;
-
-    possibleDirs.push(current);
+function matchPattern(
+  pattern,
+  dirname,
+  pathToTest,
+  context: ConfigContext,
+): boolean {
+  if (typeof pattern === "function") {
+    return !!pattern(pathToTest, {
+      dirname,
+      envName: context.envName,
+      caller: context.caller,
+    });
   }
 
-  return possibleDirs;
-});
+  if (typeof pathToTest !== "string") {
+    throw new Error(
+      `Configuration contains string/RegExp pattern, but no filename was passed to Babel`,
+    );
+  }
+
+  if (typeof pattern === "string") {
+    pattern = pathPatternToRegex(pattern, dirname);
+  }
+  return pattern.test(pathToTest);
+}

packages/babel-core/src/config/config-descriptors.js

@@ -41,6 +41,22 @@ export type UnloadedDescriptor = {
   } | void,
 };
 
+function isEqualDescriptor(
+  a: UnloadedDescriptor,
+  b: UnloadedDescriptor,
+): boolean {
+  return (
+    a.name === b.name &&
+    a.value === b.value &&
+    a.options === b.options &&
+    a.dirname === b.dirname &&
+    a.alias === b.alias &&
+    a.ownPass === b.ownPass &&
+    (a.file && a.file.request) === (b.file && b.file.request) &&
+    (a.file && a.file.resolved) === (b.file && b.file.resolved)
+  );
+}
+
 export type ValidatedFile = {
   filepath: string,
   dirname: string,
@@ -50,7 +66,7 @@ export type ValidatedFile = {
 /**
  * Create a set of descriptors from a given options object, preserving
  * descriptor identity based on the identity of the plugin/preset arrays
- * themselves.
+ * themselves, and potentially on the identity of the plugins/presets + options.
  */
 export function createCachedDescriptors(
   dirname: string,
@@ -113,26 +129,82 @@ export function createUncachedDescriptors(
   };
 }
 
+const PRESET_DESCRIPTOR_CACHE = new WeakMap();
 const createCachedPresetDescriptors = makeWeakCache(
   (items: PluginList, cache: CacheConfigurator<string>) => {
     const dirname = cache.using(dir => dir);
     return makeStrongCache((alias: string) =>
       makeStrongCache((passPerPreset: boolean) =>
-        createPresetDescriptors(items, dirname, alias, passPerPreset),
+        createPresetDescriptors(items, dirname, alias, passPerPreset).map(
+          // Items are cached using the overall preset array identity when
+          // possibly, but individual descriptors are also cached if a match
+          // can be found in the previously-used descriptor lists.
+          desc => loadCachedDescriptor(PRESET_DESCRIPTOR_CACHE, desc),
+        ),
       ),
     );
   },
 );
 
+const PLUGIN_DESCRIPTOR_CACHE = new WeakMap();
 const createCachedPluginDescriptors = makeWeakCache(
   (items: PluginList, cache: CacheConfigurator<string>) => {
     const dirname = cache.using(dir => dir);
     return makeStrongCache((alias: string) =>
-      createPluginDescriptors(items, dirname, alias),
+      createPluginDescriptors(items, dirname, alias).map(
+        // Items are cached using the overall plugin array identity when
+        // possibly, but individual descriptors are also cached if a match
+        // can be found in the previously-used descriptor lists.
+        desc => loadCachedDescriptor(PLUGIN_DESCRIPTOR_CACHE, desc),
+      ),
     );
   },
 );
 
+/**
+ * When no options object is given in a descriptor, this object is used
+ * as a WeakMap key in order to have consistent identity.
+ */
+const DEFAULT_OPTIONS = {};
+
+/**
+ * Given the cache and a descriptor, returns a matching descriptor from the
+ * cache, or else returns the input descriptor and adds it to the cache for
+ * next time.
+ */
+function loadCachedDescriptor(
+  cache: WeakMap<{} | Function, WeakMap<{}, Array<UnloadedDescriptor>>>,
+  desc: UnloadedDescriptor,
+) {
+  const { value, options = DEFAULT_OPTIONS } = desc;
+  if (options === false) return desc;
+
+  let cacheByOptions = cache.get(value);
+  if (!cacheByOptions) {
+    cacheByOptions = new WeakMap();
+    cache.set(value, cacheByOptions);
+  }
+
+  let possibilities = cacheByOptions.get(options);
+  if (!possibilities) {
+    possibilities = [];
+    cacheByOptions.set(options, possibilities);
+  }
+
+  if (possibilities.indexOf(desc) === -1) {
+    const matches = possibilities.filter(possibility =>
+      isEqualDescriptor(possibility, desc),
+    );
+    if (matches.length > 0) {
+      return matches[0];
+    }
+
+    possibilities.push(desc);
+  }
+
+  return desc;
+}
+
 function createPresetDescriptors(
   items: PluginList,
   dirname: string,

packages/babel-core/src/config/files/configuration.js

@@ -12,7 +12,9 @@ import {
 } from "../caching";
 import makeAPI from "../helpers/config-api";
 import { makeStaticFileCache } from "./utils";
+import pathPatternToRegex from "../pattern-to-regex";
 import type { FilePackageData, RelativeConfig, ConfigFile } from "./types";
+import type { CallerMetadata } from "../validation/options";
 
 const debug = buildDebug("babel:config:loading:files:configuration");
 
@@ -25,6 +27,7 @@ const BABELIGNORE_FILENAME = ".babelignore";
 export function findRelativeConfig(
   packageData: FilePackageData,
   envName: string,
+  caller: CallerMetadata | void,
 ): RelativeConfig {
   let config = null;
   let ignore = null;
@@ -36,7 +39,7 @@ export function findRelativeConfig(
       config = [BABELRC_FILENAME, BABELRC_JS_FILENAME].reduce(
         (previousConfig: ConfigFile | null, name) => {
           const filepath = path.join(loc, name);
-          const config = readConfig(filepath, envName);
+          const config = readConfig(filepath, envName, caller);
 
           if (config && previousConfig) {
             throw new Error(
@@ -90,10 +93,11 @@ export function findRelativeConfig(
 export function findRootConfig(
   dirname: string,
   envName: string,
+  caller: CallerMetadata | void,
 ): ConfigFile | null {
   const filepath = path.resolve(dirname, BABEL_CONFIG_JS_FILENAME);
 
-  const conf = readConfig(filepath, envName);
+  const conf = readConfig(filepath, envName, caller);
   if (conf) {
     debug("Found root config %o in $o.", BABEL_CONFIG_JS_FILENAME, dirname);
   }
@@ -104,10 +108,11 @@ export function loadConfig(
   name: string,
   dirname: string,
   envName: string,
+  caller: CallerMetadata | void,
 ): ConfigFile {
   const filepath = resolve.sync(name, { basedir: dirname });
 
-  const conf = readConfig(filepath, envName);
+  const conf = readConfig(filepath, envName, caller);
   if (!conf) {
     throw new Error(`Config file ${filepath} contains no configuration data`);
   }
@@ -120,16 +125,22 @@ export function loadConfig(
  * Read the given config file, returning the result. Returns null if no config was found, but will
  * throw if there are parsing errors while loading a config.
  */
-function readConfig(filepath, envName): ConfigFile | null {
+function readConfig(filepath, envName, caller): ConfigFile | null {
   return path.extname(filepath) === ".js"
-    ? readConfigJS(filepath, { envName })
+    ? readConfigJS(filepath, { envName, caller })
     : readConfigJSON5(filepath);
 }
 
 const LOADING_CONFIGS = new Set();
 
 const readConfigJS = makeStrongCache(
-  (filepath, cache: CacheConfigurator<{ envName: string }>) => {
+  (
+    filepath,
+    cache: CacheConfigurator<{
+      envName: string,
+      caller: CallerMetadata | void,
+    }>,
+  ) => {
     if (!fs.existsSync(filepath)) {
       cache.forever();
       return null;
@@ -240,15 +251,24 @@ const readConfigJSON5 = makeStaticFileCache((filepath, content) => {
 });
 
 const readIgnoreConfig = makeStaticFileCache((filepath, content) => {
-  const ignore = content
+  const ignoreDir = path.dirname(filepath);
+  const ignorePatterns = content
     .split("\n")
     .map(line => line.replace(/#(.*?)$/, "").trim())
     .filter(line => !!line);
 
+  for (const pattern of ignorePatterns) {
+    if (pattern[0] === "!") {
+      throw new Error(`Negation of file paths is not supported.`);
+    }
+  }
+
   return {
     filepath,
     dirname: path.dirname(filepath),
-    ignore,
+    ignore: ignorePatterns.map(pattern =>
+      pathPatternToRegex(pattern, ignoreDir),
+    ),
   };
 });
 

packages/babel-core/src/config/files/index-browser.js

@@ -7,6 +7,8 @@ import type {
   FilePackageData,
 } from "./types";
 
+import type { CallerMetadata } from "../validation/options";
+
 export type { ConfigFile, IgnoreFile, RelativeConfig, FilePackageData };
 
 export function findPackageData(filepath: string): FilePackageData {
@@ -21,6 +23,7 @@ export function findPackageData(filepath: string): FilePackageData {
 export function findRelativeConfig(
   pkgData: FilePackageData, // eslint-disable-line no-unused-vars
   envName: string, // eslint-disable-line no-unused-vars
+  caller: CallerMetadata | void, // eslint-disable-line no-unused-vars
 ): RelativeConfig {
   return { pkg: null, config: null, ignore: null };
 }
@@ -28,6 +31,7 @@ export function findRelativeConfig(
 export function findRootConfig(
   dirname: string, // eslint-disable-line no-unused-vars
   envName: string, // eslint-disable-line no-unused-vars
+  caller: CallerMetadata | void, // eslint-disable-line no-unused-vars
 ): ConfigFile | null {
   return null;
 }
@@ -36,6 +40,7 @@ export function loadConfig(
   name: string,
   dirname: string,
   envName: string, // eslint-disable-line no-unused-vars
+  caller: CallerMetadata | void, // eslint-disable-line no-unused-vars
 ): ConfigFile {
   throw new Error(`Cannot load ${name} relative to ${dirname} in a browser`);
 }

packages/babel-core/src/config/files/plugins.js

@@ -15,8 +15,8 @@ const BABEL_PLUGIN_PREFIX_RE = /^(?!@|module:|[^/]+\/|babel-plugin-)/;
 const BABEL_PRESET_PREFIX_RE = /^(?!@|module:|[^/]+\/|babel-preset-)/;
 const BABEL_PLUGIN_ORG_RE = /^(@babel\/)(?!plugin-|[^/]+\/)/;
 const BABEL_PRESET_ORG_RE = /^(@babel\/)(?!preset-|[^/]+\/)/;
-const OTHER_PLUGIN_ORG_RE = /^(@(?!babel\/)[^/]+\/)(?!babel-plugin(?:-|\/|$)|[^/]+\/)/;
-const OTHER_PRESET_ORG_RE = /^(@(?!babel\/)[^/]+\/)(?!babel-preset(?:-|\/|$)|[^/]+\/)/;
+const OTHER_PLUGIN_ORG_RE = /^(@(?!babel\/)[^/]+\/)(?![^/]*babel-plugin(?:-|\/|$)|[^/]+\/)/;
+const OTHER_PRESET_ORG_RE = /^(@(?!babel\/)[^/]+\/)(?![^/]*babel-preset(?:-|\/|$)|[^/]+\/)/;
 const OTHER_ORG_DEFAULT_RE = /^(@(?!babel$)[^/]+)$/;
 
 export function resolvePlugin(name: string, dirname: string): string | null {

packages/babel-core/src/config/files/types.js

@@ -9,7 +9,7 @@ export type ConfigFile = {
 export type IgnoreFile = {
   filepath: string,
   dirname: string,
-  ignore: Array<string>,
+  ignore: Array<RegExp>,
 };
 
 export type RelativeConfig = {

packages/babel-core/src/config/full.js

@@ -13,7 +13,7 @@ import {
 import type { UnloadedDescriptor } from "./config-descriptors";
 import traverse from "@babel/traverse";
 import { makeWeakCache, type CacheConfigurator } from "./caching";
-import { validate } from "./validation/options";
+import { validate, type CallerMetadata } from "./validation/options";
 import { validatePluginObject } from "./validation/plugins";
 import makeAPI from "./helpers/config-api";
 
@@ -41,6 +41,7 @@ export type PluginPasses = Array<PluginPassList>;
 // process 'ignore'/'only' and other filename-based logic.
 type SimpleContext = {
   envName: string,
+  caller: CallerMetadata | void,
 };
 
 export default function loadFullConfig(
@@ -68,15 +69,21 @@ export default function loadFullConfig(
       },
       pass: Array<Plugin>,
     ) {
-      const plugins = config.plugins.map(descriptor => {
-        return loadPluginDescriptor(descriptor, context);
-      });
-      const presets = config.presets.map(descriptor => {
-        return {
-          preset: loadPresetDescriptor(descriptor, context),
-          pass: descriptor.ownPass ? [] : pass,
-        };
-      });
+      const plugins = config.plugins.reduce((acc, descriptor) => {
+        if (descriptor.options !== false) {
+          acc.push(loadPluginDescriptor(descriptor, context));
+        }
+        return acc;
+      }, []);
+      const presets = config.presets.reduce((acc, descriptor) => {
+        if (descriptor.options !== false) {
+          acc.push({
+            preset: loadPresetDescriptor(descriptor, context),
+            pass: descriptor.ownPass ? [] : pass,
+          });
+        }
+        return acc;
+      }, []);
 
       // resolve presets
       if (presets.length > 0) {

packages/babel-core/src/config/helpers/config-api.js

@@ -2,7 +2,13 @@
 
 import semver from "semver";
 import { version as coreVersion } from "../../";
-import type { CacheConfigurator, SimpleCacheConfigurator } from "../caching";
+import {
+  assertSimpleType,
+  type CacheConfigurator,
+  type SimpleCacheConfigurator,
+} from "../caching";
+
+import type { CallerMetadata } from "../validation/options";
 
 type EnvFunction = {
   (): string,
@@ -20,12 +26,14 @@ export type PluginAPI = {
 };
 
 export default function makeAPI(
-  cache: CacheConfigurator<{ envName: string }>,
+  cache: CacheConfigurator<{ envName: string, caller: CallerMetadata | void }>,
 ): PluginAPI {
   const env: any = value =>
     cache.using(data => {
       if (typeof value === "undefined") return data.envName;
-      if (typeof value === "function") return value(data.envName);
+      if (typeof value === "function") {
+        return assertSimpleType(value(data.envName));
+      }
       if (!Array.isArray(value)) value = [value];
 
       return value.some(entry => {
@@ -36,12 +44,16 @@ export default function makeAPI(
       });
     });
 
+  const caller: any = cb =>
+    cache.using(data => assertSimpleType(cb(data.caller)));
+
   return {
     version: coreVersion,
     cache: cache.simple(),
     // Expose ".env()" so people can easily get the same env that we expose using the "env" key.
     env,
     async: () => false,
+    caller,
     assertVersion,
   };
 }

packages/babel-core/src/config/item.js

@@ -71,9 +71,11 @@ class ConfigItem {
 
   /**
    * The options, if any, that were passed to the item.
-   * Mutating this will lead to undefined behavior. If you need
+   * Mutating this will lead to undefined behavior.
+   *
+   * "false" means that this item has been disabled.
    */
-  options: {} | void;
+  options: {} | void | false;
 
   /**
    * The directory that the options for this item are relative to.
@@ -103,10 +105,6 @@ class ConfigItem {
     this._descriptor = descriptor;
     Object.defineProperty(this, "_descriptor", ({ enumerable: false }: any));
 
-    if (this._descriptor.options === false) {
-      throw new Error("Assertion failure - unexpected false options");
-    }
-
     this.value = this._descriptor.value;
     this.options = this._descriptor.options;
     this.dirname = this._descriptor.dirname;

packages/babel-core/src/config/partial.js

@@ -28,7 +28,7 @@ export default function loadPrivatePartialConfig(
 
   const args = inputOpts ? validate("arguments", inputOpts) : {};
 
-  const { envName = getEnv(), cwd = ".", root: rootDir = "." } = args;
+  const { envName = getEnv(), cwd = ".", root: rootDir = ".", caller } = args;
   const absoluteCwd = path.resolve(cwd);
   const absoluteRootDir = path.resolve(absoluteCwd, rootDir);
 
@@ -40,6 +40,7 @@ export default function loadPrivatePartialConfig(
     cwd: absoluteCwd,
     root: absoluteRootDir,
     envName,
+    caller,
   };
 
   const configChain = buildRootChain(args, context);

packages/babel-core/src/config/pattern-to-regex.js

@@ -0,0 +1,51 @@
+// @flow
+import path from "path";
+import escapeRegExp from "lodash/escapeRegExp";
+
+const sep = `\\${path.sep}`;
+const endSep = `(?:${sep}|$)`;
+
+const substitution = `[^${sep}]+`;
+
+const starPat = `(?:${substitution}${sep})`;
+const starPatLast = `(?:${substitution}${endSep})`;
+
+const starStarPat = `${starPat}*?`;
+const starStarPatLast = `${starPat}*?${starPatLast}?`;
+
+/**
+ * Implement basic pattern matching that will allow users to do the simple
+ * tests with * and **. If users want full complex pattern matching, then can
+ * always use regex matching, or function validation.
+ */
+export default function pathToPattern(
+  pattern: string,
+  dirname: string,
+): RegExp {
+  const parts = path.resolve(dirname, pattern).split(path.sep);
+
+  return new RegExp(
+    [
+      "^",
+      ...parts.map((part, i) => {
+        const last = i === parts.length - 1;
+
+        // ** matches 0 or more path parts.
+        if (part === "**") return last ? starStarPatLast : starStarPat;
+
+        // * matches 1 path part.
+        if (part === "*") return last ? starPatLast : starPat;
+
+        // *.ext matches a wildcard with an extension.
+        if (part.indexOf("*.") === 0) {
+          return (
+            substitution + escapeRegExp(part.slice(1)) + (last ? endSep : sep)
+          );
+        }
+
+        // Otherwise match the pattern text.
+        return escapeRegExp(part) + (last ? endSep : sep);
+      }),
+    ].join(""),
+  );
+}

packages/babel-core/src/config/validation/option-assertions.js

@@ -13,16 +13,55 @@ import type {
   SourceTypeOption,
   CompactOption,
   RootInputSourceMapOption,
+  NestingPath,
+  CallerMetadata,
 } from "./options";
 
 export type ValidatorSet = {
   [string]: Validator<any>,
 };
 
-export type Validator<T> = (string, mixed) => T;
+export type Validator<T> = (OptionPath, mixed) => T;
+
+export function msg(loc: NestingPath | GeneralPath) {
+  switch (loc.type) {
+    case "root":
+      return ``;
+    case "env":
+      return `${msg(loc.parent)}.env["${loc.name}"]`;
+    case "overrides":
+      return `${msg(loc.parent)}.overrides[${loc.index}]`;
+    case "option":
+      return `${msg(loc.parent)}.${loc.name}`;
+    case "access":
+      return `${msg(loc.parent)}[${JSON.stringify(loc.name)}]`;
+    default:
+      throw new Error(`Assertion failure: Unknown type ${loc.type}`);
+  }
+}
+
+export function access(loc: GeneralPath, name: string | number): AccessPath {
+  return {
+    type: "access",
+    name,
+    parent: loc,
+  };
+}
+
+export type OptionPath = $ReadOnly<{
+  type: "option",
+  name: string,
+  parent: NestingPath,
+}>;
+type AccessPath = $ReadOnly<{
+  type: "access",
+  name: string | number,
+  parent: GeneralPath,
+}>;
+type GeneralPath = OptionPath | AccessPath;
 
 export function assertSourceMaps(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): SourceMapsOption | void {
   if (
@@ -32,21 +71,24 @@ export function assertSourceMaps(
     value !== "both"
   ) {
     throw new Error(
-      `.${key} must be a boolean, "inline", "both", or undefined`,
+      `${msg(loc)} must be a boolean, "inline", "both", or undefined`,
     );
   }
   return value;
 }
 
-export function assertCompact(key: string, value: mixed): CompactOption | void {
+export function assertCompact(
+  loc: OptionPath,
+  value: mixed,
+): CompactOption | void {
   if (value !== undefined && typeof value !== "boolean" && value !== "auto") {
-    throw new Error(`.${key} must be a boolean, "auto", or undefined`);
+    throw new Error(`${msg(loc)} must be a boolean, "auto", or undefined`);
   }
   return value;
 }
 
 export function assertSourceType(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): SourceTypeOption | void {
   if (
@@ -56,14 +98,49 @@ export function assertSourceType(
     value !== "unambiguous"
   ) {
     throw new Error(
-      `.${key} must be "module", "script", "unambiguous", or undefined`,
+      `${msg(loc)} must be "module", "script", "unambiguous", or undefined`,
     );
   }
   return value;
 }
 
+export function assertCallerMetadata(
+  loc: OptionPath,
+  value: mixed,
+): CallerMetadata | void {
+  const obj = assertObject(loc, value);
+  if (obj) {
+    if (typeof obj[("name": string)] !== "string") {
+      throw new Error(
+        `${msg(loc)} set but does not contain "name" property string`,
+      );
+    }
+
+    for (const prop of Object.keys(obj)) {
+      const propLoc = access(loc, prop);
+      const value = obj[prop];
+      if (
+        value != null &&
+        typeof value !== "boolean" &&
+        typeof value !== "string" &&
+        typeof value !== "number"
+      ) {
+        // NOTE(logan): I'm limiting the type here so that we can guarantee that
+        // the "caller" value will serialize to JSON nicely. We can always
+        // allow more complex structures later though.
+        throw new Error(
+          `${msg(
+            propLoc,
+          )} must be null, undefined, a boolean, a string, or a number.`,
+        );
+      }
+    }
+  }
+  return (value: any);
+}
+
 export function assertInputSourceMap(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): RootInputSourceMapOption | void {
   if (
@@ -71,75 +148,82 @@ export function assertInputSourceMap(
     typeof value !== "boolean" &&
     (typeof value !== "object" || !value)
   ) {
-    throw new Error(".inputSourceMap must be a boolean, object, or undefined");
+    throw new Error(`${msg(loc)} must be a boolean, object, or undefined`);
   }
   return value;
 }
 
-export function assertString(key: string, value: mixed): string | void {
+export function assertString(loc: GeneralPath, value: mixed): string | void {
   if (value !== undefined && typeof value !== "string") {
-    throw new Error(`.${key} must be a string, or undefined`);
+    throw new Error(`${msg(loc)} must be a string, or undefined`);
   }
   return value;
 }
 
-export function assertFunction(key: string, value: mixed): Function | void {
+export function assertFunction(
+  loc: GeneralPath,
+  value: mixed,
+): Function | void {
   if (value !== undefined && typeof value !== "function") {
-    throw new Error(`.${key} must be a function, or undefined`);
+    throw new Error(`${msg(loc)} must be a function, or undefined`);
   }
   return value;
 }
 
-export function assertBoolean(key: string, value: mixed): boolean | void {
+export function assertBoolean(loc: GeneralPath, value: mixed): boolean | void {
   if (value !== undefined && typeof value !== "boolean") {
-    throw new Error(`.${key} must be a boolean, or undefined`);
+    throw new Error(`${msg(loc)} must be a boolean, or undefined`);
   }
   return value;
 }
 
-export function assertObject(key: string, value: mixed): {} | void {
+export function assertObject(loc: GeneralPath, value: mixed): {} | void {
   if (
     value !== undefined &&
     (typeof value !== "object" || Array.isArray(value) || !value)
   ) {
-    throw new Error(`.${key} must be an object, or undefined`);
+    throw new Error(`${msg(loc)} must be an object, or undefined`);
   }
   return value;
 }
 
-export function assertArray(key: string, value: mixed): ?$ReadOnlyArray<mixed> {
+export function assertArray(
+  loc: GeneralPath,
+  value: mixed,
+): ?$ReadOnlyArray<mixed> {
   if (value != null && !Array.isArray(value)) {
-    throw new Error(`.${key} must be an array, or undefined`);
+    throw new Error(`${msg(loc)} must be an array, or undefined`);
   }
   return value;
 }
 
-export function assertIgnoreList(key: string, value: mixed): IgnoreList | void {
-  const arr = assertArray(key, value);
+export function assertIgnoreList(
+  loc: OptionPath,
+  value: mixed,
+): IgnoreList | void {
+  const arr = assertArray(loc, value);
   if (arr) {
-    arr.forEach((item, i) => assertIgnoreItem(key, i, item));
+    arr.forEach((item, i) => assertIgnoreItem(access(loc, i), item));
   }
   return (arr: any);
 }
-function assertIgnoreItem(
-  key: string,
-  index: number,
-  value: mixed,
-): IgnoreItem {
+function assertIgnoreItem(loc: GeneralPath, value: mixed): IgnoreItem {
   if (
     typeof value !== "string" &&
     typeof value !== "function" &&
     !(value instanceof RegExp)
   ) {
     throw new Error(
-      `.${key}[${index}] must be an array of string/Funtion/RegExp values, or undefined`,
+      `${msg(
+        loc,
+      )} must be an array of string/Funtion/RegExp values, or undefined`,
     );
   }
   return value;
 }
 
 export function assertConfigApplicableTest(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): ConfigApplicableTest | void {
   if (value === undefined) return value;
@@ -147,12 +231,14 @@ export function assertConfigApplicableTest(
   if (Array.isArray(value)) {
     value.forEach((item, i) => {
       if (!checkValidTest(item)) {
-        throw new Error(`.${key}[${i}] must be a string/Function/RegExp.`);
+        throw new Error(
+          `${msg(access(loc, i))} must be a string/Function/RegExp.`,
+        );
       }
     });
   } else if (!checkValidTest(value)) {
     throw new Error(
-      `.${key} must be a string/Function/RegExp, or an array of those`,
+      `${msg(loc)} must be a string/Function/RegExp, or an array of those`,
     );
   }
   return (value: any);
@@ -167,7 +253,7 @@ function checkValidTest(value: mixed): boolean {
 }
 
 export function assertConfigFileSearch(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): ConfigFileSearch | void {
   if (
@@ -176,7 +262,7 @@ export function assertConfigFileSearch(
     typeof value !== "string"
   ) {
     throw new Error(
-      `.${key} must be a undefined, a boolean, a string, ` +
+      `${msg(loc)} must be a undefined, a boolean, a string, ` +
         `got ${JSON.stringify(value)}`,
     );
   }
@@ -185,52 +271,51 @@ export function assertConfigFileSearch(
 }
 
 export function assertBabelrcSearch(
-  key: string,
+  loc: OptionPath,
   value: mixed,
 ): BabelrcSearch | void {
   if (value === undefined || typeof value === "boolean") return value;
 
   if (Array.isArray(value)) {
     value.forEach((item, i) => {
-      if (typeof item !== "string") {
-        throw new Error(`.${key}[${i}] must be a string.`);
+      if (!checkValidTest(item)) {
+        throw new Error(
+          `${msg(access(loc, i))} must be a string/Function/RegExp.`,
+        );
       }
     });
-  } else if (typeof value !== "string") {
+  } else if (!checkValidTest(value)) {
     throw new Error(
-      `.${key} must be a undefined, a boolean, a string, ` +
-        `or an array of strings, got ${JSON.stringify(value)}`,
+      `${msg(loc)} must be a undefined, a boolean, a string/Function/RegExp ` +
+        `or an array of those, got ${JSON.stringify(value)}`,
     );
   }
   return (value: any);
 }
 
-export function assertPluginList(key: string, value: mixed): PluginList | void {
-  const arr = assertArray(key, value);
+export function assertPluginList(
+  loc: OptionPath,
+  value: mixed,
+): PluginList | void {
+  const arr = assertArray(loc, value);
   if (arr) {
     // Loop instead of using `.map` in order to preserve object identity
     // for plugin array for use during config chain processing.
-    arr.forEach((item, i) => assertPluginItem(key, i, item));
+    arr.forEach((item, i) => assertPluginItem(access(loc, i), item));
   }
   return (arr: any);
 }
-function assertPluginItem(
-  key: string,
-  index: number,
-  value: mixed,
-): PluginItem {
+function assertPluginItem(loc: GeneralPath, value: mixed): PluginItem {
   if (Array.isArray(value)) {
     if (value.length === 0) {
-      throw new Error(`.${key}[${index}] must include an object`);
+      throw new Error(`${msg(loc)} must include an object`);
     }
 
     if (value.length > 3) {
-      throw new Error(
-        `.${key}[${index}] may only be a two-tuple or three-tuple`,
-      );
+      throw new Error(`${msg(loc)} may only be a two-tuple or three-tuple`);
     }
 
-    assertPluginTarget(key, index, true, value[0]);
+    assertPluginTarget(access(loc, 0), value[0]);
 
     if (value.length > 1) {
       const opts = value[1];
@@ -240,38 +325,31 @@ function assertPluginItem(
         (typeof opts !== "object" || Array.isArray(opts))
       ) {
         throw new Error(
-          `.${key}[${index}][1] must be an object, false, or undefined`,
+          `${msg(access(loc, 1))} must be an object, false, or undefined`,
         );
       }
     }
     if (value.length === 3) {
       const name = value[2];
       if (name !== undefined && typeof name !== "string") {
-        throw new Error(`.${key}[${index}][2] must be a string, or undefined`);
+        throw new Error(
+          `${msg(access(loc, 2))} must be a string, or undefined`,
+        );
       }
     }
   } else {
-    assertPluginTarget(key, index, false, value);
+    assertPluginTarget(loc, value);
   }
 
   return (value: any);
 }
-function assertPluginTarget(
-  key: string,
-  index: number,
-  inArray: boolean,
-  value: mixed,
-): PluginTarget {
+function assertPluginTarget(loc: GeneralPath, value: mixed): PluginTarget {
   if (
     (typeof value !== "object" || !value) &&
     typeof value !== "string" &&
     typeof value !== "function"
   ) {
-    throw new Error(
-      `.${key}[${index}]${
-        inArray ? `[0]` : ""
-      } must be a string, object, function`,
-    );
+    throw new Error(`${msg(loc)} must be a string, object, function`);
   }
   return value;
 }

packages/babel-core/src/config/validation/options.js

@@ -5,10 +5,13 @@ import Plugin from "../plugin";
 
 import removed from "./removed";
 import {
+  msg,
+  access,
   assertString,
   assertBoolean,
   assertObject,
   assertArray,
+  assertCallerMetadata,
   assertInputSourceMap,
   assertIgnoreList,
   assertPluginList,
@@ -21,6 +24,7 @@ import {
   assertSourceType,
   type ValidatorSet,
   type Validator,
+  type OptionPath,
 } from "./option-assertions";
 
 const ROOT_VALIDATORS: ValidatorSet = {
@@ -30,6 +34,9 @@ const ROOT_VALIDATORS: ValidatorSet = {
     $PropertyType<ValidatedOptions, "configFile">,
   >),
 
+  caller: (assertCallerMetadata: Validator<
+    $PropertyType<ValidatedOptions, "caller">,
+  >),
   filename: (assertString: Validator<
     $PropertyType<ValidatedOptions, "filename">,
   >),
@@ -173,6 +180,7 @@ export type ValidatedOptions = {
   ast?: boolean,
   inputSourceMap?: RootInputSourceMapOption,
   envName?: string,
+  caller?: CallerMetadata,
 
   extends?: string,
   env?: EnvSet<ValidatedOptions>,
@@ -222,6 +230,11 @@ export type ValidatedOptions = {
   generatorOpts?: {},
 };
 
+export type CallerMetadata = {
+  // If 'caller' is specified, require that the name is given for debugging
+  // messages.
+  name: string,
+};
 export type EnvSet<T> = {
   [string]: ?T,
 };
@@ -242,30 +255,68 @@ export type OverridesList = Array<ValidatedOptions>;
 export type ConfigApplicableTest = IgnoreItem | Array<IgnoreItem>;
 
 export type ConfigFileSearch = string | boolean;
-export type BabelrcSearch = boolean | string | Array<string>;
+export type BabelrcSearch = boolean | IgnoreItem | IgnoreList;
 export type SourceMapsOption = boolean | "inline" | "both";
 export type SourceTypeOption = "module" | "script" | "unambiguous";
 export type CompactOption = boolean | "auto";
 export type RootInputSourceMapOption = {} | boolean;
 
-export type OptionsType =
+export type OptionsSource =
   | "arguments"
-  | "env"
-  | "preset"
-  | "override"
   | "configfile"
   | "babelrcfile"
-  | "extendsfile";
+  | "extendsfile"
+  | "preset";
+
+type RootPath = $ReadOnly<{
+  type: "root",
+  source: OptionsSource,
+}>;
+type OverridesPath = $ReadOnly<{
+  type: "overrides",
+  index: number,
+  parent: RootPath,
+}>;
+type EnvPath = $ReadOnly<{
+  type: "env",
+  name: string,
+  parent: RootPath | OverridesPath,
+}>;
+export type NestingPath = RootPath | OverridesPath | EnvPath;
+
+function getSource(loc: NestingPath): OptionsSource {
+  return loc.type === "root" ? loc.source : getSource(loc.parent);
+}
+
+export function validate(type: OptionsSource, opts: {}): ValidatedOptions {
+  return validateNested(
+    {
+      type: "root",
+      source: type,
+    },
+    opts,
+  );
+}
+
+function validateNested(loc: NestingPath, opts: {}) {
+  const type = getSource(loc);
 
-export function validate(type: OptionsType, opts: {}): ValidatedOptions {
   assertNoDuplicateSourcemap(opts);
 
   Object.keys(opts).forEach(key => {
+    const optLoc = {
+      type: "option",
+      name: key,
+      parent: loc,
+    };
+
     if (type === "preset" && NONPRESET_VALIDATORS[key]) {
-      throw new Error(`.${key} is not allowed in preset options`);
+      throw new Error(`${msg(optLoc)} is not allowed in preset options`);
     }
     if (type !== "arguments" && ROOT_VALIDATORS[key]) {
-      throw new Error(`.${key} is only allowed in root programmatic options`);
+      throw new Error(
+        `${msg(optLoc)} is only allowed in root programmatic options`,
+      );
     }
     if (
       type !== "arguments" &&
@@ -274,48 +325,47 @@ export function validate(type: OptionsType, opts: {}): ValidatedOptions {
     ) {
       if (type === "babelrcfile" || type === "extendsfile") {
         throw new Error(
-          `.${key} is not allowed in .babelrc or "extend"ed files, only in root programmatic options, ` +
+          `${msg(
+            optLoc,
+          )} is not allowed in .babelrc or "extends"ed files, only in root programmatic options, ` +
             `or babel.config.js/config file options`,
         );
       }
 
       throw new Error(
-        `.${key} is only allowed in root programmatic options, or babel.config.js/config file options`,
+        `${msg(
+          optLoc,
+        )} is only allowed in root programmatic options, or babel.config.js/config file options`,
       );
     }
-    if (type === "env" && key === "env") {
-      throw new Error(`.${key} is not allowed inside another env block`);
-    }
-    if (type === "env" && key === "overrides") {
-      throw new Error(`.${key} is not allowed inside an env block`);
-    }
-    if (type === "override" && key === "overrides") {
-      throw new Error(`.${key} is not allowed inside an overrides block`);
-    }
 
     const validator =
       COMMON_VALIDATORS[key] ||
       NONPRESET_VALIDATORS[key] ||
       BABELRC_VALIDATORS[key] ||
-      ROOT_VALIDATORS[key];
+      ROOT_VALIDATORS[key] ||
+      throwUnknownError;
 
-    if (validator) validator(key, opts[key]);
-    else throw buildUnknownError(key);
+    validator(optLoc, opts[key]);
   });
 
   return (opts: any);
 }
 
-function buildUnknownError(key: string) {
+function throwUnknownError(loc: OptionPath) {
+  const key = loc.name;
+
   if (removed[key]) {
     const { message, version = 5 } = removed[key];
 
     throw new ReferenceError(
-      `Using removed Babel ${version} option: .${key} - ${message}`,
+      `Using removed Babel ${version} option: ${msg(loc)} - ${message}`,
     );
   } else {
     // eslint-disable-next-line max-len
-    const unknownOptErr = `Unknown option: .${key}. Check out http://babeljs.io/docs/usage/options/ for more information about options.`;
+    const unknownOptErr = `Unknown option: ${msg(
+      loc,
+    )}. Check out http://babeljs.io/docs/usage/options/ for more information about options.`;
 
     throw new ReferenceError(unknownOptErr);
   }
@@ -331,27 +381,53 @@ function assertNoDuplicateSourcemap(opts: {}): void {
   }
 }
 
-function assertEnvSet(key: string, value: mixed): EnvSet<ValidatedOptions> {
-  const obj = assertObject(key, value);
+function assertEnvSet(loc: OptionPath, value: mixed): EnvSet<ValidatedOptions> {
+  if (loc.parent.type === "env") {
+    throw new Error(`${msg(loc)} is not allowed inside of another .env block`);
+  }
+  const parent: RootPath | OverridesPath = loc.parent;
+
+  const obj = assertObject(loc, value);
   if (obj) {
     // Validate but don't copy the .env object in order to preserve
     // object identity for use during config chain processing.
-    for (const key of Object.keys(obj)) {
-      const env = assertObject(key, obj[key]);
-      if (env) validate("env", env);
+    for (const envName of Object.keys(obj)) {
+      const env = assertObject(access(loc, envName), obj[envName]);
+      if (!env) continue;
+
+      const envLoc = {
+        type: "env",
+        name: envName,
+        parent,
+      };
+      validateNested(envLoc, env);
     }
   }
   return (obj: any);
 }
 
-function assertOverridesList(key: string, value: mixed): OverridesList {
-  const arr = assertArray(key, value);
+function assertOverridesList(loc: OptionPath, value: mixed): OverridesList {
+  if (loc.parent.type === "env") {
+    throw new Error(`${msg(loc)} is not allowed inside an .env block`);
+  }
+  if (loc.parent.type === "overrides") {
+    throw new Error(`${msg(loc)} is not allowed inside an .overrides block`);
+  }
+  const parent: RootPath = loc.parent;
+
+  const arr = assertArray(loc, value);
   if (arr) {
     for (const [index, item] of arr.entries()) {
-      const env = assertObject(`${index}`, item);
-      if (!env) throw new Error(`.${key}[${index}] must be an object`);
+      const objLoc = access(loc, index);
+      const env = assertObject(objLoc, item);
+      if (!env) throw new Error(`${msg(objLoc)} must be an object`);
 
-      validate("override", env);
+      const overridesLoc = {
+        type: "overrides",
+        index,
+        parent,
+      };
+      validateNested(overridesLoc, env);
     }
   }
   return (arr: any);

packages/babel-core/src/parse.js

@@ -24,8 +24,8 @@ type Parse = {
 
 export const parse: Parse = (function parse(code, opts, callback) {
   if (typeof opts === "function") {
-    opts = undefined;
     callback = opts;
+    opts = undefined;
   }
 
   // For backward-compat with Babel 7's early betas, we allow sync parsing when

packages/babel-core/src/transform-ast.js

@@ -31,8 +31,8 @@ export const transformFromAst: TransformFromAst = (function transformFromAst(
   callback,
 ) {
   if (typeof opts === "function") {
-    opts = undefined;
     callback = opts;
+    opts = undefined;
   }
 
   // For backward-compat with Babel 6, we allow sync transformation when

packages/babel-core/src/transform.js

@@ -18,8 +18,8 @@ type Transform = {
 
 export const transform: Transform = (function transform(code, opts, callback) {
   if (typeof opts === "function") {
-    opts = undefined;
     callback = opts;
+    opts = undefined;
   }
 
   // For backward-compat with Babel 6, we allow sync transformation when

packages/babel-core/src/transformation/file/file.js

@@ -1,10 +1,11 @@
 // @flow
 
 import * as helpers from "@babel/helpers";
-import { NodePath, Hub, Scope } from "@babel/traverse";
+import { NodePath, Scope, type HubInterface } from "@babel/traverse";
 import { codeFrameColumns } from "@babel/code-frame";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
+import semver from "semver";
 
 import type { NormalizedFile } from "../normalize-file";
 
@@ -26,10 +27,18 @@ export default class File {
   ast: Object = {};
   scope: Scope;
   metadata: {} = {};
-  hub: Hub = new Hub(this);
   code: string = "";
   inputMap: Object | null = null;
 
+  hub: HubInterface = {
+    // keep it for the usage in babel-core, ex: path.hub.file.opts.filename
+    file: this,
+    getCode: () => this.code,
+    getScope: () => this.scope,
+    addHelper: this.addHelper.bind(this),
+    buildError: this.buildCodeFrameError.bind(this),
+  };
+
   constructor(options: {}, { code, ast, inputMap }: NormalizedFile) {
     this.opts = options;
     this.code = code;
@@ -64,6 +73,16 @@ export default class File {
   }
 
   set(key: mixed, val: mixed) {
+    if (key === "helpersNamespace") {
+      throw new Error(
+        "Babel 7.0.0-beta.56 has dropped support for the 'helpersNamespace' utility." +
+          "If you are using @babel/plugin-external-helpers you will need to use a newer " +
+          "version than the one you currently have installed. " +
+          "If you have your own implementation, you'll want to explore using 'helperGenerator' " +
+          "alongside 'file.availableHelper()'.",
+      );
+    }
+
     this._map.set(key, val);
   }
 
@@ -121,12 +140,6 @@ export default class File {
     }
   }
 
-  // TODO: Remove this before 7.x's official release. Leaving it in for now to
-  // prevent unnecessary breakage between beta versions.
-  resolveModuleSource(source: string): string {
-    return source;
-  }
-
   addImport() {
     throw new Error(
       "This API has been removed. If you're looking for this " +
@@ -136,17 +149,38 @@ export default class File {
     );
   }
 
+  /**
+   * Check if a given helper is available in @babel/core's helper list.
+   *
+   * This _also_ allows you to pass a Babel version specifically. If the
+   * helper exists, but was not available for the full given range, it will be
+   * considered unavailable.
+   */
+  availableHelper(name: string, versionRange: ?string) {
+    let minVersion;
+    try {
+      minVersion = helpers.minVersion(name);
+    } catch (err) {
+      if (err.code !== "BABEL_HELPER_UNKNOWN") throw err;
+
+      return false;
+    }
+
+    return (
+      typeof versionRange !== "string" ||
+      (!semver.intersects(`<${minVersion}`, versionRange) &&
+        !semver.intersects(`>=8.0.0`, versionRange))
+    );
+  }
+
   addHelper(name: string): Object {
     const declar = this.declarations[name];
     if (declar) return t.cloneNode(declar);
 
     const generator = this.get("helperGenerator");
-    const runtime = this.get("helpersNamespace");
     if (generator) {
       const res = generator(name);
       if (res) return res;
-    } else if (runtime) {
-      return t.memberExpression(t.cloneNode(runtime), t.identifier(name));
     }
 
     const uid = (this.declarations[name] = this.scope.generateUidIdentifier(

packages/babel-core/src/transformation/file/merge-map.js

@@ -293,7 +293,7 @@ function findInsertionLocation<T>(
   // Ensure the value is the start of any set of matches.
   let i = left;
   if (i < array.length) {
-    while (i > 0 && callback(array[i]) >= 0) {
+    while (i >= 0 && callback(array[i]) >= 0) {
       i--;
     }
     return i + 1;

packages/babel-core/src/transformation/normalize-file.js

@@ -2,6 +2,7 @@
 
 import path from "path";
 import buildDebug from "debug";
+import cloneDeep from "lodash/cloneDeep";
 import * as t from "@babel/types";
 import type { PluginPasses } from "../config";
 import convertSourceMap, { typeof Converter } from "convert-source-map";
@@ -75,6 +76,7 @@ export default function normalizeFile(
     } else if (ast.type !== "File") {
       throw new Error("AST root must be a Program or File node");
     }
+    ast = cloneDeep(ast);
   } else {
     // The parser's AST types aren't fully compatible with the types generated
     // by the logic in babel-types.

packages/babel-core/src/transformation/plugin-pass.js

@@ -31,6 +31,10 @@ export default class PluginPass {
     return this._map.get(key);
   }
 
+  availableHelper(name: string, versionRange: ?string) {
+    return this.file.availableHelper(name, versionRange);
+  }
+
   addHelper(name: string) {
     return this.file.addHelper(name);
   }

packages/babel-core/test/api.js

@@ -5,11 +5,18 @@ import Plugin from "../lib/config/plugin";
 import generator from "@babel/generator";
 
 function assertIgnored(result) {
-  expect(result).toBeFalsy();
+  expect(result).toBeNull();
 }
 
 function assertNotIgnored(result) {
-  expect(result.ignored).toBeFalsy();
+  expect(result).not.toBeNull();
+}
+
+function parse(code, opts) {
+  return babel.parse(code, {
+    cwd: __dirname,
+    ...opts,
+  });
 }
 
 function transform(code, opts) {
@@ -36,13 +43,18 @@ function transformFileSync(filename, opts) {
   });
 }
 
-// shim
 function transformAsync(code, opts) {
-  return {
-    then: function(resolve) {
-      resolve(transform(code, opts));
-    },
-  };
+  return babel.transformAsync(code, {
+    cwd: __dirname,
+    ...opts,
+  });
+}
+
+function transformFromAst(ast, code, opts) {
+  return babel.transformFromAst(ast, code, {
+    cwd: __dirname,
+    ...opts,
+  });
 }
 
 describe("parser and generator options", function() {
@@ -170,6 +182,30 @@ describe("api", function() {
     expect(options).toEqual({ babelrc: false });
   });
 
+  it("transformFromAst should not mutate the AST", function() {
+    const program = "const identifier = 1";
+    const node = parse(program);
+    const { code } = transformFromAst(node, program, {
+      plugins: [
+        function() {
+          return {
+            visitor: {
+              Identifier: function(path) {
+                path.node.name = "replaced";
+              },
+            },
+          };
+        },
+      ],
+    });
+
+    expect(code).toBe("const replaced = 1;");
+    expect(node.program.body[0].declarations[0].id.name).toBe(
+      "identifier",
+      "original ast should not have been mutated",
+    );
+  });
+
   it("options throw on falsy true", function() {
     return expect(function() {
       transform("", {

packages/babel-core/test/config-chain.js

@@ -899,6 +899,23 @@ describe("buildConfigChain", function() {
 
       expect(opts.comments).toBe(true);
     });
+
+    it("should remove the overrides and filtering fields from the options", () => {
+      const opts = loadOptions({
+        cwd: fixture("nonexistant-fake"),
+        filename: fixture("nonexistant-fake", "src.js"),
+        babelrc: false,
+        overrides: [],
+        test: /^/,
+        include: /^/,
+        exclude: [],
+      });
+
+      expect(opts.overrides).toBeUndefined();
+      expect(opts.test).toBeUndefined();
+      expect(opts.include).toBeUndefined();
+      expect(opts.exclude).toBeUndefined();
+    });
   });
 
   describe("config files", () => {

packages/babel-core/test/config-loading.js

@@ -1,4 +1,4 @@
-import loadConfig from "../lib/config";
+import loadConfig, { loadPartialConfig } from "../lib/config";
 import path from "path";
 
 describe("@babel/core config loading", () => {
@@ -29,13 +29,53 @@ describe("@babel/core config loading", () => {
       filename: FILEPATH,
       presets: skipProgrammatic
         ? null
-        : [require("./fixtures/config-loading/preset3")],
+        : [[require("./fixtures/config-loading/preset3"), {}]],
       plugins: skipProgrammatic
         ? null
-        : [require("./fixtures/config-loading/plugin6")],
+        : [[require("./fixtures/config-loading/plugin6"), {}]],
     };
   }
 
+  describe("loadPartialConfig", () => {
+    it("should preserve disabled plugins in the partial config", () => {
+      const plugin = function() {
+        return {};
+      };
+
+      const opts = loadPartialConfig({
+        ...makeOpts(true),
+        babelrc: false,
+        configFile: false,
+        plugins: [[plugin, false]],
+      });
+
+      expect(opts.options.plugins.length).toBe(1);
+      const item = opts.options.plugins[0];
+
+      expect(item.value).toBe(plugin);
+      expect(item.options).toBe(false);
+    });
+
+    it("should preserve disabled presets in the partial config", () => {
+      const preset = function() {
+        return {};
+      };
+
+      const opts = loadPartialConfig({
+        ...makeOpts(true),
+        babelrc: false,
+        configFile: false,
+        presets: [[preset, false]],
+      });
+
+      expect(opts.options.presets.length).toBe(1);
+      const item = opts.options.presets[0];
+
+      expect(item.value).toBe(preset);
+      expect(item.options).toBe(false);
+    });
+  });
+
   describe("config file", () => {
     it("should load and cache the config with plugins and presets", () => {
       const opts = makeOpts();
@@ -173,7 +213,7 @@ describe("@babel/core config loading", () => {
       }
     });
 
-    it("should invalidate the plugins when given a fresh arrays", () => {
+    it("should not invalidate the plugins when given a fresh arrays", () => {
       const opts = makeOpts();
 
       const options1 = loadConfig(opts).options;
@@ -184,6 +224,38 @@ describe("@babel/core config loading", () => {
       }).options;
       expect(options2.plugins.length).toBe(options1.plugins.length);
 
+      for (let i = 0; i < options2.plugins.length; i++) {
+        expect(options2.plugins[i]).toBe(options1.plugins[i]);
+      }
+    });
+
+    it("should not invalidate the presets when given a fresh arrays", () => {
+      const opts = makeOpts();
+
+      const options1 = loadConfig(opts).options;
+
+      const options2 = loadConfig({
+        ...opts,
+        presets: opts.presets.slice(),
+      }).options;
+      expect(options2.plugins.length).toBe(options1.plugins.length);
+
+      for (let i = 0; i < options2.plugins.length; i++) {
+        expect(options2.plugins[i]).toBe(options1.plugins[i]);
+      }
+    });
+
+    it("should invalidate the plugins when given a fresh options", () => {
+      const opts = makeOpts();
+
+      const options1 = loadConfig(opts).options;
+
+      const options2 = loadConfig({
+        ...opts,
+        plugins: opts.plugins.map(([plg, opt]) => [plg, { ...opt }]),
+      }).options;
+      expect(options2.plugins.length).toBe(options1.plugins.length);
+
       for (let i = 0; i < options2.plugins.length; i++) {
         if (i === 2) {
           expect(options2.plugins[i]).not.toBe(options1.plugins[i]);
@@ -193,14 +265,14 @@ describe("@babel/core config loading", () => {
       }
     });
 
-    it("should invalidate the presets when given a fresh arrays", () => {
+    it("should invalidate the presets when given a fresh options", () => {
       const opts = makeOpts();
 
       const options1 = loadConfig(opts).options;
 
       const options2 = loadConfig({
         ...opts,
-        presets: opts.presets.slice(),
+        presets: opts.presets.map(([plg, opt]) => [plg, { ...opt }]),
       }).options;
       expect(options2.plugins.length).toBe(options1.plugins.length);
 
@@ -251,4 +323,51 @@ describe("@babel/core config loading", () => {
       }
     });
   });
+
+  describe("caller metadata", () => {
+    it("should pass caller data through", () => {
+      const options1 = loadConfig({
+        ...makeOpts(),
+        caller: {
+          name: "babel-test",
+          someFlag: true,
+        },
+      }).options;
+
+      expect(options1.caller.name).toBe("babel-test");
+      expect(options1.caller.someFlag).toBe(true);
+    });
+
+    it("should pass unknown caller data through", () => {
+      const options1 = loadConfig({
+        ...makeOpts(),
+        caller: undefined,
+      }).options;
+
+      expect(options1.caller).toBeUndefined();
+    });
+
+    it("should pass caller data to test functions", () => {
+      const options1 = loadConfig({
+        ...makeOpts(),
+        caller: {
+          name: "babel-test",
+          someFlag: true,
+        },
+        overrides: [
+          {
+            test: (filename, { caller }) => caller.name === "babel-test",
+            comments: false,
+          },
+          {
+            test: (filename, { caller }) => caller.name !== "babel-test",
+            ast: false,
+          },
+        ],
+      }).options;
+
+      expect(options1.comments).toBe(false);
+      expect(options1.ast).not.toBe(false);
+    });
+  });
 });

packages/babel-core/test/fixtures/parse/.babelrc

@@ -1,5 +1,5 @@
 {
-  "plugins": [
-    ["@babel/syntax-decorators", { "legacy": true }]
-  ]
+  "parserOpts": {
+  	"plugins": ["decorators-legacy"]
+  }
 }

packages/babel-core/test/fixtures/resolution/foo-org-paths/node_modules/@foo/thing-babel-plugin/index.js

@@ -0,0 +1,3 @@
+module.exports = function() {
+  return {};
+};

packages/babel-core/test/fixtures/resolution/foo-org-paths/node_modules/@foo/thing-babel-preset/index.js

@@ -0,0 +1,3 @@
+module.exports = function() {
+  return {};
+};

packages/babel-core/test/fixtures/resolution/foo-org-paths/node_modules/@foo/thing.babel-plugin-convert/index.js

@@ -0,0 +1,3 @@
+module.exports = function() {
+  return {};
+};

packages/babel-core/test/fixtures/resolution/foo-org-paths/node_modules/@foo/thing.babel-preset-convert/index.js

@@ -0,0 +1,3 @@
+module.exports = function() {
+  return {};
+};

packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json

@@ -1,7 +1,10 @@
 {
   "compact": false,
   "presets": [
-    "env",
-    ["stage-2", { "decoratorsLegacy": true }]
+    "env"
+  ],
+  "plugins": [
+    "external-helpers",
+    "proposal-object-rest-spread"
   ]
 }

packages/babel-core/test/fixtures/transformation/source-maps/arrow-function/source-mappings.json

@@ -1,7 +1,7 @@
 [{
   "original": {
     "line": 1,
-    "column": 13
+    "column": 14
   },
   "generated": {
     "line": 2,

packages/babel-core/test/fixtures/transformation/source-maps/full/source-map.json

@@ -6,6 +6,6 @@
     "map",
     "x"
   ],
-  "mappings": "AAAAA,IAAIC,GAAJ,CAAQ;AAAA,SAAKC,IAAIA,CAAT;AAAA,CAAR",
+  "mappings": "AAAAA,GAAG,CAACC,GAAJ,CAAQ,UAAAC,CAAC;AAAA,SAAIA,CAAC,GAAGA,CAAR;AAAA,CAAT",
   "sourcesContent": ["arr.map(x => x * x);"]
 }

packages/babel-core/test/fixtures/transformation/source-maps/inline/output.js

@@ -1,4 +1,4 @@
 arr.map(function (x) {
   return x * x;
 });
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzL2lubGluZS9pbnB1dC5qcyJdLCJuYW1lcyI6WyJhcnIiLCJtYXAiLCJ4Il0sIm1hcHBpbmdzIjoiQUFBQUEsSUFBSUMsR0FBSixDQUFRO0FBQUEsU0FBS0MsSUFBSUEsQ0FBVDtBQUFBLENBQVIiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIHgpOyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzL2lubGluZS9pbnB1dC5qcyJdLCJuYW1lcyI6WyJhcnIiLCJtYXAiLCJ4Il0sIm1hcHBpbmdzIjoiQUFBQUEsR0FBRyxDQUFDQyxHQUFKLENBQVEsVUFBQUMsQ0FBQztBQUFBLFNBQUlBLENBQUMsR0FBR0EsQ0FBUjtBQUFBLENBQVQiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIHgpOyJdfQ==

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map-complex/source-map.json

@@ -4,7 +4,7 @@
     "HelloWorld.vue"
   ],
   "names": [],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsFA;AACA,QAAA,YADA;;AAEA,SAAA;AACA,WAAA;AACA,WAAA;AADA,KAAA;AAGA;;AANA,C",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsFA;AACA,EAAA,IAAA,EAAA,YADA;;AAEA,EAAA,IAAA,GAAA;AACA,WAAA;AACA,MAAA,GAAA,EAAA;AADA,KAAA;AAGA;;AANA,C",
   "sourceRoot": "src/components",
   "sourcesContent": [
     "<template>\n  <div class=\"hello\">\n    <h1>{{ msg }}</h1>\n    <h2>Essential Links</h2>\n    <ul>\n      <li>\n        <a\n          href=\"https://vuejs.org\"\n          target=\"_blank\"\n        >\n          Core Docs\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"https://forum.vuejs.org\"\n          target=\"_blank\"\n        >\n          Forum\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"https://chat.vuejs.org\"\n          target=\"_blank\"\n        >\n          Community Chat\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"https://twitter.com/vuejs\"\n          target=\"_blank\"\n        >\n          Twitter\n        </a>\n      </li>\n      <br>\n      <li>\n        <a\n          href=\"http://vuejs-templates.github.io/webpack/\"\n          target=\"_blank\"\n        >\n          Docs for This Template\n        </a>\n      </li>\n    </ul>\n    <h2>Ecosystem</h2>\n    <ul>\n      <li>\n        <a\n          href=\"http://router.vuejs.org/\"\n          target=\"_blank\"\n        >\n          vue-router\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"http://vuex.vuejs.org/\"\n          target=\"_blank\"\n        >\n          vuex\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"http://vue-loader.vuejs.org/\"\n          target=\"_blank\"\n        >\n          vue-loader\n        </a>\n      </li>\n      <li>\n        <a\n          href=\"https://github.com/vuejs/awesome-vue\"\n          target=\"_blank\"\n        >\n          awesome-vue\n        </a>\n      </li>\n    </ul>\n  </div>\n</template>\n\n<script>\nexport default {\n  name: 'HelloWorld',\n  data () {\n    return {\n      msg: 'Welcome to Your Vue.js App'\n    }\n  }\n}\n</script>\n\n<!-- Add \"scoped\" attribute to limit CSS to this component only -->\n<style scoped>\nh1, h2 {\n  font-weight: normal;\n}\nul {\n  list-style-type: none;\n  padding: 0;\n}\nli {\n  display: inline-block;\n  margin: 0 10px;\n}\na {\n  color: #42b983;\n}\n</style>\n"

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map/source-map.json

@@ -1,5 +1,5 @@
 {
-  "mappings": "AAAA,IAAA,MAAU,Y;SAAM,C;AAAC,CAAjB",
+  "mappings": "AAAA,IAAA,GAAA,GAAU,Y;SAAM,C;AAAC,CAAjB",
   "names": [],
   "sources": ["original.js"],
   "sourcesContent": ["var foo = () => 4;"],

packages/babel-core/test/fixtures/transformation/source-maps/interpreter-directive-prefix/source-map.json

@@ -1,5 +1,5 @@
 {
-  "mappings": "AAAA;AAEAA,QAAQC,GAAR,CAAY,eAAZ",
+  "mappings": "AAAA;AAEAA,OAAO,CAACC,GAAR,CAAY,eAAZ",
   "names": [
     "console",
     "log"

packages/babel-core/test/parse.js

@@ -23,7 +23,9 @@ describe("parse", function() {
     const output = require(fixture("output.json"));
 
     const result = parse(input, {
-      parserOpts: { plugins: ["decorators"] },
+      parserOpts: {
+        plugins: [["decorators", { decoratorsBeforeExport: false }]],
+      },
       cwd: fixture(),
     });
     expect(JSON.parse(JSON.stringify(result))).toEqual(output);

packages/babel-core/test/resolution.js

@@ -134,6 +134,46 @@ describe("addon resolution", function() {
     });
   });
 
+  it("should find @foo scoped presets with an inner babel-preset", function() {
+    process.chdir("foo-org-paths");
+
+    babel.transform("", {
+      filename: "filename.js",
+      babelrc: false,
+      presets: ["@foo/thing.babel-preset-convert"],
+    });
+  });
+
+  it("should find @foo scoped plugins with an inner babel-plugin", function() {
+    process.chdir("foo-org-paths");
+
+    babel.transform("", {
+      filename: "filename.js",
+      babelrc: false,
+      plugins: ["@foo/thing.babel-plugin-convert"],
+    });
+  });
+
+  it("should find @foo scoped presets with an babel-preset suffix", function() {
+    process.chdir("foo-org-paths");
+
+    babel.transform("", {
+      filename: "filename.js",
+      babelrc: false,
+      presets: ["@foo/thing-babel-preset"],
+    });
+  });
+
+  it("should find @foo scoped plugins with an babel-plugin suffix", function() {
+    process.chdir("foo-org-paths");
+
+    babel.transform("", {
+      filename: "filename.js",
+      babelrc: false,
+      plugins: ["@foo/thing-babel-plugin"],
+    });
+  });
+
   it("should find @foo scoped presets with an existing prefix", function() {
     process.chdir("foo-org-paths");
 

packages/babel-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/generator",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Turns an AST into code.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -11,14 +11,14 @@
     "lib"
   ],
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53",
+    "@babel/types": "7.0.0-rc.2",
     "jsesc": "^2.5.1",
-    "lodash": "^4.17.5",
+    "lodash": "^4.17.10",
     "source-map": "^0.5.0",
     "trim-right": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/helper-fixtures": "7.0.0-beta.53",
-    "@babel/parser": "7.0.0-beta.53"
+    "@babel/helper-fixtures": "7.0.0-rc.2",
+    "@babel/parser": "7.0.0-rc.2"
   }
 }

packages/babel-generator/src/buffer.js

@@ -30,6 +30,7 @@ export default class Buffer {
     column: null,
     filename: null,
   };
+  _disallowedPop: Object | null = null;
 
   /**
    * Get the final string output from the buffer, along with the sourcemap if one exists.
@@ -71,8 +72,14 @@ export default class Buffer {
 
   append(str: string): void {
     this._flush();
-    const { line, column, filename, identifierName } = this._sourcePosition;
-    this._append(str, line, column, identifierName, filename);
+    const {
+      line,
+      column,
+      filename,
+      identifierName,
+      force,
+    } = this._sourcePosition;
+    this._append(str, line, column, identifierName, filename, force);
   }
 
   /**
@@ -87,8 +94,14 @@ export default class Buffer {
       }
     }
 
-    const { line, column, filename, identifierName } = this._sourcePosition;
-    this._queue.unshift([str, line, column, identifierName, filename]);
+    const {
+      line,
+      column,
+      filename,
+      identifierName,
+      force,
+    } = this._sourcePosition;
+    this._queue.unshift([str, line, column, identifierName, filename, force]);
   }
 
   _flush(): void {
@@ -102,6 +115,7 @@ export default class Buffer {
     column: number,
     identifierName: ?string,
     filename: ?string,
+    force?: boolean,
   ): void {
     // If there the line is ending, adding a new mapping marker is redundant
     if (this._map && str[0] !== "\n") {
@@ -112,6 +126,7 @@ export default class Buffer {
         column,
         identifierName,
         filename,
+        force,
       );
     }
 
@@ -169,20 +184,60 @@ export default class Buffer {
     return this._queue.length > 0 || !!this._last;
   }
 
+  /**
+   * Certain sourcemap usecases expect mappings to be more accurate than
+   * Babel's generic sourcemap handling allows. For now, we special-case
+   * identifiers to allow for the primary cases to work.
+   * The goal of this line is to ensure that the map output from Babel will
+   * have an exact range on identifiers in the output code. Without this
+   * line, Babel would potentially include some number of trailing tokens
+   * that are printed after the identifier, but before another location has
+   * been assigned.
+   * This allows tooling like Rollup and Webpack to more accurately perform
+   * their own transformations. Most importantly, this allows the import/export
+   * transformations performed by those tools to loose less information when
+   * applying their own transformations on top of the code and map results
+   * generated by Babel itself.
+   *
+   * The primary example of this is the snippet:
+   *
+   *   import mod from "mod";
+   *   mod();
+   *
+   * With this line, there will be one mapping range over "mod" and another
+   * over "();", where previously it would have been a single mapping.
+   */
+  exactSource(loc: Object, cb: () => void) {
+    // In cases where parent expressions start at the same locations as the
+    // identifier itself, the current active location could already be the
+    // start of this range. We use 'force' here to explicitly start a new
+    // mapping range for this new token.
+    this.source("start", loc, true /* force */);
+
+    cb();
+
+    // In cases where tokens are printed after this item, we want to
+    // ensure that they get the location of the _end_ of the identifier.
+    // To accomplish this, we assign the location and explicitly disable
+    // the standard Buffer withSource previous-position "reactivation"
+    // logic. This means that if another item calls '.source()' to set
+    // the location after the identifier, it is fine, but the position won't
+    // be automatically replaced with the previous value.
+    this.source("end", loc);
+    this._disallowPop("start", loc);
+  }
+
   /**
    * Sets a given position as the current source location so generated code after this call
    * will be given this position in the sourcemap.
    */
 
-  source(prop: string, loc: Location): void {
+  source(prop: string, loc: Location, force?: boolean): void {
     if (prop && !loc) return;
 
-    const pos = loc ? loc[prop] : null;
-
-    this._sourcePosition.identifierName = (loc && loc.identifierName) || null;
-    this._sourcePosition.line = pos ? pos.line : null;
-    this._sourcePosition.column = pos ? pos.column : null;
-    this._sourcePosition.filename = (loc && loc.filename) || null;
+    // Since this is called extremly often, we re-use the same _sourcePosition
+    // object for the whole lifetime of the buffer.
+    this._normalizePosition(prop, loc, this._sourcePosition, force);
   }
 
   /**
@@ -192,7 +247,9 @@ export default class Buffer {
   withSource(prop: string, loc: Location, cb: () => void): void {
     if (!this._map) return cb();
 
-    // Use the call stack to manage a stack of "source location" data.
+    // Use the call stack to manage a stack of "source location" data because
+    // the _sourcePosition object is mutated over the course of code generation,
+    // and constantly copying it would be slower.
     const originalLine = this._sourcePosition.line;
     const originalColumn = this._sourcePosition.column;
     const originalFilename = this._sourcePosition.filename;
@@ -202,10 +259,79 @@ export default class Buffer {
 
     cb();
 
-    this._sourcePosition.line = originalLine;
-    this._sourcePosition.column = originalColumn;
-    this._sourcePosition.filename = originalFilename;
-    this._sourcePosition.identifierName = originalIdentifierName;
+    if (
+      // If the current active position is forced, we only want to reactivate
+      // the old position if it is different from the newest position.
+      (!this._sourcePosition.force ||
+        this._sourcePosition.line !== originalLine ||
+        this._sourcePosition.column !== originalColumn ||
+        this._sourcePosition.filename !== originalFilename) &&
+      // Verify if reactivating this specific position has been disallowed.
+      (!this._disallowedPop ||
+        this._disallowedPop.line !== originalLine ||
+        this._disallowedPop.column !== originalColumn ||
+        this._disallowedPop.filename !== originalFilename)
+    ) {
+      this._sourcePosition.line = originalLine;
+      this._sourcePosition.column = originalColumn;
+      this._sourcePosition.filename = originalFilename;
+      this._sourcePosition.identifierName = originalIdentifierName;
+      this._sourcePosition.force = false;
+      this._disallowedPop = null;
+    }
+  }
+
+  /**
+   * Allow printers to disable the default location-reset behavior of the
+   * sourcemap output, so that certain printers can be sure that the
+   * "end" location that they set is actually treated as the end position.
+   */
+  _disallowPop(prop: string, loc: Location) {
+    if (prop && !loc) return;
+
+    this._disallowedPop = this._normalizePosition(prop, loc);
+  }
+
+  _normalizePosition(
+    prop: string,
+    loc: Object,
+    targetObj: Object,
+    force?: boolean,
+  ) {
+    const pos = loc ? loc[prop] : null;
+
+    if (targetObj === undefined) {
+      // Initialize with fields so that the object doesn't change shape.
+      targetObj = {
+        identifierName: null,
+        line: null,
+        column: null,
+        filename: null,
+        force: false,
+      };
+    }
+
+    const origLine = targetObj.line;
+    const origColumn = targetObj.column;
+    const origFilename = targetObj.filename;
+
+    targetObj.identifierName =
+      (prop === "start" && loc && loc.identifierName) || null;
+    targetObj.line = pos ? pos.line : null;
+    targetObj.column = pos ? pos.column : null;
+    targetObj.filename = (loc && loc.filename) || null;
+
+    // We want to skip reassigning `force` if we're re-setting the same position.
+    if (
+      force ||
+      targetObj.line !== origLine ||
+      targetObj.column !== origColumn ||
+      targetObj.filename !== origFilename
+    ) {
+      targetObj.force = force;
+    }
+
+    return targetObj;
   }
 
   getCurrentColumn(): number {

packages/babel-generator/src/generators/classes.js

@@ -124,6 +124,7 @@ export function ClassPrivateProperty(node: Object) {
     this.space();
   }
   this.print(node.key, node);
+  this.print(node.typeAnnotation, node);
   if (node.value) {
     this.space();
     this.token("=");

packages/babel-generator/src/generators/template-literals.js

@@ -1,5 +1,6 @@
 export function TaggedTemplateExpression(node: Object) {
   this.print(node.tag, node);
+  this.print(node.typeParameters, node); // TS
   this.print(node.quasi, node);
 }
 

packages/babel-generator/src/generators/types.js

@@ -2,7 +2,9 @@ import * as t from "@babel/types";
 import jsesc from "jsesc";
 
 export function Identifier(node: Object) {
-  this.word(node.name);
+  this.exactSource(node.loc, () => {
+    this.word(node.name);
+  });
 }
 
 export function RestElement(node: Object) {

packages/babel-generator/src/printer.js

@@ -200,6 +200,12 @@ export default class Printer {
     this._buf.removeTrailingNewline();
   }
 
+  exactSource(loc: Object, cb: () => void) {
+    this._catchUp("start", loc);
+
+    this._buf.exactSource(loc, cb);
+  }
+
   source(prop: string, loc: Object): void {
     this._catchUp(prop, loc);
 

packages/babel-generator/src/source-map.js

@@ -53,6 +53,7 @@ export default class SourceMap {
     column: number,
     identifierName: ?string,
     filename: ?string,
+    force?: boolean,
   ) {
     // Adding an empty mapping at the start of a generated line just clutters the map.
     if (this._lastGenLine !== generatedLine && line === null) return;
@@ -60,6 +61,7 @@ export default class SourceMap {
     // If this mapping points to the same source location as the last one, we can ignore it since
     // the previous one covers it.
     if (
+      !force &&
       this._lastGenLine === generatedLine &&
       this._lastSourceLine === line &&
       this._lastSourceColumn === column

packages/babel-generator/test/fixtures/flow/type-annotations/input.js

@@ -72,6 +72,10 @@ class Foo {
   static prop1: string;
   prop2: number;
 }
+class Foo {
+  #prop1: string;
+  prop2: number;
+}
 var x: number | string = 4;
 class Array { concat(items:number | string) {}; }
 var x: () => number | () => string = fn;

packages/babel-generator/test/fixtures/flow/type-annotations/options.json

@@ -0,0 +1 @@
+{ "plugins": ["classPrivateProperties", "flow"] }

packages/babel-generator/test/fixtures/flow/type-annotations/output.js

@@ -168,6 +168,11 @@ class Foo {
   prop2: number;
 }
 
+class Foo {
+  #prop1: string;
+  prop2: number;
+}
+
 var x: number | string = 4;
 
 class Array {

packages/babel-generator/test/fixtures/sourcemaps/call-identifiers/input.js

@@ -0,0 +1,16 @@
+foo;
+foo();
+foo().bar;
+obj.foo;
+obj.foo();
+obj.foo.bar;
+obj.foo().bar;
+{
+  foo;
+  foo();
+  foo().bar;
+  obj.foo;
+  obj.foo();
+  obj.foo.bar;
+  obj.foo().bar;
+}

packages/babel-generator/test/fixtures/sourcemaps/call-identifiers/output.js

@@ -0,0 +1,16 @@
+foo;
+foo();
+foo().bar;
+obj.foo;
+obj.foo();
+obj.foo.bar;
+obj.foo().bar;
+{
+  foo;
+  foo();
+  foo().bar;
+  obj.foo;
+  obj.foo();
+  obj.foo.bar;
+  obj.foo().bar;
+}

packages/babel-generator/test/fixtures/sourcemaps/call-identifiers/source-map.json

@@ -0,0 +1,9 @@
+{
+  "mappings": "AAAAA,GAAG;AACHA,GAAG;AACHA,GAAG,GAAGC,GAAN;AACAC,GAAG,CAACF,GAAJ;AACAE,GAAG,CAACF,GAAJ;AACAE,GAAG,CAACF,GAAJ,CAAQC,GAAR;AACAC,GAAG,CAACF,GAAJ,GAAUC,GAAV;AACA;AACED,EAAAA,GAAG;AACHA,EAAAA,GAAG;AACHA,EAAAA,GAAG,GAAGC,GAAN;AACAC,EAAAA,GAAG,CAACF,GAAJ;AACAE,EAAAA,GAAG,CAACF,GAAJ;AACAE,EAAAA,GAAG,CAACF,GAAJ,CAAQC,GAAR;AACAC,EAAAA,GAAG,CAACF,GAAJ,GAAUC,GAAV;AACD",
+  "names": ["foo", "bar", "obj"],
+  "sources": ["fixtures/sourcemaps/call-identifiers/input.js"],
+  "sourcesContent": [
+    "foo;\nfoo();\nfoo().bar;\nobj.foo;\nobj.foo();\nobj.foo.bar;\nobj.foo().bar;\n{\n  foo;\n  foo();\n  foo().bar;\n  obj.foo;\n  obj.foo();\n  obj.foo.bar;\n  obj.foo().bar;\n}"
+  ],
+  "version": 3
+}

packages/babel-generator/test/fixtures/typescript/type-arguments-tagged-template/input.js

@@ -0,0 +1 @@
+f<T>``;

packages/babel-generator/test/fixtures/typescript/type-arguments-tagged-template/output.js

@@ -0,0 +1 @@
+f<T>``;

packages/babel-generator/test/index.js

@@ -49,7 +49,8 @@ describe("generation", function() {
         version: 3,
         sources: ["a.js", "b.js"],
         mappings:
-          "AAAA,SAASA,EAAT,CAAaC,GAAb,EAAkB;AAAEC,UAAQC,GAAR,CAAYF,GAAZ;AAAmB;;ACAvCD,GAAG,OAAH",
+          // eslint-disable-next-line max-len
+          "AAAA,SAASA,EAAT,CAAaC,GAAb,EAAkB;AAAEC,EAAAA,OAAO,CAACC,GAAR,CAAYF,GAAZ;AAAmB;;ACAvCD,EAAE,CAAC,OAAD,CAAF",
         names: ["hi", "msg", "console", "log"],
         sourcesContent: [
           "function hi (msg) { console.log(msg); }\n",
@@ -103,6 +104,18 @@ describe("generation", function() {
           source: "a.js",
           original: { line: 1, column: 20 },
         },
+        {
+          name: "console",
+          generated: { line: 2, column: 2 },
+          source: "a.js",
+          original: { line: 1, column: 20 },
+        },
+        {
+          name: undefined,
+          generated: { line: 2, column: 9 },
+          source: "a.js",
+          original: { line: 1, column: 27 },
+        },
         {
           name: "log",
           generated: { line: 2, column: 10 },
@@ -139,6 +152,12 @@ describe("generation", function() {
           source: "b.js",
           original: { line: 1, column: 0 },
         },
+        {
+          name: undefined,
+          generated: { line: 5, column: 2 },
+          source: "b.js",
+          original: { line: 1, column: 2 },
+        },
         {
           name: undefined,
           generated: { line: 5, column: 3 },
@@ -149,6 +168,12 @@ describe("generation", function() {
           name: undefined,
           generated: { line: 5, column: 10 },
           source: "b.js",
+          original: { line: 1, column: 2 },
+        },
+        {
+          name: undefined,
+          generated: { line: 5, column: 11 },
+          source: "b.js",
           original: { line: 1, column: 0 },
         },
       ],
@@ -189,7 +214,7 @@ describe("generation", function() {
         version: 3,
         sources: ["inline"],
         names: ["foo", "bar"],
-        mappings: "AAAA,SAASA,IAAT,GAAe;AAAEC;AAAM",
+        mappings: "AAAA,SAASA,IAAT,GAAe;AAAEC,EAAAA,IAAG;AAAG",
         sourcesContent: ["function foo() { bar; }\n"],
       },
       "sourcemap was incorrectly generated",
@@ -227,6 +252,18 @@ describe("generation", function() {
           source: "inline",
           original: { line: 1, column: 17 },
         },
+        {
+          name: "bar",
+          generated: { line: 2, column: 2 },
+          source: "inline",
+          original: { line: 1, column: 17 },
+        },
+        {
+          name: undefined,
+          generated: { line: 2, column: 6 },
+          source: "inline",
+          original: { line: 1, column: 20 },
+        },
         {
           name: undefined,
           generated: { line: 3, column: 0 },
@@ -362,36 +399,49 @@ const suites = fixtures(`${__dirname}/fixtures`);
 suites.forEach(function(testSuite) {
   describe("generation/" + testSuite.title, function() {
     testSuite.tests.forEach(function(task) {
-      it(
+      const testFn = task.disabled ? it.skip : it;
+
+      testFn(
         task.title,
-        !task.disabled &&
-          function() {
-            const expected = task.expect;
-            const actual = task.actual;
-            const actualCode = actual.code;
 
-            if (actualCode) {
-              const actualAst = parse(actualCode, {
-                filename: actual.loc,
-                plugins: task.options.plugins || [],
-                strictMode: false,
-                sourceType: "module",
-              });
-              const result = generate(actualAst, task.options, actualCode);
+        function() {
+          const expected = task.expect;
+          const actual = task.actual;
+          const actualCode = actual.code;
 
-              if (
-                !expected.code &&
-                result.code &&
-                fs.statSync(path.dirname(expected.loc)).isDirectory() &&
-                !process.env.CI
-              ) {
-                console.log(`New test file created: ${expected.loc}`);
-                fs.writeFileSync(expected.loc, result.code);
-              } else {
-                expect(result.code).toBe(expected.code);
-              }
+          if (actualCode) {
+            const actualAst = parse(actualCode, {
+              filename: actual.loc,
+              plugins: task.options.plugins || [],
+              strictMode: false,
+              sourceType: "module",
+              sourceMaps: !!task.sourceMap,
+            });
+            const options = {
+              sourceFileName: path.relative(__dirname, actual.loc),
+              ...task.options,
+              sourceMaps: task.sourceMap ? true : task.options.sourceMaps,
+            };
+
+            const result = generate(actualAst, options, actualCode);
+
+            if (options.sourceMaps) {
+              expect(result.map).toEqual(task.sourceMap);
             }
-          },
+
+            if (
+              !expected.code &&
+              result.code &&
+              fs.statSync(path.dirname(expected.loc)).isDirectory() &&
+              !process.env.CI
+            ) {
+              console.log(`New test file created: ${expected.loc}`);
+              fs.writeFileSync(expected.loc, result.code);
+            } else {
+              expect(result.code).toBe(expected.code);
+            }
+          }
+        },
       );
     });
   });

packages/babel-helper-annotate-as-pure/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@babel/helper-annotate-as-pure",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to annotate paths and nodes with #__PURE__ comment",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-annotate-as-pure",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-bindify-decorators/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@babel/helper-bindify-decorators",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to bindify decorators",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-bindify-decorators",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/traverse": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/traverse": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-builder-binary-assignment-operator-visitor/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@babel/helper-builder-binary-assignment-operator-visitor",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to build binary assignment operator visitors",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-builder-binary-assignment-operator-visitor",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-explode-assignable-expression": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/helper-explode-assignable-expression": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-builder-react-jsx/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@babel/helper-builder-react-jsx",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to build react jsx",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-builder-react-jsx",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53",
+    "@babel/types": "7.0.0-rc.2",
     "esutils": "^2.0.0"
   }
 }

packages/babel-helper-call-delegate/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@babel/helper-call-delegate",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to call delegate",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-hoist-variables": "7.0.0-beta.53",
-    "@babel/traverse": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/helper-hoist-variables": "7.0.0-rc.2",
+    "@babel/traverse": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-define-map/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@babel/helper-define-map",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to define a map",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-define-map",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-function-name": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53",
-    "lodash": "^4.17.5"
+    "@babel/helper-function-name": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2",
+    "lodash": "^4.17.10"
   }
 }

packages/babel-helper-explode-assignable-expression/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@babel/helper-explode-assignable-expression",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to explode an assignable expression",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-explode-assignable-expression",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/traverse": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/traverse": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-explode-class/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@babel/helper-explode-class",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to explode class",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-explode-class",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-bindify-decorators": "7.0.0-beta.53",
-    "@babel/traverse": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/helper-bindify-decorators": "7.0.0-rc.2",
+    "@babel/traverse": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-fixtures/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@babel/helper-fixtures",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to support fixtures",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "license": "MIT",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-fixtures",
   "main": "lib/index.js",
   "dependencies": {
-    "lodash": "^4.17.5",
+    "lodash": "^4.17.10",
     "semver": "^5.3.0",
     "try-resolve": "^1.0.0"
   }

packages/babel-helper-function-name/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@babel/helper-function-name",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to change the property 'name' of every function",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-function-name",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-get-function-arity": "7.0.0-beta.53",
-    "@babel/template": "7.0.0-beta.53",
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/helper-get-function-arity": "7.0.0-rc.2",
+    "@babel/template": "7.0.0-rc.2",
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-get-function-arity/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@babel/helper-get-function-arity",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to get function arity",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-hoist-variables/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@babel/helper-hoist-variables",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to hoist variables",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-hoist-variables",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-member-expression-to-functions/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@babel/helper-member-expression-to-functions",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Helper function to replace certain member expressions with function calls",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-member-expression-to-functions",
   "license": "MIT",
   "main": "lib/index.js",
   "author": "Justin Ridgewell <justin@ridgewell.name>",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53"
+    "@babel/types": "7.0.0-rc.2"
   }
 }

packages/babel-helper-module-imports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-module-imports",
-  "version": "7.0.0-beta.53",
+  "version": "7.0.0-rc.2",
   "description": "Babel helper functions for inserting module loads",
   "author": "Logan Smyth <loganfsmyth@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -8,10 +8,9 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-module-imports",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.53",
-    "lodash": "^4.17.5"
+    "@babel/types": "7.0.0-rc.2"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.53"
+    "@babel/core": "7.0.0-rc.2"
   }
 }