v7.0.0-beta.44

Remove setting BABEL_ENV to test by default in makefile

.babelrc.js

@@ -1,63 +1,80 @@
 "use strict";
 
-// Blame Logan for this.
-// This works around https://github.com/istanbuljs/istanbuljs/issues/92 until
-// we have a version of Istanbul that actually works with 7.x.
-function istanbulHacks() {
-  return {
-    inherits: require("babel-plugin-istanbul").default,
-    visitor: {
-      Program: {
-        exit: function(path) {
-          if (!this.__dv__) return
+module.exports = function(api) {
+  const env = api.env();
 
-          const node = path.node.body[0];
-          if (
-            node.type !== "VariableDeclaration" ||
-            node.declarations[0].id.type !== "Identifier" ||
-            !node.declarations[0].id.name.match(/cov_/) ||
-            node._blockHoist !== 3
-          ) {
-            throw new Error("Something has gone wrong in Logan's hacks.");
-          }
+  const includeCoverage = process.env.BABEL_COVERAGE === "true";
 
-          // Gross hacks to put the code coverage block above all compiled
-          // import statement output.
-          node._blockHoist = 5;
-        },
+  const envOpts = {
+    loose: true,
+    modules: false,
+    exclude: ["transform-typeof-symbol"],
+  };
+
+  let convertESM = true;
+
+  switch (env) {
+    // Configs used during bundling builds.
+    case "babylon":
+    case "standalone":
+      convertESM = false;
+      break;
+    case "production":
+      // Config during builds before publish.
+      break;
+    case "development":
+      envOpts.debug = true;
+      envOpts.targets = {
+        node: "current",
+      };
+      break;
+    case "test":
+      envOpts.targets = {
+        node: "current",
+      };
+      break;
+  }
+
+  const config = {
+    comments: false,
+    presets: [["@babel/env", envOpts]],
+    plugins: [
+      // TODO: Use @babel/preset-flow when
+      // https://github.com/babel/babel/issues/7233 is fixed
+      "@babel/plugin-transform-flow-strip-types",
+      ["@babel/proposal-class-properties", { loose: true }],
+      "@babel/proposal-export-namespace-from",
+      "@babel/proposal-numeric-separator",
+      ["@babel/proposal-object-rest-spread", { useBuiltIns: true }],
+
+      // Explicitly use the lazy version of CommonJS modules.
+      convertESM ? ["@babel/transform-modules-commonjs", { lazy: true }] : null,
+    ].filter(Boolean),
+    overrides: [
+      {
+        test: "packages/babylon",
+        plugins: [
+          "babel-plugin-transform-charcodes",
+          ["@babel/transform-for-of", { assumeArray: true }],
+        ],
       },
-    },
+      {
+        test: "./packages/babel-register",
+        plugins: [
+          // Override the root options to disable lazy imports for babel-register
+          // because otherwise the require hook will try to lazy-import things
+          // leading to dependency cycles.
+          convertESM ? "@babel/transform-modules-commonjs" : null,
+        ].filter(Boolean),
+      },
+    ],
   };
-}
 
-let envOpts = {
-  loose: true,
+  // we need to do this as long as we do not test everything from source
+  if (includeCoverage) {
+    config.auxiliaryCommentBefore = "istanbul ignore next";
+    config.plugins.push("babel-plugin-istanbul");
+  }
+
+  return config;
 };
-
-const config = {
-  comments: false,
-  presets: [
-    ["@babel/env", envOpts],
-    "@babel/flow"
-  ],
-  plugins: [
-    ["@babel/proposal-class-properties", { loose: true }],
-    "@babel/proposal-export-namespace-from",
-    "@babel/proposal-numeric-separator",
-    ["@babel/proposal-object-rest-spread", { useBuiltIns: true }],
-  ]
-};
-
-if (process.env.BABEL_ENV === "cov") {
-  config.auxiliaryCommentBefore = "istanbul ignore next";
-  config.plugins.push(istanbulHacks);
-}
-
-if (process.env.BABEL_ENV === "development") {
-  envOpts.targets = {
-    node: "current"
-  };
-  envOpts.debug = true;
-}
-
-module.exports = config;

.circleci/config.yml

@@ -0,0 +1,61 @@
+version: 2
+aliases:
+  - &restore-node-modules-cache
+    keys:
+      - v1-yarn-deps-{{ checksum "yarn.lock" }}
+
+  - &restore-yarn-cache
+    keys:
+      - v1-yarn-cache
+
+  - &save-node-modules-cache
+    paths:
+      - node_modules
+    key: v1-yarn-deps-{{ checksum "yarn.lock" }}
+
+  - &save-yarn-cache
+    paths:
+      - ~/.yarn-cache
+    key: v1-yarn-cache
+
+  - &yarn-install
+    run: |
+      sudo npm i -g yarn@^1.5.1
+      yarn --version
+
+  - &artifact_babel
+    path: ~/babel/packages/babel-standalone/babel.js
+
+  - &artifact_babel_min
+    path: ~/babel/packages/babel-standalone/babel.min.js
+
+  - &artifact_env
+    path: ~/babel/packages/babel-preset-env-standalone/babel-preset-env.js
+
+  - &artifact_env_min
+    path: ~/babel/packages/babel-preset-env-standalone/babel-preset-env.min.js
+
+jobs:
+  build:
+    working_directory: ~/babel
+    docker:
+      - image: circleci/node:9
+    steps:
+      - checkout
+      - restore-cache: *restore-yarn-cache
+      - restore-cache: *restore-node-modules-cache
+      - *yarn-install
+      - run: make test-ci-coverage
+      # Builds babel-standalone with the regular Babel config
+      - run: make build
+      # test-ci-coverage doesn't test babel-standalone, as trying to gather coverage
+      # data for a JS file that's several megabytes large is bound to fail. Here,
+      # we just run the babel-standalone test separately.
+      - run: ./node_modules/.bin/jest packages/babel-standalone/test/
+      - run: ./node_modules/.bin/jest packages/babel-preset-env-standalone/test/
+      - store_artifacts: *artifact_babel
+      - store_artifacts: *artifact_babel_min
+      - store_artifacts: *artifact_env
+      - store_artifacts: *artifact_env_min
+      - save_cache: *save-node-modules-cache
+      - save_cache: *save-yarn-cache

.eslintignore

@@ -1,4 +1,6 @@
 /lib
+/build
+package.json
 packages/babel-runtime
 !packages/babel-runtime/scripts
 !packages/babel-runtime/core-js.js
@@ -18,5 +20,4 @@ packages/babel-preset-env-standalone/babel-preset-env.js
 packages/babel-preset-env-standalone/babel-preset-env.min.js
 packages/babel-standalone/babel.js
 packages/babel-standalone/babel.min.js
-packages/babylon/build
 packages/babylon/test/expressions

.eslintrc.json

@@ -1,8 +1,7 @@
 {
+  "root": true,
   "extends": "babel",
-  "plugins": [
-    "prettier"
-  ],
+  "plugins": ["prettier"],
   "rules": {
     "curly": ["error", "multi-line"],
     "prettier/prettier": "error",
@@ -13,22 +12,21 @@
   },
   "overrides": [
     {
-      "files": [
-        "packages/*/src/**/*.js",
-        "codemods/*/src/**/*.js"
-      ],
+      "files": ["packages/*/src/**/*.js", "codemods/*/src/**/*.js"],
       "rules": {
-        "no-undefined-identifier": "error"
+        "no-undefined-identifier": "error",
+        "no-deprecated-clone": "error"
       }
     },
     {
       "files": [
         "packages/*/test/**/*.js",
         "codemods/*/test/**/*.js",
+        "packages/babel-helper-transform-fixture-test-runner/src/helpers.js",
         "test/**/*.js"
       ],
       "env": {
-        "mocha": true
+        "jest": true
       }
     }
   ]

.flowconfig

@@ -13,8 +13,8 @@ codemods/*/src
 [libs]
 lib/file.js
 lib/parser.js
-lib/packages/babel-types/lib/index.js.flow
 lib/third-party-libs.js.flow
+packages/babel-types/lib/index.js.flow
 
 [options]
 include_warnings=true

.gitignore

@@ -16,15 +16,19 @@ package-lock.json
 !/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-register/test/.babel
 /packages/babel-cli/test/tmp

.prettierignore

@@ -0,0 +1 @@
+package.json

.prettierrc

@@ -1,5 +1,14 @@
 {
+  "arrowParens": "avoid",
   "trailingComma": "es5",
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "tabWidth": 2,
+  "parser": "babylon",
+  "printWidth": 80,
   "overrides": [{
     "files": [
       "**/codemods/*/src/**/*.js",

.travis.yml

@@ -7,6 +7,7 @@ cache:
   directories:
   - node_modules
 node_js:
+  # We test the latest version on circleci
   - '8'
   - '6'
   - '4'
@@ -19,6 +20,8 @@ env:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
 
+install: yarn --ignore-engines
+
 before_script:
   - 'if [ "$JOB" = "babylon-flow-tests" ]; then make bootstrap-flow; fi'
   - 'if [ "$JOB" = "babylon-test262-tests" ]; then make bootstrap-test262; fi'

CONTRIBUTING.md

@@ -116,7 +116,7 @@ $ TEST_ONLY=babel-cli make test
 
 ```sh
 # Run tests for the @babel/plugin-transform-classes package.
-$ TEST_ONLY=es2015-class make test
+$ TEST_ONLY=babel-plugin-transform-classes make test
 ```
 
 Use the `TEST_GREP` variable to run a subset of tests by name:
@@ -175,7 +175,7 @@ For example, in [`@babel/plugin-transform-exponentiation-operator/test`](https:/
 
 - In each subfolder, you can organize your directory structure by categories of tests. (Example: these folders can be named after the feature you are testing or can reference the issue number they fix)
 - Generally, there are two kinds of tests for plugins
-   - The first is a simple test of the input and output produced by running Babel on some code. We do this by creating an [`input.js`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/binary/input.js) file and an [`output.js`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/binary/output.js) file.
+   - The first is a simple test of the input and output produced by running Babel on some code. We do this by creating an [`input.js`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/binary/input.js) file and an [`output.js`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/binary/output.js) file. This kind of test only works in sub-subdirectories of `/fixtures`, i.e. `/fixtures/exponentian-operator/binary/input.js` and **not** `/fixtures/exponentian-operator/input.js`.
    - 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.
 
@@ -234,7 +234,7 @@ descriptive name, and add the following:
 After writing tests for babylon, just build it by running:
 
 ```sh
-$ make build-babylon
+$ make build
 ```
 
 Then, to run the tests, use:

Gulpfile.js

@@ -12,6 +12,11 @@ const gulp = require("gulp");
 const path = require("path");
 const webpack = require("webpack");
 const merge = require("merge-stream");
+const rollup = require("rollup-stream");
+const source = require("vinyl-source-stream");
+const buffer = require("vinyl-buffer");
+const rollupBabel = require("rollup-plugin-babel");
+const rollupNodeResolve = require("rollup-plugin-node-resolve");
 const registerStandalonePackageTask = require("./scripts/gulp-tasks")
   .registerStandalonePackageTask;
 
@@ -27,53 +32,101 @@ function getGlobFromSource(source) {
   return `./${source}/*/src/**/*.js`;
 }
 
-gulp.task("default", ["build"]);
+function getIndexFromPackage(name) {
+  return `${name}/src/index.js`;
+}
 
-gulp.task("build", function() {
+function compilationLogger(rollup) {
+  return through.obj(function(file, enc, callback) {
+    gutil.log(
+      `Compiling '${chalk.cyan(file.relative)}'${
+        rollup ? " with rollup " : ""
+      }...`
+    );
+    callback(null, file);
+  });
+}
+
+function errorsLogger() {
+  return plumber({
+    errorHandler(err) {
+      gutil.log(err.stack);
+    },
+  });
+}
+
+function rename(fn) {
+  return through.obj(function(file, enc, callback) {
+    file.path = fn(file);
+    callback(null, file);
+  });
+}
+
+function buildBabel(exclude) {
   return merge(
     sources.map(source => {
       const base = path.join(__dirname, source);
-      const f = filter(["**", "!**/packages/babylon/**"]);
 
-      return gulp
-        .src(getGlobFromSource(source), { base: base })
-        .pipe(f)
-        .pipe(
-          plumber({
-            errorHandler: function(err) {
-              gutil.log(err.stack);
-            },
-          })
-        )
-        .pipe(
-          newer({
-            dest: base,
-            map: swapSrcWithLib,
-          })
-        )
-        .pipe(
-          through.obj(function(file, enc, callback) {
-            gutil.log("Compiling", "'" + chalk.cyan(file.relative) + "'...");
-            callback(null, file);
-          })
-        )
+      let stream = gulp.src(getGlobFromSource(source), { base: base });
+
+      if (exclude) {
+        const filters = exclude.map(p => `!**/${p}/**`);
+        filters.unshift("**");
+        stream = stream.pipe(filter(filters));
+      }
+
+      return stream
+        .pipe(errorsLogger())
+        .pipe(newer({ dest: base, map: swapSrcWithLib }))
+        .pipe(compilationLogger())
         .pipe(babel())
         .pipe(
-          through.obj(function(file, enc, callback) {
-            // Passing 'file.relative' because newer() above uses a relative
-            // path and this keeps it consistent.
-            file.path = path.resolve(file.base, swapSrcWithLib(file.relative));
-            callback(null, file);
-          })
+          // Passing 'file.relative' because newer() above uses a relative
+          // path and this keeps it consistent.
+          rename(file => path.resolve(file.base, swapSrcWithLib(file.relative)))
         )
         .pipe(gulp.dest(base));
     })
   );
+}
+
+function buildRollup(packages) {
+  return merge(
+    packages.map(pkg => {
+      return rollup({
+        input: getIndexFromPackage(pkg),
+        format: "cjs",
+        plugins: [
+          rollupBabel({
+            envName: "babylon",
+            babelrc: false,
+            extends: "./.babelrc.js",
+          }),
+          rollupNodeResolve(),
+        ],
+      })
+        .pipe(source("index.js"))
+        .pipe(buffer())
+        .pipe(errorsLogger())
+        .pipe(compilationLogger(/* rollup */ true))
+        .pipe(gulp.dest(path.join(pkg, "lib")));
+    })
+  );
+}
+
+gulp.task("default", ["build"]);
+
+gulp.task("build", function() {
+  const bundles = ["packages/babylon"];
+
+  return merge([buildBabel(/* exclude */ bundles), buildRollup(bundles)]);
 });
 
-gulp.task("watch", ["build"], function() {
+gulp.task("build-no-bundle", () => buildBabel());
+
+gulp.task("watch", ["build-no-bundle"], function() {
   watch(sources.map(getGlobFromSource), { debounceDelay: 200 }, function() {
-    gulp.start("build");
+    gulp.start("build-no-bundle");
   });
 });
 

Makefile

@@ -1,8 +1,6 @@
 MAKEFLAGS = -j1
 FLOW_COMMIT = 622bbc4f07acb77eb1109830c70815f827401d90
-TEST262_COMMIT = 1282e842febf418ca27df13fa4b32f7e5021b470
-
-export NODE_ENV = test
+TEST262_COMMIT = 52f70e2f637731aae92a9c9a2d831310c3ab2e1e
 
 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
 export FORCE_COLOR = true
@@ -11,10 +9,7 @@ SOURCES = packages codemods
 
 .PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap
 
-build: clean
-	make clean-lib
-  # Build babylon before building all other projects
-	make build-babylon
+build: clean clean-lib
 	./node_modules/.bin/gulp build
 	node ./packages/babel-types/scripts/generateTypeHelpers.js
 	# call build again as the generated files might need to be compiled again.
@@ -24,15 +19,11 @@ build: clean
 	node scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
 	# generate docs
 	node scripts/generators/docs.js > ./packages/babel-types/README.md
-ifneq ("$(BABEL_ENV)", "cov")
+ifneq ("$(BABEL_COVERAGE)", "true")
 	make build-standalone
 	make build-preset-env-standalone
 endif
 
-build-babylon:
-	cd packages/babylon; \
-	./node_modules/.bin/rollup -c
-
 build-standalone:
 	./node_modules/.bin/gulp build-babel-standalone
 
@@ -45,22 +36,25 @@ build-dist: build
 	cd packages/babel-runtime; \
 	node scripts/build-dist.js
 
-watch: clean
-	make clean-lib
-	BABEL_ENV=development ./node_modules/.bin/gulp watch
+watch: clean clean-lib
 
-watch-babylon:
-	cd packages/babylon; \
-	./node_modules/.bin/rollup -c -w
+	# Ensure that build artifacts for types are created during local
+	# development too.
+	BABEL_ENV=development ./node_modules/.bin/gulp build-no-bundle
+	node ./packages/babel-types/scripts/generateTypeHelpers.js
+	node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	BABEL_ENV=development ./node_modules/.bin/gulp watch
 
 flow:
 	./node_modules/.bin/flow check --strip-root
 
 lint:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --rulesdir="./scripts/eslint_rules"
+	./node_modules/.bin/eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --rulesdir="./scripts/eslint_rules"
 
 fix:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
+	# The config is hardcoded because otherwise prettier searches for it and also picks up some broken package.json files from tests
+	./node_modules/.bin/prettier --config .prettierrc --write --ignore-path .eslintignore '**/*.json'
+	./node_modules/.bin/eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
 
 clean: test-clean
 	rm -rf packages/babel-polyfill/browser*
@@ -73,19 +67,17 @@ test-clean:
 		$(call clean-source-test, $(source)))
 
 test-only:
-	./scripts/test.sh
+	BABEL_ENV=test ./scripts/test.sh
 	make test-clean
 
 test: lint test-only
 
-test-ci:
-	make bootstrap
-	make test-only
+test-ci: bootstrap test-only
 
 test-ci-coverage: SHELL:=/bin/bash
 test-ci-coverage:
-	BABEL_ENV=cov make bootstrap
-	./scripts/test-cov.sh
+	BABEL_COVERAGE=true BABEL_ENV=test make bootstrap
+	BABEL_ENV=test TEST_TYPE=cov ./scripts/test-cov.sh
 	bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json
 
 bootstrap-flow:
@@ -97,9 +89,7 @@ bootstrap-flow:
 test-flow:
 	node scripts/tests/flow/run_babylon_flow_tests.js
 
-test-flow-ci:
-	make bootstrap
-	make test-flow
+test-flow-ci: bootstrap test-flow
 
 test-flow-update-whitelist:
 	node scripts/tests/flow/run_babylon_flow_tests.js --update-whitelist
@@ -113,9 +103,7 @@ bootstrap-test262:
 test-test262:
 	node scripts/tests/test262/run_babylon_test262.js
 
-test-test262-ci:
-	make bootstrap
-	make test-test262
+test-test262-ci: bootstrap test-test262
 
 test-test262-update-whitelist:
 	node scripts/tests/test262/run_babylon_test262.js --update-whitelist
@@ -132,10 +120,9 @@ publish:
 	./node_modules/.bin/lerna publish --force-publish=* --exact --skip-temp-tag
 	make clean
 
-bootstrap:
-	make clean-all
-	yarn
-	./node_modules/.bin/lerna bootstrap
+bootstrap: clean-all
+	yarn --ignore-engines
+	./node_modules/.bin/lerna bootstrap -- --ignore-engines
 	make build
 	cd packages/babel-runtime; \
 	node scripts/build-dist.js

circle.yml

@@ -1,30 +0,0 @@
-general:
-  artifacts:
-    - "packages/babel-standalone/babel.js"
-    - "packages/babel-standalone/babel.min.js"
-    - "packages/babel-preset-env-standalone/babel-preset-env.js"
-    - "packages/babel-preset-env-standalone/babel-preset-env.min.js"
-
-machine:
-  node:
-    version:
-      8
-
-dependencies:
-  pre:
-    - curl -o- -L https://yarnpkg.com/install.sh | bash
-  cache_directories:
-    - ~/.yarn-cache
-  override:
-    - yarn
-
-test:
-  override:
-    - make test-ci-coverage
-    # Builds babel-standalone with the regular Babel config
-    - make build
-    # test-ci-coverage doesn't test babel-standalone, as trying to gather coverage
-    # data for a JS file that's several megabytes large is bound to fail. Here,
-    # we just run the babel-standalone test separately.
-    - ./node_modules/mocha/bin/_mocha packages/babel-standalone/test/ --opts test/mocha.opts
-    - ./node_modules/mocha/bin/_mocha packages/babel-preset-env-standalone/test/ --opts test/mocha.opts

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.38",
+  "version": "7.0.0-beta.44",
   "description": "Remove unused catch bindings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-remove-unused-catch-binding",
   "license": "MIT",
@@ -9,13 +9,13 @@
     "@babel/plugin"
   ],
   "dependencies": {
-    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.38"
+    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.44"
   },
   "peerDependencies": {
-    "@babel/core": "7.0.0-beta.38"
+    "@babel/core": "7.0.0-beta.44"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.38",
-    "@babel/helper-plugin-test-runner": "7.0.0-beta.38"
+    "@babel/core": "7.0.0-beta.44",
+    "@babel/helper-plugin-test-runner": "7.0.0-beta.44"
   }
 }

doc/design/monorepo.md

@@ -15,7 +15,7 @@ This is quite taboo but let's look at the pros and cons:
  * Easy to coordinate changes across modules.
  * Single place to report issues.
  * Easier to setup a development environment.
- * Tests across modules are ran together which finds bugs that touch multiple modules easier.
+ * Tests across modules are run together which finds bugs that touch multiple modules easier.
 
 **Cons:**
 

lerna.json

@@ -1,16 +1,16 @@
 {
   "lerna": "2.0.0-rc.4",
-  "version": "7.0.0-beta.38",
+  "version": "7.0.0-beta.44",
   "changelog": {
     "repo": "babel/babel",
     "labels": {
-      "PR: Spec Compliancy": ":eyeglasses: Spec Compliancy",
-      "PR: Breaking Change": ":boom: Breaking Change",
-      "PR: New Feature": ":rocket: New Feature",
-      "PR: Bug Fix": ":bug: Bug Fix",
-      "PR: Polish": ":nail_care: Polish",
-      "PR: Docs": ":memo: Documentation",
-      "PR: Internal": ":house: Internal"
+      "PR: Spec Compliancy :eyeglasses:": ":eyeglasses: Spec Compliancy",
+      "PR: Breaking Change :boom:": ":boom: Breaking Change",
+      "PR: New Feature :rocket:": ":rocket: New Feature",
+      "PR: Bug Fix :bug:": ":bug: Bug Fix",
+      "PR: Polish :nail_care:": ":nail_care: Polish",
+      "PR: Docs :memo:": ":memo: Documentation",
+      "PR: Internal :house:": ":house: Internal"
     }
   },
   "cacheDir": ".changelog",

lib/third-party-libs.js.flow

@@ -3,9 +3,9 @@
  */
 
 declare module "micromatch" {
-  declare function exports(Array<string>, Array<string>, ?{
-    nocase: boolean,
-  }): Array<string>;
+  declare module.exports: {
+    (Array<string>, Array<string>, ?{ nocase: boolean }): Array<string>,
+  };
 }
 
 declare module "resolve" {

package.json

@@ -10,31 +10,35 @@
     "test": "make test"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.37",
-    "@babel/core": "7.0.0-beta.37",
-    "@babel/preset-env": "7.0.0-beta.37",
-    "@babel/preset-flow": "7.0.0-beta.37",
-    "@babel/preset-stage-0": "7.0.0-beta.37",
-    "@babel/register": "7.0.0-beta.37",
-    "async": "^1.5.0",
+    "@babel/cli": "7.0.0-beta.42",
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/plugin-transform-modules-commonjs": "7.0.0-beta.42",
+    "@babel/preset-env": "7.0.0-beta.42",
+    "@babel/preset-flow": "7.0.0-beta.42",
+    "@babel/preset-stage-0": "7.0.0-beta.42",
+    "@babel/register": "7.0.0-beta.42",
+    "babel-core": "^7.0.0-0",
     "babel-eslint": "^8.0.1",
+    "babel-jest": "^22.4.1",
     "babel-loader": "8.0.0-beta.0",
-    "babel-plugin-istanbul": "^4.1.4",
-    "babylon": "7.0.0-beta.37",
+    "babel-plugin-transform-charcodes": "^0.1.0",
+    "babylon": "7.0.0-beta.42",
     "browserify": "^13.1.1",
     "bundle-collapser": "^1.2.1",
     "chai": "^4.1.0",
-    "chalk": "^2.0.0",
+    "chalk": "^2.3.2",
+    "charcodes": "^0.1.0",
     "derequire": "^2.0.2",
-    "eslint": "^4.5.0",
+    "enhanced-resolve": "^3.0.0",
+    "eslint": "^4.18.2",
     "eslint-config-babel": "^7.0.2",
     "eslint-plugin-flowtype": "^2.20.0",
-    "eslint-plugin-prettier": "^2.2.0",
-    "flow-bin": "^0.59.0",
+    "eslint-plugin-prettier": "^2.5.0",
+    "flow-bin": "^0.66.0",
     "graceful-fs": "^4.1.11",
     "gulp": "^3.9.0",
-    "gulp-babel": "^8.0.0-beta.0",
-    "gulp-filter": "^5.0.1",
+    "gulp-babel": "^8.0.0-beta.2",
+    "gulp-filter": "^5.1.0",
     "gulp-newer": "^1.0.0",
     "gulp-plumber": "^1.0.1",
     "gulp-rename": "^1.2.2",
@@ -42,21 +46,24 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "husky": "^0.14.3",
+    "jest": "^22.4.2",
     "lerna": "2.0.0",
     "lerna-changelog": "^0.5.0",
-    "lint-staged": "^4.2.3",
+    "lint-staged": "^6.0.1",
     "lodash": "^4.2.0",
     "merge-stream": "^1.0.1",
-    "mocha": "^3.0.0",
-    "nyc": "^11.0.3",
     "output-file-sync": "^2.0.0",
-    "prettier": "1.9.1",
+    "prettier": "1.11.1",
     "pump": "^1.0.2",
     "rimraf": "^2.4.3",
-    "semver": "^5.0.0",
+    "rollup-plugin-babel": "^4.0.0-beta.0",
+    "rollup-plugin-node-resolve": "^3.0.2",
+    "rollup-stream": "^1.24.1",
+    "test262-stream": "^1.1.0",
     "through2": "^2.0.0",
     "uglify-js": "^2.4.16",
-    "util.promisify": "^1.0.0",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
     "webpack": "^3.4.1",
     "webpack-dependency-suite": "^2.4.4",
     "webpack-stream": "^4.0.0"
@@ -66,20 +73,45 @@
     "npm": ">= 2.x <= 5.x",
     "yarn": ">=0.27.5 || >=1.0.0-20170811"
   },
-  "nyc": {
-    "all": true,
-    "exclude": [
-      "scripts/*.js",
-      "packages/*/test/**",
-      "packages/babel-standalone/**",
-      "codemods/*/test/**"
-    ],
-    "sourceMap": false,
-    "instrument": false
-  },
   "lint-staged": {
     "*.js": [
       "eslint --format=codeframe --rulesdir='./scripts/eslint_rules'"
     ]
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "packages/*/src/**/*.mjs",
+      "packages/*/src/**/*.js",
+      "codemods/*/src/**/*.mjs",
+      "codemods/*/src/**/*.js"
+    ],
+    "testRegex": "./(packages|codemods)/[^/]+/test/.+\\.m?js$",
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/test/fixtures/",
+      "/test/debug-fixtures/",
+      "/babylon/test/expressions/",
+      "/test/tmp/",
+      "/test/__data__/",
+      "/test/helpers/",
+      "<rootDir>/test/warning\\.js",
+      "<rootDir>/build/",
+      "_browser\\.js"
+    ],
+    "testEnvironment": "node",
+    "setupTestFrameworkScriptFile": "<rootDir>/test/testSetupFile.js",
+    "transformIgnorePatterns": [
+      "/node_modules/",
+      "<rootDir>/packages/babel-standalone/babel(\\.min)?\\.js",
+      "<rootDir>/packages/babel-preset-env-standalone/babel-preset-env(\\.min)?\\.js",
+      "/test/(fixtures|tmp|__data__)/",
+      "<rootDir>/(packages|codemods)/[^/]+/lib/"
+    ],
+    "modulePathIgnorePatterns": [
+      "/test/fixtures/",
+      "/test/tmp/",
+      "/test/__data__/",
+      "<rootDir>/build/"
+    ]
   }
 }

packages/README.md

@@ -13,15 +13,15 @@ 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) |
-| [`babylon`](https://github.com/babel/babel/tree/master/packages/babylon) | [![npm](https://img.shields.io/npm/v/babylon.svg?maxAge=2592000)](https://www.npmjs.com/package/babylon) | [![Dependency Status](https://david-dm.org/babel/babylon.svg)](https://david-dm.org/babel/babylon) |
-| [`@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) |
+| [`@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) |
+| [`babylon`](/packages/babylon) | [![npm](https://img.shields.io/npm/v/babylon.svg?maxAge=2592000)](https://www.npmjs.com/package/babylon) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babylon)](https://david-dm.org/babel/babel?path=packages/babylon) |
+| [`@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) |
 
 [`@babel/core`](/packages/babel-core) is the Babel compiler itself; it exposes the `babel.transform` method, where `transformedCode = transform(src).code`.
 
 The compiler can be broken down into 3 parts:
-- The parser: [`babylon`](https://github.com/babel/babel/tree/master/packages/babylon)
+- The parser: [`babylon`](/packages/babylon)
 - The transformer[s]: All the plugins/presets
   - These all use [`@babel/traverse`](/packages/babel-traverse) to traverse through the AST
 - The generator: [`@babel/generator`](/packages/babel-generator)
@@ -36,18 +36,18 @@ Check out the [`babel-handbook`](https://github.com/thejameskyle/babel-handbook/
 
 | Package | Version | Dependencies |
 |--------|-------|------------|
-| [`@babel/cli`](/packages/babel-cli) | [![npm](https://img.shields.io/npm/v/babel-cli.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-cli) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-cli)](https://david-dm.org/babel/babel?path=packages/babel-cli) |
-| [`@babel/types`](/packages/babel-types) | [![npm](https://img.shields.io/npm/v/babel-types.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-types) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-types)](https://david-dm.org/babel/babel?path=packages/babel-types) |
-| [`@babel/polyfill`](/packages/babel-polyfill) | [![npm](https://img.shields.io/npm/v/babel-polyfill.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-polyfill) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-polyfill)](https://david-dm.org/babel/babel?path=packages/babel-polyfill) |
-| [`@babel/runtime`](/packages/babel-runtime) | [![npm](https://img.shields.io/npm/v/babel-runtime.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-runtime) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-runtime)](https://david-dm.org/babel/babel?path=packages/babel-runtime) |
-| [`@babel/register`](/packages/babel-register) | [![npm](https://img.shields.io/npm/v/babel-register.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-register) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-register)](https://david-dm.org/babel/babel?path=packages/babel-register) |
-| [`@babel/template`](/packages/babel-template) | [![npm](https://img.shields.io/npm/v/babel-template.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-template) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-template)](https://david-dm.org/babel/babel?path=packages/babel-template) |
-| [`@babel/helpers`](/packages/babel-helpers) | [![npm](https://img.shields.io/npm/v/babel-helpers.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-helpers) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-helpers)](https://david-dm.org/babel/babel?path=packages/babel-helpers) |
-| [`@babel/code-frame`](/packages/babel-code-frame) | [![npm](https://img.shields.io/npm/v/babel-code-frame.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-code-frame) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-code-frame)](https://david-dm.org/babel/babel?path=packages/babel-code-frame) |
+| [`@babel/cli`](/packages/babel-cli) | [![npm](https://img.shields.io/npm/v/@babel/cli.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/cli) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-cli)](https://david-dm.org/babel/babel?path=packages/babel-cli) |
+| [`@babel/types`](/packages/babel-types) | [![npm](https://img.shields.io/npm/v/@babel/types.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/types) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-types)](https://david-dm.org/babel/babel?path=packages/babel-types) |
+| [`@babel/polyfill`](/packages/babel-polyfill) | [![npm](https://img.shields.io/npm/v/@babel/polyfill.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/polyfill) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-polyfill)](https://david-dm.org/babel/babel?path=packages/babel-polyfill) |
+| [`@babel/runtime`](/packages/babel-runtime) | [![npm](https://img.shields.io/npm/v/@babel/runtime.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/runtime) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-runtime)](https://david-dm.org/babel/babel?path=packages/babel-runtime) |
+| [`@babel/register`](/packages/babel-register) | [![npm](https://img.shields.io/npm/v/@babel/register.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/register) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-register)](https://david-dm.org/babel/babel?path=packages/babel-register) |
+| [`@babel/template`](/packages/babel-template) | [![npm](https://img.shields.io/npm/v/@babel/template.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/template) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-template)](https://david-dm.org/babel/babel?path=packages/babel-template) |
+| [`@babel/helpers`](/packages/babel-helpers) | [![npm](https://img.shields.io/npm/v/@babel/helpers.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/helpers) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-helpers)](https://david-dm.org/babel/babel?path=packages/babel-helpers) |
+| [`@babel/code-frame`](/packages/babel-code-frame) | [![npm](https://img.shields.io/npm/v/@babel/code-frame.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/code-frame) | [![Dependency Status](https://david-dm.org/babel/babel.svg?path=packages/babel-code-frame)](https://david-dm.org/babel/babel?path=packages/babel-code-frame) |
 
 - [`@babel/cli`](/packages/babel-cli) is the CLI tool that runs `@babel/core` and helps with outputting to a directory, a file, stdout and more (also includes `@babel/node` cli). Check out the [docs](https://babeljs.io/docs/usage/cli/).
 - [`@babel/types`](/packages/babel-types) is used to validate, build and change AST nodes.
-- [`@babel/polyfill`](/packages/babel-polyfill) is [literally a wrapper](https://github.com/babel/babel/blob/master/packages/babel-polyfill/src/index.js) around [`core-js`](https://github.com/zloirock/core-js) and [regenerator-runtime](https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime). Check out the [docs](https://babeljs.io/docs/usage/polyfill/).
+- [`@babel/polyfill`](/packages/babel-polyfill) is [literally a wrapper](/packages/babel-polyfill/src/index.js) around [`core-js`](https://github.com/zloirock/core-js) and [regenerator-runtime](https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime). Check out the [docs](https://babeljs.io/docs/usage/polyfill/).
 - [`@babel/runtime`](/packages/babel-runtime) is similar to the polyfill except that it doesn't modify the global scope and is to be used with [`@babel/plugin-transform-runtime`](/packages/babel-plugin-transform-runtime) (usually in library/plugin code). Check out the [docs](https://babeljs.io/docs/plugins/transform-runtime/).
 - [`@babel/register`](/packages/babel-register) is a way to automatically compile files with Babel on the fly by binding to Node.js `require`. Check out the [docs](http://babeljs.io/docs/usage/require/).
 - [`@babel/template`](/packages/babel-template) is a helper function that allows constructing AST nodes from a string presentation of the code; this eliminates the tedium of using `@babel/types` for building AST nodes.
@@ -62,7 +62,7 @@ The transformer[s] used in Babel are the independent pieces of code that transfo
 
 | Package | Version | Dependencies | Description |
 |--------|-------|------------|---|
-| [`@babel/preset-env`](https://github.com/babel/babel-preset-env) | [![npm](https://img.shields.io/npm/v/babel-preset-env.svg?maxAge=2592000)](https://www.npmjs.com/package/babel-preset-env) | [![Dependency Status](https://david-dm.org/babel/babel-preset-env.svg)](https://david-dm.org/babel/babel-preset-env) | automatically determines plugins and polyfills you need based on your supported environments |
+| [`@babel/preset-env`](/packages/babel-preset-env) | [![npm](https://img.shields.io/npm/v/@babel/preset-env.svg?maxAge=2592000)](https://www.npmjs.com/package/@babel/preset-env) | [![Dependency Status](https://david-dm.org/babel/babel/status.svg?path=packages/babel-preset-env)](https://david-dm.org/babel/babel?path=packages/babel-preset-env) | automatically determines plugins and polyfills you need based on your supported environments |
 
 > You can find community maintained presets on [npm](https://www.npmjs.com/search?q=babel-preset)
 

packages/babel-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/cli",
-  "version": "7.0.0-beta.38",
+  "version": "7.0.0-beta.44",
   "description": "Babel command line.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -29,11 +29,11 @@
     "chokidar": "^1.6.1"
   },
   "peerDependencies": {
-    "@babel/core": "7.0.0-beta.38"
+    "@babel/core": "7.0.0-beta.44"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.38",
-    "@babel/helper-fixtures": "7.0.0-beta.38"
+    "@babel/core": "7.0.0-beta.44",
+    "@babel/helper-fixtures": "7.0.0-beta.44"
   },
   "bin": {
     "babel": "./bin/babel.js",

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

@@ -6,6 +6,8 @@ import fs from "fs";
 
 import * as util from "./util";
 
+let compiledFiles = 0;
+
 export default function(commander, filenames, opts) {
   function write(src, relative, base, callback) {
     if (typeof base === "function") {
@@ -13,7 +15,7 @@ export default function(commander, filenames, opts) {
       base = undefined;
     }
     if (!util.isCompilableExtension(relative, commander.extensions)) {
-      return callback();
+      return process.nextTick(callback);
     }
 
     // remove extension and then append back on .js
@@ -26,7 +28,6 @@ export default function(commander, filenames, opts) {
       defaults(
         {
           sourceFileName: slash(path.relative(dest + "/..", src)),
-          sourceMapTarget: path.basename(relative),
         },
         opts,
       ),
@@ -42,12 +43,15 @@ export default function(commander, filenames, opts) {
         ) {
           const mapLoc = dest + ".map";
           res.code = util.addSourceMappingUrl(res.code, mapLoc);
+          res.map.file = path.basename(relative);
           outputFileSync(mapLoc, JSON.stringify(res.map));
         }
 
         outputFileSync(dest, res.code);
         util.chmod(src, dest);
 
+        compiledFiles += 1;
+
         util.log(src + " -> " + dest);
         return callback(null, true);
       },
@@ -59,6 +63,13 @@ export default function(commander, filenames, opts) {
     return path.join(commander.outDir, filename);
   }
 
+  function outputDestFolder(outDir) {
+    const outDirPath = path.resolve(outDir);
+    if (!fs.existsSync(outDirPath)) {
+      fs.mkdirSync(outDirPath);
+    }
+  }
+
   function handleFile(src, filename, base, callback) {
     if (typeof base === "function") {
       callback = base;
@@ -78,6 +89,11 @@ export default function(commander, filenames, opts) {
   }
 
   function sequentialHandleFile(files, dirname, index, callback) {
+    if (files.length === 0) {
+      outputDestFolder(commander.outDir);
+      return;
+    }
+
     if (typeof index === "function") {
       callback = index;
       index = 0;
@@ -125,10 +141,17 @@ export default function(commander, filenames, opts) {
     const filename = filenames[index];
 
     handle(filename, function(err) {
-      if (err) throw err;
+      if (err) throw new Error(err);
       index++;
       if (index !== filenames.length) {
         sequentialHandle(filenames, index);
+      } else {
+        util.log(
+          `🎉  Successfully compiled ${compiledFiles} ${
+            compiledFiles > 1 ? "files" : "file"
+          } with Babel.`,
+          true,
+        );
       }
     });
   }

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

@@ -16,7 +16,10 @@ export default function(commander, filenames, opts) {
 
   const buildResult = function() {
     const map = new sourceMap.SourceMapGenerator({
-      file: path.basename(commander.outFile || "") || "stdout",
+      file:
+        commander.sourceMapTarget ||
+        path.basename(commander.outFile || "") ||
+        "stdout",
       sourceRoot: opts.sourceRoot,
     });
 

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

@@ -32,7 +32,6 @@ function collect(value, previousValue): Array<string> {
   return previousValue ? previousValue.concat(values) : values;
 }
 
-/* eslint-disable max-len */
 // Standard Babel input configs.
 commander.option(
   "-f, --filename [filename]",
@@ -163,12 +162,11 @@ commander.option(
   "--include-dotfiles",
   "Include dotfiles when compiling and copying non-compilable files",
 );
-commander.option("-q, --quiet", "Don't log anything");
+commander.option("--verbose", "Log everything");
 commander.option(
   "--delete-dir-on-start",
   "Delete the out directory before compilation",
 );
-/* eslint-enable max-len */
 
 commander.version(pkg.version + " (@babel/core " + version + ")");
 commander.usage("[options] <files ...>");
@@ -221,6 +219,17 @@ if (commander.deleteDirOnStart && !commander.outDir) {
   errors.push("--delete-dir-on-start requires --out-dir");
 }
 
+if (
+  !commander.outDir &&
+  filenames.length === 0 &&
+  typeof commander.filename !== "string" &&
+  commander.babelrc !== false
+) {
+  errors.push(
+    "stdin compilation requires either -f/--filename [filename] or --no-babelrc",
+  );
+}
+
 if (errors.length) {
   console.error(errors.join(". "));
   process.exit(2);
@@ -243,11 +252,12 @@ delete opts.outFile;
 delete opts.outDir;
 delete opts.copyFiles;
 delete opts.includeDotfiles;
-delete opts.quiet;
+delete opts.verbose;
 delete opts.configFile;
 delete opts.deleteDirOnStart;
 delete opts.keepFileExtension;
 delete opts.relative;
+delete opts.sourceMapTarget;
 
 // Commander will default the "--no-" arguments to true, but we want to leave them undefined so that
 // @babel/core can handle the default-assignment logic on its own.

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

@@ -46,8 +46,8 @@ export function addSourceMappingUrl(code, loc) {
   return code + "\n//# sourceMappingURL=" + path.basename(loc);
 }
 
-export function log(msg) {
-  if (!commander.quiet) console.log(msg);
+export function log(msg, force) {
+  if (force === true || commander.verbose) console.log(msg);
 }
 
 export function transform(filename, code, opts, callback) {
@@ -63,7 +63,7 @@ export function compile(filename, opts, callback) {
     if (err) {
       if (commander.watch) {
         console.error(err);
-        return callback(null, { ignored: true });
+        return callback(null, null);
       } else {
         return callback(err);
       }

packages/babel-cli/test/fixtures/babel/--config-file babelrc nocomment/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["--config-file", "../.othername_babelrc"]
-}
+  "args": ["--config-file", "../.othername_babelrc", "-f", "file.js"]
+}

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles with ignore/options.json

@@ -4,6 +4,7 @@
     "--out-dir", "lib",
     "--copy-files",
     "--include-dotfiles",
-    "--ignore", "src/foo"
+    "--ignore", "src/foo",
+    "--verbose"
   ]
 }

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles with ignore/stdout.txt

@@ -1 +1,2 @@
 src/index.js -> lib/index.js
+🎉  Successfully compiled 1 file with Babel.

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles with only/options.json

@@ -4,6 +4,7 @@
     "--out-dir", "lib",
     "--copy-files",
     "--include-dotfiles",
-    "--only", "src/foo"
+    "--only", "src/foo",
+    "--verbose"
   ]
 }

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles with only/stdout.txt

@@ -1,2 +1,3 @@
 src/foo/.foo.js -> lib/foo/.foo.js
 src/foo/bar.js -> lib/foo/bar.js
+🎉  Successfully compiled 2 files with Babel.

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--copy-files", "--include-dotfiles"]
+  "args": ["src", "--out-dir", "lib", "--copy-files", "--include-dotfiles", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--copy-files --include-dotfiles/stdout.txt

@@ -1,3 +1,4 @@
 src/.foo.js -> lib/.foo.js
 src/bar/index.js -> lib/bar/index.js
 src/foo/foo.js -> lib/foo/foo.js
+🎉  Successfully compiled 3 files with Babel.

packages/babel-cli/test/fixtures/babel/--copy-files with ignore/options.json

@@ -3,6 +3,7 @@
     "src",
     "--out-dir", "lib",
     "--copy-files",
-    "--ignore", "src/foo/*"
+    "--ignore", "src/foo/*",
+    "--verbose"
   ]
 }

packages/babel-cli/test/fixtures/babel/--copy-files with ignore/stdout.txt

@@ -1 +1,2 @@
 src/index.js -> lib/index.js
+🎉  Successfully compiled 1 file with Babel.

packages/babel-cli/test/fixtures/babel/--copy-files with only/options.json

@@ -3,6 +3,7 @@
     "src",
     "--out-dir", "lib",
     "--copy-files",
-    "--only", "src/foo/*"
+    "--only", "src/foo/*",
+    "--verbose"
   ]
 }

packages/babel-cli/test/fixtures/babel/--copy-files with only/stdout.txt

@@ -1 +1,2 @@
 src/foo/bar.js -> lib/foo/bar.js
+🎉  Successfully compiled 1 file with Babel.

packages/babel-cli/test/fixtures/babel/--copy-files/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--copy-files"]
+  "args": ["src", "--out-dir", "lib", "--copy-files", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--copy-files/stdout.txt

@@ -1,2 +1,3 @@
 src/bar/index.js -> lib/bar/index.js
 src/foo/foo.js -> lib/foo/foo.js
+🎉  Successfully compiled 2 files with Babel.

packages/babel-cli/test/fixtures/babel/--ignore complete/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--ignore", "src/bar"]
+  "args": ["src", "--out-dir", "lib", "--ignore", "src/bar", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--ignore complete/stdout.txt

@@ -1 +1,2 @@
 src/foobar/foo.js -> lib/foobar/foo.js
+🎉  Successfully compiled 1 file with Babel.

packages/babel-cli/test/fixtures/babel/--ignore glob/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--ignore", "**/*.foo.js"]
+  "args": ["src", "--out-dir", "lib", "--ignore", "**/*.foo.js", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--ignore glob/stdout.txt

@@ -2,3 +2,4 @@ src/a.js -> lib/a.js
 src/b.js -> lib/b.js
 src/baz/c.js -> lib/baz/c.js
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 4 files with Babel.

packages/babel-cli/test/fixtures/babel/--ignore/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--ignore", "src/foo/*"]
+  "args": ["src", "--out-dir", "lib", "--ignore", "src/foo/*", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--ignore/stdout.txt

@@ -1 +1,2 @@
 src/bar/index.js -> lib/bar/index.js
+🎉  Successfully compiled 1 file with Babel.

packages/babel-cli/test/fixtures/babel/--only glob/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--only", "**/*.foo.js"]
+  "args": ["src", "--out-dir", "lib", "--only", "**/*.foo.js", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--only glob/stdout.txt

@@ -1,2 +1,3 @@
 src/a.foo.js -> lib/a.foo.js
 src/baz/b.foo.js -> lib/baz/b.foo.js
+🎉  Successfully compiled 2 files with Babel.

packages/babel-cli/test/fixtures/babel/--only/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--only", "src/bar/*"]
+  "args": ["src", "--out-dir", "lib", "--only", "src/bar/*", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/--only/stdout.txt

@@ -1 +1,2 @@
 src/bar/index.js -> lib/bar/index.js
+🎉  Successfully compiled 1 file with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--copy-files"]
+  "args": ["src", "--out-dir", "lib", "--copy-files", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/dir --out-dir --copy-files/stdout.txt

@@ -1 +1,2 @@
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 1 file with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--out-dir", "lib", "--keep-file-extension"]
+  "args": ["src", "--out-dir", "lib", "--keep-file-extension", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/dir --out-dir --keep-file-extension/stdout.txt

@@ -1,2 +1,3 @@
 src/bar.mjs -> lib/bar.mjs
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 2 files with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["**/src", "--out-dir", "../lib", "--relative"]
+  "args": ["**/src", "--out-dir", "../lib", "--relative", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/dir --out-dir --relative/stdout.txt

@@ -2,3 +2,4 @@ package1/src/bar/bar1.js -> package1/lib/bar/bar1.js
 package1/src/foo1.js -> package1/lib/foo1.js
 package2/src/bar/bar2.js -> package2/lib/bar/bar2.js
 package2/src/foo2.js -> package2/lib/foo2.js
+🎉  Successfully compiled 4 files with Babel.

packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/options.json

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--source-maps", "inline", "--out-dir", "lib"]
+  "args": ["src", "--source-maps", "inline", "--out-dir", "lib", "--verbose"]
 }

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

@@ -7,4 +7,4 @@ function _classCallCheck(instance, Constructor) { if (!_instanceof(instance, Con
 var Test = function Test() {
   _classCallCheck(this, Test);
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbIlRlc3QiXSwibWFwcGluZ3MiOiI7Ozs7OztJQUFNQSxJIiwiZmlsZSI6ImJhci5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59Il19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbIlRlc3QiXSwibWFwcGluZ3MiOiI7Ozs7OztJQUFNQSxJIiwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgVGVzdCB7XG5cbn0iXX0=

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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9mb28uanMiXSwibmFtZXMiOlsiYXJyIiwibWFwIiwieCIsIk1VTFRJUExJRVIiXSwibWFwcGluZ3MiOiI7O0FBQUFBLElBQUlDLEdBQUosQ0FBUTtBQUFBLFNBQUtDLElBQUlDLFVBQVQ7QUFBQSxDQUFSIiwiZmlsZSI6ImZvby5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9mb28uanMiXSwibmFtZXMiOlsiYXJyIiwibWFwIiwieCIsIk1VTFRJUExJRVIiXSwibWFwcGluZ3MiOiI7O0FBQUFBLElBQUlDLEdBQUosQ0FBUTtBQUFBLFNBQUtDLElBQUlDLFVBQVQ7QUFBQSxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=

packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps inline/stdout.txt

@@ -1,2 +1,3 @@
 src/bar/bar.js -> lib/bar/bar.js
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 2 files with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["src", "--source-maps", "--out-dir", "lib"]
+  "args": ["src", "--source-maps", "--out-dir", "lib", "--verbose"]
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/bar/bar.js"],"names":["Test"],"mappings":";;;;;;IAAMA,I","file":"bar.js","sourcesContent":["class Test {\n\n}"]}
+{"version":3,"sources":["../../src/bar/bar.js"],"names":["Test"],"mappings":";;;;;;IAAMA,I","sourcesContent":["class Test {\n\n}"],"file":"bar.js"}

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","file":"foo.js","sourcesContent":["arr.map(x => x * MULTIPLIER);"]}
+{"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"}

packages/babel-cli/test/fixtures/babel/dir --out-dir --source-maps/stdout.txt

@@ -1,2 +1,3 @@
 src/bar/bar.js -> lib/bar/bar.js
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 2 files with Babel.

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

@@ -0,0 +1,3 @@
+class Test {
+
+}

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

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

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

@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-dir", "lib", "--verbose"]
+}

packages/babel-cli/test/fixtures/babel/dir --out-dir --verbose/out-files/lib/bar/bar.js

@@ -0,0 +1,9 @@
+"use strict";
+
+function _instanceof(left, right) { if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) { return right[Symbol.hasInstance](left); } else { return left instanceof right; } }
+
+function _classCallCheck(instance, Constructor) { if (!_instanceof(instance, Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Test = function Test() {
+  _classCallCheck(this, Test);
+};

packages/babel-cli/test/fixtures/babel/dir --out-dir --verbose/out-files/lib/foo.js

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

packages/babel-cli/test/fixtures/babel/dir --out-dir --verbose/stdout.txt

@@ -0,0 +1,3 @@
+src/bar/bar.js -> lib/bar/bar.js
+src/foo.js -> lib/foo.js
+🎉  Successfully compiled 2 files with Babel.

packages/babel-cli/test/fixtures/babel/dir --out-dir/stdout.txt

@@ -1,2 +1 @@
-src/bar/bar.js -> lib/bar/bar.js
-src/foo.js -> lib/foo.js
+🎉  Successfully compiled 2 files with Babel.

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

@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-dir", "lib"]
+}

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

@@ -1,3 +1,3 @@
 {
-  "args": ["src/foo.js", "--out-dir", "../lib", "--relative"]
+  "args": ["src/foo.js", "--out-dir", "../lib", "--relative", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/filename --out-dir --relative/stdout.txt

@@ -1 +1,2 @@
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 1 file with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["src/foo.js", "--out-dir", "lib"]
+  "args": ["src/foo.js", "--out-dir", "lib", "--verbose"]
 }

packages/babel-cli/test/fixtures/babel/filename --out-dir/stdout.txt

@@ -1 +1,2 @@
 src/foo.js -> lib/foo.js
+🎉  Successfully compiled 1 file with Babel.

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

@@ -1,3 +1,3 @@
 {
-  "args": ["--out-file", "script.js"]
+  "args": ["--out-file", "script.js", "-f", "file.js"]
 }

packages/babel-cli/test/fixtures/babel/stdin/options.json

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

packages/babel-cli/test/index.js

@@ -122,7 +122,13 @@ const buildTest = function(binName, testName, opts) {
   const binLoc = path.join(__dirname, "../lib", binName);
 
   return function(callback) {
-    clear();
+    const dir = process.cwd();
+
+    process.chdir(__dirname);
+    if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
+    fs.mkdirSync(tmpLoc);
+    process.chdir(tmpLoc);
+
     saveInFiles(opts.inFiles);
 
     let args = [binLoc];
@@ -160,6 +166,7 @@ const buildTest = function(binName, testName, opts) {
           args.map(arg => `"${arg}"`).join(" ") + ": " + err.message;
       }
 
+      process.chdir(dir);
       callback(err);
     });
 
@@ -170,13 +177,6 @@ const buildTest = function(binName, testName, opts) {
   };
 };
 
-const clear = function() {
-  process.chdir(__dirname);
-  if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
-  fs.mkdirSync(tmpLoc);
-  process.chdir(tmpLoc);
-};
-
 fs.readdirSync(fixtureLoc).forEach(function(binName) {
   if (binName[0] === ".") return;
 

packages/babel-code-frame/README.md

@@ -68,6 +68,7 @@ console.log(result);
 
 Toggles syntax highlighting the code as JavaScript for terminals.
 
+
 ### `linesAbove`
 
 `number`, defaults to `2`.
@@ -86,6 +87,21 @@ Adjust the number of lines to show below the error.
 
 Enable this to forcibly syntax highlight the code as JavaScript (for non-terminals); overrides `highlightCode`.
 
+### `message`
+
+`string`, otherwise nothing
+
+Pass in a string to be displayed inline (if possible) next to the highlighted
+location in the code. If it can't be positioned inline, it will be placed above
+the code frame.
+
+```
+1 | class Foo {
+> 2 |   constructor()
+  |                ^ Missing {
+3 | };
+```
+
 ## Upgrading from prior versions
 
 Prior to version 7, the only API exposed by this module was for a single line and optional column pointer. The old API will now log a deprecation warning.

packages/babel-code-frame/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/code-frame",
-  "version": "7.0.0-beta.38",
+  "version": "7.0.0-beta.44",
   "description": "Generate errors that contain a code frame that point to source locations.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -8,11 +8,10 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-code-frame",
   "main": "lib/index.js",
   "dependencies": {
-    "chalk": "^2.0.0",
-    "esutils": "^2.0.2",
-    "js-tokens": "^3.0.0"
+    "@babel/highlight": "7.0.0-beta.44"
   },
   "devDependencies": {
+    "chalk": "^2.0.0",
     "strip-ansi": "^4.0.0"
   }
 }

packages/babel-code-frame/src/index.js

@@ -1,6 +1,4 @@
-import jsTokens, { matchToToken } from "js-tokens";
-import esutils from "esutils";
-import Chalk from "chalk";
+import highlight, { shouldHighlight, getChalk } from "@babel/highlight";
 
 let deprecationWarningShown = false;
 
@@ -15,23 +13,13 @@ type NodeLocation = {
 };
 
 /**
- * Chalk styles for token types.
+ * Chalk styles for code frame token types.
  */
-
 function getDefs(chalk) {
   return {
-    keyword: chalk.cyan,
-    capitalized: chalk.yellow,
-    jsx_tag: chalk.yellow,
-    punctuator: chalk.yellow,
-    // bracket:  intentionally omitted.
-    number: chalk.magenta,
-    string: chalk.green,
-    regex: chalk.magenta,
-    comment: chalk.grey,
-    invalid: chalk.white.bgRed.bold,
     gutter: chalk.grey,
     marker: chalk.red.bold,
+    message: chalk.red.bold,
   };
 }
 
@@ -41,76 +29,6 @@ function getDefs(chalk) {
 
 const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
 
-/**
- * RegExp to test for what seems to be a JSX tag name.
- */
-
-const JSX_TAG = /^[a-z][\w-]*$/i;
-
-/**
- * RegExp to test for the three types of brackets.
- */
-
-const BRACKET = /^[()[\]{}]$/;
-
-/**
- * Get the type of token, specifying punctuator type.
- */
-
-function getTokenType(match) {
-  const [offset, text] = match.slice(-2);
-  const token = matchToToken(match);
-
-  if (token.type === "name") {
-    if (esutils.keyword.isReservedWordES6(token.value)) {
-      return "keyword";
-    }
-
-    if (
-      JSX_TAG.test(token.value) &&
-      (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")
-    ) {
-      return "jsx_tag";
-    }
-
-    if (token.value[0] !== token.value[0].toLowerCase()) {
-      return "capitalized";
-    }
-  }
-
-  if (token.type === "punctuator" && BRACKET.test(token.value)) {
-    return "bracket";
-  }
-
-  if (
-    token.type === "invalid" &&
-    (token.value === "@" || token.value === "#")
-  ) {
-    return "punctuator";
-  }
-
-  return token.type;
-}
-
-/**
- * Highlight `text`.
- */
-
-function highlight(defs: Object, text: string) {
-  return text.replace(jsTokens, function(...args) {
-    const type = getTokenType(args);
-    const colorize = defs[type];
-    if (colorize) {
-      return args[0]
-        .split(NEWLINE)
-        .map(str => colorize(str))
-        .join("\n");
-    } else {
-      return args[0];
-    }
-  });
-}
-
 /**
  * Extract what lines should be marked and highlighted.
  */
@@ -126,9 +44,7 @@ function getMarkerLines(
     loc.start,
   );
   const endLoc: Location = Object.assign({}, startLoc, loc.end);
-  const linesAbove = opts.linesAbove || 2;
-  const linesBelow = opts.linesBelow || 3;
-
+  const { linesAbove = 2, linesBelow = 3 } = opts || {};
   const startLine = startLoc.line;
   const startColumn = startLoc.column;
   const endLine = endLoc.line;
@@ -187,29 +103,28 @@ export function codeFrameColumns(
   opts: Object = {},
 ): string {
   const highlighted =
-    (opts.highlightCode && Chalk.supportsColor) || opts.forceColor;
-  let chalk = Chalk;
-  if (opts.forceColor) {
-    chalk = new Chalk.constructor({ enabled: true, level: 1 });
-  }
+    (opts.highlightCode || opts.forceColor) && shouldHighlight(opts);
+  const chalk = getChalk(opts);
+  const defs = getDefs(chalk);
   const maybeHighlight = (chalkFn, string) => {
     return highlighted ? chalkFn(string) : string;
   };
-  const defs = getDefs(chalk);
-  if (highlighted) rawLines = highlight(defs, rawLines);
+  if (highlighted) rawLines = highlight(rawLines, opts);
 
   const lines = rawLines.split(NEWLINE);
   const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
+  const hasColumns = loc.start && typeof loc.start.column === "number";
 
   const numberMaxWidth = String(end).length;
 
-  const frame = lines
+  let frame = lines
     .slice(start, end)
     .map((line, index) => {
       const number = start + 1 + index;
       const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
       const gutter = ` ${paddedNumber} | `;
       const hasMarker = markerLines[number];
+      const lastMarkerLine = !markerLines[number + 1];
       if (hasMarker) {
         let markerLine = "";
         if (Array.isArray(hasMarker)) {
@@ -224,6 +139,10 @@ export function codeFrameColumns(
             markerSpacing,
             maybeHighlight(defs.marker, "^").repeat(numberOfMarkers),
           ].join("");
+
+          if (lastMarkerLine && opts.message) {
+            markerLine += " " + maybeHighlight(defs.message, opts.message);
+          }
         }
         return [
           maybeHighlight(defs.marker, ">"),
@@ -237,6 +156,10 @@ export function codeFrameColumns(
     })
     .join("\n");
 
+  if (opts.message && !hasColumns) {
+    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
+  }
+
   if (highlighted) {
     return chalk.reset(frame);
   } else {
@@ -257,15 +180,17 @@ export default function(
   if (!deprecationWarningShown) {
     deprecationWarningShown = true;
 
-    const deprecationError = new Error(
-      "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.",
-    );
-    deprecationError.name = "DeprecationWarning";
+    const message =
+      "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.";
 
     if (process.emitWarning) {
-      process.emitWarning(deprecationError);
+      // A string is directly supplied to emitWarning, because when supplying an
+      // Error object node throws in the tests because of different contexts
+      process.emitWarning(message, "DeprecationWarning");
     } else {
-      console.warn(deprecationError);
+      const deprecationError = new Error(message);
+      deprecationError.name = "DeprecationWarning";
+      console.warn(new Error(message));
     }
   }
 

packages/babel-code-frame/test/index.js

@@ -1,13 +1,11 @@
-import assert from "assert";
 import chalk from "chalk";
 import stripAnsi from "strip-ansi";
 import codeFrame, { codeFrameColumns } from "..";
 
 describe("@babel/code-frame", function() {
-  it("basic usage", function() {
+  test("basic usage", function() {
     const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 2, 16),
+    expect(codeFrame(rawLines, 2, 16)).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor()",
@@ -17,15 +15,14 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("optional column number", function() {
+  test("optional column number", function() {
     const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 2, null),
+    expect(codeFrame(rawLines, 2, null)).toEqual(
       ["  1 | class Foo {", "> 2 |   constructor()", "  3 | };"].join("\n"),
     );
   });
 
-  it("maximum context lines and padding", function() {
+  test("maximum context lines and padding", function() {
     const rawLines = [
       "/**",
       " * Sums two numbers.",
@@ -39,8 +36,7 @@ describe("@babel/code-frame", function() {
       "  return a + b",
       "}",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 7, 2),
+    expect(codeFrame(rawLines, 7, 2)).toEqual(
       [
         "   5 |  * @param b Number",
         "   6 |  * @returns Number",
@@ -53,7 +49,7 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("no unnecessary padding due to one-off errors", function() {
+  test("no unnecessary padding due to one-off errors", function() {
     const rawLines = [
       "/**",
       " * Sums two numbers.",
@@ -67,8 +63,7 @@ describe("@babel/code-frame", function() {
       "  return a + b",
       "}",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 6, 2),
+    expect(codeFrame(rawLines, 6, 2)).toEqual(
       [
         "  4 |  * @param a Number",
         "  5 |  * @param b Number",
@@ -81,14 +76,13 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("tabs", function() {
+  test("tabs", function() {
     const rawLines = [
       "\tclass Foo {",
       "\t  \t\t    constructor\t(\t)",
       "\t};",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 2, 25),
+    expect(codeFrame(rawLines, 2, 25)).toEqual(
       [
         "  1 | \tclass Foo {",
         "> 2 | \t  \t\t    constructor\t(\t)",
@@ -98,18 +92,17 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("opts.highlightCode", function() {
+  test("opts.highlightCode", function() {
     const rawLines = "console.log('babel')";
     const result = codeFrame(rawLines, 1, 9, { highlightCode: true });
     const stripped = stripAnsi(result);
-    assert.ok(result.length > stripped.length);
-    assert.equal(
-      stripped,
+    expect(result.length).toBeGreaterThan(stripped.length);
+    expect(stripped).toEqual(
       ["> 1 | console.log('babel')", "    |         ^"].join("\n"),
     );
   });
 
-  it("opts.linesAbove", function() {
+  test("opts.linesAbove", function() {
     const rawLines = [
       "/**",
       " * Sums two numbers.",
@@ -123,8 +116,7 @@ describe("@babel/code-frame", function() {
       "  return a + b",
       "}",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 7, 2, { linesAbove: 1 }),
+    expect(codeFrame(rawLines, 7, 2, { linesAbove: 1 })).toEqual(
       [
         "   6 |  * @returns Number",
         ">  7 |  */",
@@ -136,7 +128,7 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("opts.linesBelow", function() {
+  test("opts.linesBelow", function() {
     const rawLines = [
       "/**",
       " * Sums two numbers.",
@@ -150,8 +142,7 @@ describe("@babel/code-frame", function() {
       "  return a + b",
       "}",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 7, 2, { linesBelow: 1 }),
+    expect(codeFrame(rawLines, 7, 2, { linesBelow: 1 })).toEqual(
       [
         "  5 |  * @param b Number",
         "  6 |  * @returns Number",
@@ -162,7 +153,7 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("opts.linesAbove and opts.linesBelow", function() {
+  test("opts.linesAbove and opts.linesBelow", function() {
     const rawLines = [
       "/**",
       " * Sums two numbers.",
@@ -176,25 +167,75 @@ describe("@babel/code-frame", function() {
       "  return a + b",
       "}",
     ].join("\n");
-    assert.equal(
-      codeFrame(rawLines, 7, 2, { linesAbove: 1, linesBelow: 1 }),
+    expect(codeFrame(rawLines, 7, 2, { linesAbove: 1, linesBelow: 1 })).toEqual(
       ["  6 |  * @returns Number", "> 7 |  */", "    |  ^", "  8 | "].join(
         "\n",
       ),
     );
   });
 
-  it("opts.forceColor", function() {
+  test("opts.linesAbove no lines above", function() {
+    const rawLines = [
+      "class Foo {",
+      "  constructor() {",
+      "    console.log(arguments);",
+      "  }",
+      "};",
+    ].join("\n");
+    expect(
+      codeFrameColumns(rawLines, { start: { line: 2 } }, { linesAbove: 0 }),
+    ).toEqual(
+      [
+        "> 2 |   constructor() {",
+        "  3 |     console.log(arguments);",
+        "  4 |   }",
+        "  5 | };",
+      ].join("\n"),
+    );
+  });
+
+  test("opts.linesBelow no lines below", function() {
+    const rawLines = [
+      "class Foo {",
+      "  constructor() {",
+      "    console.log(arguments);",
+      "  }",
+      "};",
+    ].join("\n");
+    expect(
+      codeFrameColumns(rawLines, { start: { line: 2 } }, { linesBelow: 0 }),
+    ).toEqual(["  1 | class Foo {", "> 2 |   constructor() {"].join("\n"));
+  });
+
+  test("opts.linesBelow single line", function() {
+    const rawLines = [
+      "class Foo {",
+      "  constructor() {",
+      "    console.log(arguments);",
+      "  }",
+      "};",
+    ].join("\n");
+    expect(
+      codeFrameColumns(
+        rawLines,
+        { start: { line: 2 } },
+        { linesAbove: 0, linesBelow: 0 },
+      ),
+    ).toEqual(["> 2 |   constructor() {"].join("\n"));
+  });
+
+  test("opts.forceColor", function() {
     const marker = chalk.red.bold;
     const gutter = chalk.grey;
 
     const rawLines = ["", "", "", ""].join("\n");
-    assert.equal(
+    expect(
       codeFrame(rawLines, 3, null, {
         linesAbove: 1,
         linesBelow: 1,
         forceColor: true,
       }),
+    ).toEqual(
       chalk.reset(
         [
           " " + gutter(" 2 | "),
@@ -205,10 +246,11 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("basic usage, new API", function() {
+  test("basic usage, new API", function() {
     const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
-    assert.equal(
+    expect(
       codeFrameColumns(rawLines, { start: { line: 2, column: 16 } }),
+    ).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor()",
@@ -218,13 +260,14 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("mark multiple columns", function() {
+  test("mark multiple columns", function() {
     const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
-    assert.equal(
+    expect(
       codeFrameColumns(rawLines, {
         start: { line: 2, column: 3 },
         end: { line: 2, column: 16 },
       }),
+    ).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor()",
@@ -234,15 +277,16 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("mark multiple columns across lines", function() {
+  test("mark multiple columns across lines", function() {
     const rawLines = ["class Foo {", "  constructor() {", "  }", "};"].join(
       "\n",
     );
-    assert.equal(
+    expect(
       codeFrameColumns(rawLines, {
         start: { line: 2, column: 17 },
         end: { line: 3, column: 3 },
       }),
+    ).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor() {",
@@ -254,7 +298,7 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("mark multiple columns across multiple lines", function() {
+  test("mark multiple columns across multiple lines", function() {
     const rawLines = [
       "class Foo {",
       "  constructor() {",
@@ -262,11 +306,12 @@ describe("@babel/code-frame", function() {
       "  }",
       "};",
     ].join("\n");
-    assert.equal(
+    expect(
       codeFrameColumns(rawLines, {
         start: { line: 2, column: 17 },
         end: { line: 4, column: 3 },
       }),
+    ).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor() {",
@@ -280,7 +325,7 @@ describe("@babel/code-frame", function() {
     );
   });
 
-  it("mark across multiple lines without columns", function() {
+  test("mark across multiple lines without columns", function() {
     const rawLines = [
       "class Foo {",
       "  constructor() {",
@@ -288,8 +333,9 @@ describe("@babel/code-frame", function() {
       "  }",
       "};",
     ].join("\n");
-    assert.equal(
+    expect(
       codeFrameColumns(rawLines, { start: { line: 2 }, end: { line: 4 } }),
+    ).toEqual(
       [
         "  1 | class Foo {",
         "> 2 |   constructor() {",
@@ -299,4 +345,105 @@ describe("@babel/code-frame", function() {
       ].join("\n"),
     );
   });
+
+  test("opts.message", function() {
+    const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
+    expect(
+      codeFrameColumns(
+        rawLines,
+        { start: { line: 2, column: 16 } },
+        {
+          message: "Missing {",
+        },
+      ),
+    ).toEqual(
+      [
+        "  1 | class Foo {",
+        "> 2 |   constructor()",
+        "    |                ^ Missing {",
+        "  3 | };",
+      ].join("\n"),
+    );
+  });
+
+  test("opts.message without column", function() {
+    const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
+    expect(
+      codeFrameColumns(
+        rawLines,
+        { start: { line: 2 } },
+        {
+          message: "Missing {",
+        },
+      ),
+    ).toEqual(
+      [
+        "  Missing {",
+        "  1 | class Foo {",
+        "> 2 |   constructor()",
+        "  3 | };",
+      ].join("\n"),
+    );
+  });
+
+  test("opts.message with multiple lines", function() {
+    const rawLines = [
+      "class Foo {",
+      "  constructor() {",
+      "    console.log(arguments);",
+      "  }",
+      "};",
+    ].join("\n");
+    expect(
+      codeFrameColumns(
+        rawLines,
+        {
+          start: { line: 2, column: 17 },
+          end: { line: 4, column: 3 },
+        },
+        {
+          message: "something about the constructor body",
+        },
+      ),
+    ).toEqual(
+      [
+        "  1 | class Foo {",
+        "> 2 |   constructor() {",
+        "    |                 ^",
+        "> 3 |     console.log(arguments);",
+        "    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+        "> 4 |   }",
+        "    | ^^^ something about the constructor body",
+        "  5 | };",
+      ].join("\n"),
+    );
+  });
+
+  test("opts.message with multiple lines without columns", function() {
+    const rawLines = [
+      "class Foo {",
+      "  constructor() {",
+      "    console.log(arguments);",
+      "  }",
+      "};",
+    ].join("\n");
+    expect(
+      codeFrameColumns(
+        rawLines,
+        { start: { line: 2 }, end: { line: 4 } },
+        {
+          message: "something about the constructor body",
+        },
+      ),
+    ).toEqual(
+      [
+        "  something about the constructor body",
+        "  1 | class Foo {",
+        "> 2 |   constructor() {",
+        "> 3 |     console.log(arguments);",
+        "> 4 |   }",
+        "  5 | };",
+      ].join("\n"),
+    );
+  });
 });

packages/babel-core/README.md

@@ -93,7 +93,7 @@ babel.transformFileSync("filename.js", options).code;
 ```
 
 
-## babel.transformFromAst(ast: Object, code?: string, [options?](#options): Object, callback: Function)
+## babel.transformFromAst(ast: Object, code?: string, [options?](#options): Object, callback: Function): FileNode | null
 
 Given an [AST](https://astexplorer.net/), transform it.
 
@@ -123,6 +123,79 @@ const parsedAst = babylon.parse(sourceCode, { allowReturnOutsideFunction: true }
 const { code, map, ast } = babel.transformFromAstSync(parsedAst, sourceCode, options);
 ```
 
+## babel.parse(code: string, [options?](#options): Object)
+
+Given some code, parse it using Babel's standard behavior. Referenced presets and
+plugins will be loaded such that optional syntax plugins are automatically
+enabled.
+
+
+## Advanced APIs
+
+Many systems that wrap Babel like to automatically inject plugins and presets,
+or override options. To accomplish this goal, Babel exposes several functions
+that aid in loading the configuration part-way without transforming.
+
+### babel.loadOptions([options?](#options): Object)
+
+Resolve Babel's options fully, resulting in an options object where:
+
+* `opts.plugins` is a full list of `Plugin` instances.
+* `opts.presets` is empty and all presets are flattened into `opts`.
+* It can be safely passed back to Babel. Fields like `babelrc` have been set to 
+  false so that later calls to Babel will not make a second attempt to load
+  config files.
+
+`Plugin` instances aren't meant to be manipulated directly, but often
+callers will serialize this `opts` to JSON to use it as a cache key representing
+the options Babel has received. Caching on this isn't 100% guaranteed to
+invalidate properly, but it is the best we have at the moment.
+
+
+### babel.loadPartialConfig([options?](#options): Object): PartialConfig
+
+To allow systems to easily manipulate and validate a user's config, this function
+resolves the plugins and presets and proceeds no further. The expectation is
+that callers will take the config's `.options`, manipulate it as then see fit
+and pass it back to Babel again.
+
+* `babelrc: string | void` - The path of the `.babelrc` file, if there was one.
+* `babelignore: string | void` - The path of the `.babelignore` file, if there was one.
+* `options: ValidatedOptions` - The partially resolved options, which can be manipulated and passed back to Babel again.
+  * `plugins: Array<ConfigItem>` - See below.
+  * `presets: Array<ConfigItem>` - See below.
+  * It can be safely passed back to Babel. Fields like `babelrc` have been set
+    to false so that later calls to Babel will not make a second attempt to 
+    load config files.
+* `hasFilesystemConfig(): boolean` - Check if the resolved config loaded any settings from the filesystem.
+
+[`ConfigItem`](#configitem-type) instances expose properties to introspect the values, but each
+item should be treated as immutable. If changes are desired, the item should be
+removed from the list and replaced with either a normal Babel config value, or
+with a replacement item created by `babel.createConfigItem`. See that
+function for information about `ConfigItem` fields.
+
+
+### babel.createConfigItem(value: string | {} | Function | [string | {} | Function, {} | void], { dirname?: string, type?: "preset" | "plugin" }): ConfigItem
+
+Allows build tooling to create and cache config items up front. If this function
+is called multiple times for a given plugin, Babel will call the plugin's function itself
+multiple times. If you have a clear set of expected plugins and presets to
+inject, pre-constructing the config items would be recommended.
+
+
+### `ConfigItem` type
+
+Each `ConfigItem` exposes all of the information Babel knows. The fields are:
+
+* `value: {} | Function` - The resolved value of the plugin.
+* `options: {} | void` - The options object passed to the plugin.
+* `dirname: string` - The path that the options are relative to.
+* `name: string | void` - The name that the user gave the plugin instance, e.g. `plugins: [ ['env', {}, 'my-env'] ]` 
+* `file: Object | void` - Information about the plugin's file, if Babel knows it.
+  * `request: string` - The file that the user requested, e.g. `"@babel/env"`
+  * `resolved: string` - The full path of the resolved file, e.g. `"/tmp/node_modules/@babel/preset-env/lib/index.js"`
+
 
 ## Options
 
@@ -169,7 +242,6 @@ Following is a table of the options you can use:
 | `shouldPrintComment`     | `null`               | An optional callback that controls whether a comment should be output or not. Called as `shouldPrintComment(commentContents)`. **NOTE:** This overrides the `comment` option when used |
 | `sourceFileName`         | `(filenameRelative)` | Set `sources[0]` on returned source map |
 | `sourceMaps`             | `false`              | If truthy, adds a `map` property to returned output. If set to `"inline"`, a comment with a sourceMappingURL directive is added to the bottom of the returned code. If set to `"both"` then a `map` property is returned as well as a source map comment appended. **This does not emit sourcemap files by itself!** To have sourcemaps emitted using the CLI, you must pass it the `--source-maps` option |
-| `sourceMapTarget`        | `(filenameRelative)` | Set `file` on returned source map |
 | `sourceRoot`             | `(moduleRoot)`       | The root from which all sources are relative |
 | `sourceType`             | `"module"`           | Indicate the mode the code should be parsed in. Can be one of "script", "module", or "unambiguous". `"unambiguous"` will make Babel attempt to _guess_, based on the presence of ES6 `import` or `export` statements. Files with ES6 `import`s and `export`s are considered `"module"` and are otherwise `"script"`. |
 | `wrapPluginVisitorMethod`| `null`               | An optional callback that can be used to wrap visitor methods. **NOTE:** This is useful for things like introspection, and not really needed for implementing anything. Called as `wrapPluginVisitorMethod(pluginAlias, visitorType, callback)`.

packages/babel-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babel/core",
-  "version": "7.0.0-beta.38",
+  "version": "7.0.0-beta.44",
   "description": "Babel compiler core.",
   "main": "./lib/index.js",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
@@ -28,23 +28,24 @@
     "./lib/transform-file-sync.js": "./lib/transform-file-sync-browser.js"
   },
   "dependencies": {
-    "@babel/code-frame": "7.0.0-beta.38",
-    "@babel/generator": "7.0.0-beta.38",
-    "@babel/helpers": "7.0.0-beta.38",
-    "@babel/template": "7.0.0-beta.38",
-    "@babel/traverse": "7.0.0-beta.38",
-    "@babel/types": "7.0.0-beta.38",
-    "babylon": "7.0.0-beta.38",
+    "@babel/code-frame": "7.0.0-beta.44",
+    "@babel/generator": "7.0.0-beta.44",
+    "@babel/helpers": "7.0.0-beta.44",
+    "@babel/template": "7.0.0-beta.44",
+    "@babel/traverse": "7.0.0-beta.44",
+    "@babel/types": "7.0.0-beta.44",
+    "babylon": "7.0.0-beta.44",
     "convert-source-map": "^1.1.0",
-    "debug": "^3.0.1",
+    "debug": "^3.1.0",
     "json5": "^0.5.0",
     "lodash": "^4.2.0",
     "micromatch": "^2.3.11",
     "resolve": "^1.3.2",
+    "semver": "^5.4.1",
     "source-map": "^0.5.0"
   },
   "devDependencies": {
-    "@babel/helper-transform-fixture-test-runner": "7.0.0-beta.38",
-    "@babel/register": "7.0.0-beta.38"
+    "@babel/helper-transform-fixture-test-runner": "7.0.0-beta.44",
+    "@babel/register": "7.0.0-beta.44"
   }
 }

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

@@ -1,6 +1,6 @@
 // @flow
 
-type SimpleCacheConfigurator = SimpleCacheConfiguratorFn &
+export type SimpleCacheConfigurator = SimpleCacheConfiguratorFn &
   SimpleCacheConfiguratorObj;
 
 type SimpleCacheConfiguratorFn = {

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

@@ -13,10 +13,10 @@ import {
 const debug = buildDebug("babel:config:config-chain");
 
 import {
-  findBabelrc,
-  findBabelignore,
+  findRelativeConfig,
   loadConfig,
   type ConfigFile,
+  type IgnoreFile,
 } from "./files";
 
 import { makeWeakCache, makeStrongCache } from "./caching";
@@ -104,14 +104,18 @@ const loadPresetOverridesEnvDescriptors = makeWeakCache(
     ),
 );
 
+export type RootConfigChain = ConfigChain & {
+  babelrc: ConfigFile | void,
+  ignore: IgnoreFile | void,
+};
+
 /**
  * Build a config chain for Babel's full root configuration.
  */
 export function buildRootChain(
-  cwd: string,
   opts: ValidatedOptions,
   context: ConfigContext,
-): ConfigChain | null {
+): RootConfigChain | null {
   const programmaticChain = loadProgrammaticChain(
     {
       options: opts,
@@ -121,26 +125,24 @@ export function buildRootChain(
   );
   if (!programmaticChain) return null;
 
+  let ignore, babelrc;
+
   const fileChain = emptyChain();
   // resolve all .babelrc files
   if (opts.babelrc !== false && context.filename !== null) {
     const filename = context.filename;
-    const babelignoreFile = findBabelignore(filename);
-    if (
-      babelignoreFile &&
-      shouldIgnore(
-        context,
-        babelignoreFile.ignore,
-        null,
-        babelignoreFile.dirname,
-      )
-    ) {
+
+    ({ ignore, config: babelrc } = findRelativeConfig(
+      filename,
+      context.envName,
+    ));
+
+    if (ignore && shouldIgnore(context, ignore.ignore, null, ignore.dirname)) {
       return null;
     }
 
-    const babelrcFile = findBabelrc(filename, context.envName);
-    if (babelrcFile) {
-      const result = loadFileChain(babelrcFile, context);
+    if (babelrc) {
+      const result = loadFileChain(babelrc, context);
       if (!result) return null;
 
       mergeChain(fileChain, result);
@@ -158,6 +160,8 @@ export function buildRootChain(
     plugins: dedupDescriptors(chain.plugins),
     presets: dedupDescriptors(chain.presets),
     options: chain.options.map(o => normalizeOptions(o)),
+    ignore: ignore || undefined,
+    babelrc: babelrc || undefined,
   };
 }
 

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

@@ -2,6 +2,8 @@
 
 import { loadPlugin, loadPreset } from "./files";
 
+import { getItemDescriptor } from "./item";
+
 import {
   makeWeakCache,
   makeStrongCache,
@@ -33,6 +35,10 @@ export type UnloadedDescriptor = {
   dirname: string,
   alias: string,
   ownPass?: boolean,
+  file?: {
+    request: string,
+    resolved: string,
+  } | void,
 };
 
 export type ValidatedFile = {
@@ -152,16 +158,11 @@ function createDescriptors(
   ownPass?: boolean,
 ): Array<UnloadedDescriptor> {
   const descriptors = items.map((item, index) =>
-    createDescriptor(
-      item,
-      type === "plugin" ? loadPlugin : loadPreset,
-      dirname,
-      {
-        index,
-        alias,
-        ownPass: !!ownPass,
-      },
-    ),
+    createDescriptor(item, dirname, {
+      type,
+      alias: `${alias}$${index}`,
+      ownPass: !!ownPass,
+    }),
   );
 
   assertNoDuplicates(descriptors);
@@ -172,20 +173,24 @@ function createDescriptors(
 /**
  * Given a plugin/preset item, resolve it into a standard format.
  */
-function createDescriptor(
+export function createDescriptor(
   pair: PluginItem,
-  resolver,
-  dirname,
+  dirname: string,
   {
-    index,
+    type,
     alias,
     ownPass,
   }: {
-    index: number,
+    type?: "plugin" | "preset",
     alias: string,
     ownPass?: boolean,
   },
 ): UnloadedDescriptor {
+  const desc = getItemDescriptor(pair);
+  if (desc) {
+    return desc;
+  }
+
   let name;
   let options;
   let value = pair;
@@ -198,9 +203,23 @@ function createDescriptor(
     }
   }
 
+  let file = undefined;
   let filepath = null;
   if (typeof value === "string") {
+    if (typeof type !== "string") {
+      throw new Error(
+        "To resolve a string-based item, the type of item must be given",
+      );
+    }
+    const resolver = type === "plugin" ? loadPlugin : loadPreset;
+    const request = value;
+
     ({ filepath, value } = resolver(value, dirname));
+
+    file = {
+      request,
+      resolved: filepath,
+    };
   }
 
   if (!value) {
@@ -226,17 +245,18 @@ function createDescriptor(
     // config object, because it can be useful to define them in nested
     // configuration contexts.
     throw new Error(
-      "Plugin/Preset files are not allowed to export objects, only functions.",
+      `Plugin/Preset files are not allowed to export objects, only functions. In ${filepath}`,
     );
   }
 
   return {
     name,
-    alias: filepath || `${alias}$${index}`,
+    alias: filepath || alias,
     value,
     options,
     dirname,
     ownPass,
+    file,
   };
 }
 

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

@@ -6,6 +6,7 @@ import fs from "fs";
 import json5 from "json5";
 import resolve from "resolve";
 import { makeStrongCache, type CacheConfigurator } from "../caching";
+import makeAPI from "../helpers/config-api";
 
 const debug = buildDebug("babel:config:loading:files:configuration");
 
@@ -21,41 +22,58 @@ export type IgnoreFile = {
   ignore: Array<string>,
 };
 
+export type RelativeConfig = {
+  config: ConfigFile | null,
+  ignore: IgnoreFile | null,
+};
+
 const BABELRC_FILENAME = ".babelrc";
 const BABELRC_JS_FILENAME = ".babelrc.js";
 const PACKAGE_FILENAME = "package.json";
 const BABELIGNORE_FILENAME = ".babelignore";
 
-export function findBabelrc(
+export function findRelativeConfig(
   filepath: string,
   envName: string,
-): ConfigFile | null {
+): RelativeConfig {
+  let config = null;
+  let ignore = null;
+
   const dirname = path.dirname(filepath);
   let loc = dirname;
   while (true) {
-    const conf = [
-      BABELRC_FILENAME,
-      BABELRC_JS_FILENAME,
-      PACKAGE_FILENAME,
-    ].reduce((previousConfig: ConfigFile | null, name) => {
-      const filepath = path.join(loc, name);
-      const config = readConfig(filepath, envName);
+    if (!config) {
+      config = [BABELRC_FILENAME, BABELRC_JS_FILENAME, PACKAGE_FILENAME].reduce(
+        (previousConfig: ConfigFile | null, name) => {
+          const filepath = path.join(loc, name);
+          const config = readConfig(filepath, envName);
 
-      if (config && previousConfig) {
-        throw new Error(
-          `Multiple configuration files found. Please remove one:\n` +
-            ` - ${path.basename(previousConfig.filepath)}\n` +
-            ` - ${name}\n` +
-            `from ${loc}`,
-        );
+          if (config && previousConfig) {
+            throw new Error(
+              `Multiple configuration files found. Please remove one:\n` +
+                ` - ${path.basename(previousConfig.filepath)}\n` +
+                ` - ${name}\n` +
+                `from ${loc}`,
+            );
+          }
+
+          return config || previousConfig;
+        },
+        null,
+      );
+
+      if (config) {
+        debug("Found configuration %o from %o.", config.filepath, dirname);
       }
+    }
 
-      return config || previousConfig;
-    }, null);
+    if (!ignore) {
+      const ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
+      ignore = readIgnoreConfig(ignoreLoc);
 
-    if (conf) {
-      debug("Found configuration %o from %o.", conf.filepath, dirname);
-      return conf;
+      if (ignore) {
+        debug("Found ignore %o from %o.", ignore.filepath, dirname);
+      }
     }
 
     const nextLoc = path.dirname(loc);
@@ -63,27 +81,7 @@ export function findBabelrc(
     loc = nextLoc;
   }
 
-  return null;
-}
-
-export function findBabelignore(filepath: string): IgnoreFile | null {
-  const dirname = path.dirname(filepath);
-  let loc = dirname;
-  while (true) {
-    const ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
-    const ignore = readIgnoreConfig(ignoreLoc);
-
-    if (ignore) {
-      debug("Found ignore %o from %o.", ignore.filepath, dirname);
-      return ignore;
-    }
-
-    const nextLoc = path.dirname(loc);
-    if (loc === nextLoc) break;
-    loc = nextLoc;
-  }
-
-  return null;
+  return { config, ignore };
 }
 
 export function loadConfig(
@@ -106,7 +104,7 @@ 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) {
+function readConfig(filepath, envName): ConfigFile | null {
   return path.extname(filepath) === ".js"
     ? readConfigJS(filepath, { envName })
     : readConfigFile(filepath);
@@ -153,12 +151,7 @@ const readConfigJS = makeStrongCache(
     }
 
     if (typeof options === "function") {
-      options = options({
-        cache: cache.simple(),
-        // Expose ".env()" so people can easily get the same env that we expose using the "env" key.
-        env: () => cache.using(data => data.envName),
-        async: () => false,
-      });
+      options = options(makeAPI(cache));
 
       if (!cache.configured()) throwConfigError();
     }

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

@@ -1,27 +1,14 @@
 // @flow
 
-export type ConfigFile = {
-  filepath: string,
-  dirname: string,
-  options: {},
-};
+import type { ConfigFile, IgnoreFile, RelativeConfig } from "./configuration";
 
-export type IgnoreFile = {
-  filepath: string,
-  dirname: string,
-  ignore: Array<string>,
-};
+export type { ConfigFile, IgnoreFile, RelativeConfig };
 
-export function findBabelrc(
+export function findRelativeConfig(
   filepath: string,
   envName: string, // eslint-disable-line no-unused-vars
-): ConfigFile | null {
-  return null;
-}
-
-// eslint-disable-next-line no-unused-vars
-export function findBabelignore(filepath: string): IgnoreFile | null {
-  return null;
+): RelativeConfig {
+  return { config: null, ignore: null };
 }
 
 export function loadConfig(name: string, dirname: string): ConfigFile {

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

@@ -105,7 +105,6 @@ function resolveStandardizedName(
       } catch (e2) {}
 
       if (resolvedOriginal) {
-        // eslint-disable-next-line max-len
         e.message += `\n- If you want to resolve "${name}", use "module:${name}"`;
       }
     }
@@ -119,7 +118,6 @@ function resolveStandardizedName(
     } catch (e2) {}
 
     if (resolvedBabel) {
-      // eslint-disable-next-line max-len
       e.message += `\n- Did you mean "@babel/${name}"?`;
     }
 
@@ -131,7 +129,6 @@ function resolveStandardizedName(
     } catch (e2) {}
 
     if (resolvedOppositeType) {
-      // eslint-disable-next-line max-len
       e.message += `\n- Did you accidentally pass a ${type} as a ${oppositeType}?`;
     }
 
@@ -143,8 +140,9 @@ const LOADING_MODULES = new Set();
 function requireModule(type: string, name: string): mixed {
   if (LOADING_MODULES.has(name)) {
     throw new Error(
-      // eslint-disable-next-line max-len
-      `Reentrant ${type} detected trying to load "${name}". This module is not ignored and is trying to load itself while compiling itself, leading to a dependency cycle. We recommend adding it to your "ignore" list in your babelrc, or to a .babelignore.`,
+      `Reentrant ${type} detected trying to load "${name}". This module is not ignored ` +
+        "and is trying to load itself while compiling itself, leading to a dependency cycle. " +
+        'We recommend adding it to your "ignore" list in your babelrc, or to a .babelignore.',
     );
   }
 

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

@@ -0,0 +1,299 @@
+// @flow
+
+import { mergeOptions } from "./util";
+import * as context from "../index";
+import Plugin from "./plugin";
+import { getItemDescriptor } from "./item";
+import {
+  buildPresetChain,
+  type ConfigContext,
+  type ConfigChain,
+  type PresetInstance,
+} from "./config-chain";
+import type { UnloadedDescriptor } from "./config-descriptors";
+import traverse from "@babel/traverse";
+import { makeWeakCache, type CacheConfigurator } from "./caching";
+import { validate } from "./validation/options";
+import { validatePluginObject } from "./validation/plugins";
+import makeAPI from "./helpers/config-api";
+
+import loadPrivatePartialConfig from "./partial";
+
+type LoadedDescriptor = {
+  value: {},
+  options: {},
+  dirname: string,
+  alias: string,
+};
+
+export type { InputOptions } from "./validation/options";
+
+export type ResolvedConfig = {
+  options: Object,
+  passes: PluginPasses,
+};
+
+export type { Plugin };
+export type PluginPassList = Array<Plugin>;
+export type PluginPasses = Array<PluginPassList>;
+
+// Context not including filename since it is used in places that cannot
+// process 'ignore'/'only' and other filename-based logic.
+type SimpleContext = {
+  envName: string,
+};
+
+export default function loadFullConfig(
+  inputOpts: mixed,
+): ResolvedConfig | null {
+  const result = loadPrivatePartialConfig(inputOpts);
+  if (!result) {
+    return null;
+  }
+  const { options, context } = result;
+
+  const optionDefaults = {};
+  const passes = [[]];
+  try {
+    const { plugins, presets } = options;
+
+    if (!plugins || !presets) {
+      throw new Error("Assertion failure - plugins and presets exist");
+    }
+
+    const ignored = (function recurseDescriptors(
+      config: {
+        plugins: Array<UnloadedDescriptor>,
+        presets: Array<UnloadedDescriptor>,
+      },
+      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,
+        };
+      });
+
+      // resolve presets
+      if (presets.length > 0) {
+        // The passes are created in the same order as the preset list, but are inserted before any
+        // existing additional passes.
+        passes.splice(
+          1,
+          0,
+          ...presets.map(o => o.pass).filter(p => p !== pass),
+        );
+
+        for (const { preset, pass } of presets) {
+          if (!preset) return true;
+
+          const ignored = recurseDescriptors(
+            {
+              plugins: preset.plugins,
+              presets: preset.presets,
+            },
+            pass,
+          );
+          if (ignored) return true;
+
+          preset.options.forEach(opts => {
+            mergeOptions(optionDefaults, opts);
+          });
+        }
+      }
+
+      // resolve plugins
+      if (plugins.length > 0) {
+        pass.unshift(...plugins);
+      }
+    })(
+      {
+        plugins: plugins.map(item => {
+          const desc = getItemDescriptor(item);
+          if (!desc) {
+            throw new Error("Assertion failure - must be config item");
+          }
+
+          return desc;
+        }),
+        presets: presets.map(item => {
+          const desc = getItemDescriptor(item);
+          if (!desc) {
+            throw new Error("Assertion failure - must be config item");
+          }
+
+          return desc;
+        }),
+      },
+      passes[0],
+    );
+
+    if (ignored) return null;
+  } catch (e) {
+    // There are a few case where thrown errors will try to annotate themselves multiple times, so
+    // to keep things simple we just bail out if re-wrapping the message.
+    if (!/^\[BABEL\]/.test(e.message)) {
+      e.message = `[BABEL] ${context.filename || "unknown"}: ${e.message}`;
+    }
+
+    throw e;
+  }
+
+  const opts: Object = optionDefaults;
+  mergeOptions(opts, options);
+
+  opts.plugins = passes[0];
+  opts.presets = passes
+    .slice(1)
+    .filter(plugins => plugins.length > 0)
+    .map(plugins => ({ plugins }));
+  opts.passPerPreset = opts.presets.length > 0;
+
+  return {
+    options: opts,
+    passes: passes,
+  };
+}
+
+/**
+ * Load a generic plugin/preset from the given descriptor loaded from the config object.
+ */
+const loadDescriptor = makeWeakCache(
+  (
+    { value, options, dirname, alias }: UnloadedDescriptor,
+    cache: CacheConfigurator<SimpleContext>,
+  ): LoadedDescriptor => {
+    // Disabled presets should already have been filtered out
+    if (options === false) throw new Error("Assertion failure");
+
+    options = options || {};
+
+    let item = value;
+    if (typeof value === "function") {
+      const api = Object.assign({}, context, makeAPI(cache));
+      try {
+        item = value(api, options, dirname);
+      } catch (e) {
+        if (alias) {
+          e.message += ` (While processing: ${JSON.stringify(alias)})`;
+        }
+        throw e;
+      }
+    }
+
+    if (!item || typeof item !== "object") {
+      throw new Error("Plugin/Preset did not return an object.");
+    }
+
+    if (typeof item.then === "function") {
+      throw new Error(
+        `You appear to be using an async plugin, ` +
+          `which your current version of Babel does not support.` +
+          `If you're using a published plugin, ` +
+          `you may need to upgrade your @babel/core version.`,
+      );
+    }
+
+    return { value: item, options, dirname, alias };
+  },
+);
+
+/**
+ * Instantiate a plugin for the given descriptor, returning the plugin/options pair.
+ */
+function loadPluginDescriptor(
+  descriptor: UnloadedDescriptor,
+  context: SimpleContext,
+): Plugin {
+  if (descriptor.value instanceof Plugin) {
+    if (descriptor.options) {
+      throw new Error(
+        "Passed options to an existing Plugin instance will not work.",
+      );
+    }
+
+    return descriptor.value;
+  }
+
+  return instantiatePlugin(loadDescriptor(descriptor, context), context);
+}
+
+const instantiatePlugin = makeWeakCache(
+  (
+    { value, options, dirname, alias }: LoadedDescriptor,
+    cache: CacheConfigurator<SimpleContext>,
+  ): Plugin => {
+    const pluginObj = validatePluginObject(value);
+
+    const plugin = Object.assign({}, pluginObj);
+    if (plugin.visitor) {
+      plugin.visitor = traverse.explode(Object.assign({}, plugin.visitor));
+    }
+
+    if (plugin.inherits) {
+      const inheritsDescriptor = {
+        name: undefined,
+        alias: `${alias}$inherits`,
+        value: plugin.inherits,
+        options,
+        dirname,
+      };
+
+      // If the inherited plugin changes, reinstantiate this plugin.
+      const inherits = cache.invalidate(data =>
+        loadPluginDescriptor(inheritsDescriptor, data),
+      );
+
+      plugin.pre = chain(inherits.pre, plugin.pre);
+      plugin.post = chain(inherits.post, plugin.post);
+      plugin.manipulateOptions = chain(
+        inherits.manipulateOptions,
+        plugin.manipulateOptions,
+      );
+      plugin.visitor = traverse.visitors.merge([
+        inherits.visitor || {},
+        plugin.visitor || {},
+      ]);
+    }
+
+    return new Plugin(plugin, options, alias);
+  },
+);
+
+/**
+ * Generate a config object that will act as the root of a new nested config.
+ */
+const loadPresetDescriptor = (
+  descriptor: UnloadedDescriptor,
+  context: ConfigContext,
+): ConfigChain | null => {
+  return buildPresetChain(
+    instantiatePreset(loadDescriptor(descriptor, context)),
+    context,
+  );
+};
+
+const instantiatePreset = makeWeakCache(
+  ({ value, dirname, alias }: LoadedDescriptor): PresetInstance => {
+    return {
+      options: validate("preset", value),
+      alias,
+      dirname,
+    };
+  },
+);
+
+function chain(a, b) {
+  const fns = [a, b].filter(Boolean);
+  if (fns.length <= 1) return fns[0];
+
+  return function(...args) {
+    for (const fn of fns) {
+      fn.apply(this, args);
+    }
+  };
+}

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

@@ -0,0 +1,91 @@
+// @flow
+
+import semver from "semver";
+import { version as coreVersion } from "../../";
+import type { CacheConfigurator, SimpleCacheConfigurator } from "../caching";
+
+type EnvFunction = {
+  (): string,
+  <T>((string) => T): T,
+  (string): boolean,
+  (Array<string>): boolean,
+};
+
+export type PluginAPI = {
+  version: string,
+  cache: SimpleCacheConfigurator,
+  env: EnvFunction,
+  async: () => boolean,
+  assertVersion: typeof assertVersion,
+};
+
+export default function makeAPI(
+  cache: CacheConfigurator<{ envName: string }>,
+): PluginAPI {
+  const env: any = value =>
+    cache.using(data => {
+      if (typeof value === "undefined") return data.envName;
+      if (typeof value === "function") return value(data.envName);
+      if (!Array.isArray(value)) value = [value];
+
+      return value.some(entry => {
+        if (typeof entry !== "string") {
+          throw new Error("Unexpected non-string value");
+        }
+        return entry === data.envName;
+      });
+    });
+
+  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,
+    assertVersion,
+  };
+}
+
+function assertVersion(range: string | number): void {
+  if (typeof range === "number") {
+    if (!Number.isInteger(range)) {
+      throw new Error("Expected string or integer value.");
+    }
+    range = `^${range}.0.0-0`;
+  }
+  if (typeof range !== "string") {
+    throw new Error("Expected string or integer value.");
+  }
+
+  if (semver.satisfies(coreVersion, range)) return;
+
+  const limit = Error.stackTraceLimit;
+
+  if (typeof limit === "number" && limit < 25) {
+    // Bump up the limit if needed so that users are more likely
+    // to be able to see what is calling Babel.
+    Error.stackTraceLimit = 25;
+  }
+
+  const err = new Error(
+    `Requires Babel "${range}", but was loaded with "${coreVersion}". ` +
+      `If you are sure you have a compatible version of @babel/core, ` +
+      `it is likely that something in your build process is loading the ` +
+      `wrong version. Inspect the stack trace of this error to look for ` +
+      `the first entry that doesn't mention "@babel/core" or "babel-core" ` +
+      `to see what is calling Babel.`,
+  );
+
+  if (typeof limit === "number") {
+    Error.stackTraceLimit = limit;
+  }
+
+  throw Object.assign(
+    err,
+    ({
+      code: "BABEL_VERSION_UNSUPPORTED",
+      version: coreVersion,
+      range,
+    }: any),
+  );
+}

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

@@ -1,306 +1,26 @@
 // @flow
 
-import path from "path";
-import * as context from "../index";
-import Plugin from "./plugin";
-import merge from "lodash/merge";
-import {
-  buildRootChain,
-  buildPresetChain,
-  type ConfigContext,
-  type ConfigChain,
-  type PresetInstance,
-} from "./config-chain";
-import type { UnloadedDescriptor } from "./config-descriptors";
-import traverse from "@babel/traverse";
-import clone from "lodash/clone";
-import { makeWeakCache, type CacheConfigurator } from "./caching";
-import { getEnv } from "./helpers/environment";
-import { validate } from "./validation/options";
-import { validatePluginObject } from "./validation/plugins";
+import loadFullConfig from "./full";
+export type {
+  ResolvedConfig,
+  InputOptions,
+  PluginPasses,
+  Plugin,
+} from "./full";
 
-type LoadedDescriptor = {
-  value: {},
-  options: {},
-  dirname: string,
-  alias: string,
-};
+export { loadFullConfig as default };
+export { loadPartialConfig } from "./partial";
+export type { PartialConfig } from "./partial";
 
-export type { InputOptions } from "./validation/options";
+export function loadOptions(opts: {}): Object | null {
+  const config = loadFullConfig(opts);
 
-export type ResolvedConfig = {
-  options: Object,
-  passes: PluginPasses,
-};
-
-export type { Plugin };
-export type PluginPassList = Array<Plugin>;
-export type PluginPasses = Array<PluginPassList>;
-
-// Context not including filename since it is used in places that cannot
-// process 'ignore'/'only' and other filename-based logic.
-type SimpleContext = {
-  envName: string,
-};
-
-export default function loadConfig(inputOpts: mixed): ResolvedConfig | null {
-  if (
-    inputOpts != null &&
-    (typeof inputOpts !== "object" || Array.isArray(inputOpts))
-  ) {
-    throw new Error("Babel options must be an object, null, or undefined");
-  }
-
-  const args = inputOpts ? validate("arguments", inputOpts) : {};
-
-  const { envName = getEnv(), cwd = "." } = args;
-  const absoluteCwd = path.resolve(cwd);
-
-  const context: ConfigContext = {
-    filename: args.filename ? path.resolve(cwd, args.filename) : null,
-    cwd: absoluteCwd,
-    envName,
-  };
-
-  const configChain = buildRootChain(absoluteCwd, args, context);
-  if (!configChain) return null;
-
-  const optionDefaults = {};
-  const options = {};
-  const passes = [[]];
-  try {
-    const ignored = (function recurseDescriptors(
-      config: {
-        plugins: Array<UnloadedDescriptor>,
-        presets: Array<UnloadedDescriptor>,
-      },
-      pass: Array<Plugin>,
-    ) {
-      const plugins = config.plugins.map(descriptor =>
-        loadPluginDescriptor(descriptor, context),
-      );
-      const presets = config.presets.map(descriptor => {
-        return {
-          preset: loadPresetDescriptor(descriptor, context),
-          pass: descriptor.ownPass ? [] : pass,
-        };
-      });
-
-      // resolve presets
-      if (presets.length > 0) {
-        // The passes are created in the same order as the preset list, but are inserted before any
-        // existing additional passes.
-        passes.splice(
-          1,
-          0,
-          ...presets.map(o => o.pass).filter(p => p !== pass),
-        );
-
-        for (const { preset, pass } of presets) {
-          if (!preset) return true;
-
-          const ignored = recurseDescriptors(
-            {
-              plugins: preset.plugins,
-              presets: preset.presets,
-            },
-            pass,
-          );
-          if (ignored) return true;
-
-          preset.options.forEach(opts => {
-            merge(optionDefaults, opts);
-          });
-        }
-      }
-
-      // resolve plugins
-      if (plugins.length > 0) {
-        pass.unshift(...plugins);
-      }
-    })(
-      {
-        plugins: configChain.plugins,
-        presets: configChain.presets,
-      },
-      passes[0],
-    );
-
-    if (ignored) return null;
-
-    configChain.options.forEach(opts => {
-      merge(options, opts);
-    });
-  } catch (e) {
-    // There are a few case where thrown errors will try to annotate themselves multiple times, so
-    // to keep things simple we just bail out if re-wrapping the message.
-    if (!/^\[BABEL\]/.test(e.message)) {
-      e.message = `[BABEL] ${args.filename || "unknown"}: ${e.message}`;
-    }
-
-    throw e;
-  }
-
-  const opts: Object = merge(optionDefaults, options);
-
-  // Tack the passes onto the object itself so that, if this object is passed back to Babel a second time,
-  // it will be in the right structure to not change behavior.
-  opts.babelrc = false;
-  opts.plugins = passes[0];
-  opts.presets = passes
-    .slice(1)
-    .filter(plugins => plugins.length > 0)
-    .map(plugins => ({ plugins }));
-  opts.passPerPreset = opts.presets.length > 0;
-  opts.envName = envName;
-  opts.cwd = absoluteCwd;
-
-  return {
-    options: opts,
-    passes: passes,
-  };
+  return config ? config.options : null;
 }
 
-/**
- * Load a generic plugin/preset from the given descriptor loaded from the config object.
- */
-const loadDescriptor = makeWeakCache(
-  (
-    { value, options, dirname, alias }: UnloadedDescriptor,
-    cache: CacheConfigurator<SimpleContext>,
-  ): LoadedDescriptor => {
-    // Disabled presets should already have been filtered out
-    if (options === false) throw new Error("Assertion failure");
-
-    options = options || {};
-
-    let item = value;
-    if (typeof value === "function") {
-      const api = Object.assign(Object.create(context), {
-        cache: cache.simple(),
-        env: () => cache.using(data => data.envName),
-        async: () => false,
-      });
-
-      try {
-        item = value(api, options, dirname);
-      } catch (e) {
-        if (alias) {
-          e.message += ` (While processing: ${JSON.stringify(alias)})`;
-        }
-        throw e;
-      }
-    }
-
-    if (!item || typeof item !== "object") {
-      throw new Error("Plugin/Preset did not return an object.");
-    }
-
-    if (typeof item.then === "function") {
-      throw new Error(
-        `You appear to be using an async plugin, ` +
-          `which your current version of Babel does not support.` +
-          `If you're using a published plugin, ` +
-          `you may need to upgrade your @babel/core version.`,
-      );
-    }
-
-    return { value: item, options, dirname, alias };
-  },
-);
-
-/**
- * Instantiate a plugin for the given descriptor, returning the plugin/options pair.
- */
-function loadPluginDescriptor(
-  descriptor: UnloadedDescriptor,
-  context: SimpleContext,
-): Plugin {
-  if (descriptor.value instanceof Plugin) {
-    if (descriptor.options) {
-      throw new Error(
-        "Passed options to an existing Plugin instance will not work.",
-      );
-    }
-
-    return descriptor.value;
+// For easier backward-compatibility, provide an API like the one we exposed in Babel 6.
+export class OptionManager {
+  init(opts: {}) {
+    return loadOptions(opts);
   }
-
-  return instantiatePlugin(loadDescriptor(descriptor, context), context);
-}
-
-const instantiatePlugin = makeWeakCache(
-  (
-    { value, options, dirname, alias }: LoadedDescriptor,
-    cache: CacheConfigurator<SimpleContext>,
-  ): Plugin => {
-    const pluginObj = validatePluginObject(value);
-
-    const plugin = Object.assign({}, pluginObj);
-    if (plugin.visitor) {
-      plugin.visitor = traverse.explode(clone(plugin.visitor));
-    }
-
-    if (plugin.inherits) {
-      const inheritsDescriptor = {
-        name: undefined,
-        alias: `${alias}$inherits`,
-        value: plugin.inherits,
-        options,
-        dirname,
-      };
-
-      // If the inherited plugin changes, reinstantiate this plugin.
-      const inherits = cache.invalidate(data =>
-        loadPluginDescriptor(inheritsDescriptor, data),
-      );
-
-      plugin.pre = chain(inherits.pre, plugin.pre);
-      plugin.post = chain(inherits.post, plugin.post);
-      plugin.manipulateOptions = chain(
-        inherits.manipulateOptions,
-        plugin.manipulateOptions,
-      );
-      plugin.visitor = traverse.visitors.merge([
-        inherits.visitor || {},
-        plugin.visitor || {},
-      ]);
-    }
-
-    return new Plugin(plugin, options, alias);
-  },
-);
-
-/**
- * Generate a config object that will act as the root of a new nested config.
- */
-const loadPresetDescriptor = (
-  descriptor: UnloadedDescriptor,
-  context: ConfigContext,
-): ConfigChain | null => {
-  return buildPresetChain(
-    instantiatePreset(loadDescriptor(descriptor, context)),
-    context,
-  );
-};
-
-const instantiatePreset = makeWeakCache(
-  ({ value, dirname, alias }: LoadedDescriptor): PresetInstance => {
-    return {
-      options: validate("preset", value),
-      alias,
-      dirname,
-    };
-  },
-);
-
-function chain(a, b) {
-  const fns = [a, b].filter(Boolean);
-  if (fns.length <= 1) return fns[0];
-
-  return function(...args) {
-    for (const fn of fns) {
-      fn.apply(this, args);
-    }
-  };
 }

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

@@ -0,0 +1,128 @@
+// @flow
+
+import type { PluginTarget, PluginOptions } from "./validation/options";
+
+import path from "path";
+import {
+  createDescriptor,
+  type UnloadedDescriptor,
+} from "./config-descriptors";
+
+export function createItemFromDescriptor(desc: UnloadedDescriptor): ConfigItem {
+  return new ConfigItem(desc);
+}
+
+/**
+ * Create a config item using the same value format used in Babel's config
+ * files. Items returned from this function should be cached by the caller
+ * ideally, as recreating the config item will mean re-resolving the item
+ * and re-evaluating the plugin/preset function.
+ */
+export function createConfigItem(
+  value:
+    | PluginTarget
+    | [PluginTarget, PluginOptions]
+    | [PluginTarget, PluginOptions, string | void],
+  {
+    dirname = ".",
+    type,
+  }: {
+    dirname?: string,
+    type?: "preset" | "plugin",
+  } = {},
+): ConfigItem {
+  const descriptor = createDescriptor(value, path.resolve(dirname), {
+    type,
+    alias: "programmatic item",
+  });
+
+  return createItemFromDescriptor(descriptor);
+}
+
+export function getItemDescriptor(item: mixed): UnloadedDescriptor | void {
+  if (item instanceof ConfigItem) {
+    return item._descriptor;
+  }
+
+  return undefined;
+}
+
+export type { ConfigItem };
+
+/**
+ * A public representation of a plugin/preset that will _eventually_ be load.
+ * Users can use this to interact with the results of a loaded Babel
+ * configuration.
+ *
+ * Any changes to public properties of this class should be considered a
+ * breaking change to Babel's API.
+ */
+class ConfigItem {
+  /**
+   * The private underlying descriptor that Babel actually cares about.
+   * If you access this, you are a bad person.
+   */
+  _descriptor: UnloadedDescriptor;
+
+  /**
+   * The resolved value of the item itself.
+   */
+  value: {} | Function;
+
+  /**
+   * The options, if any, that were passed to the item.
+   * Mutating this will lead to undefined behavior. If you need
+   */
+  options: {} | void;
+
+  /**
+   * The directory that the options for this item are relative to.
+   */
+  dirname: string;
+
+  /**
+   * Get the name of the plugin, if the user gave it one.
+   */
+  name: string | void;
+
+  /**
+   * Data about the file that the item was loaded from, if Babel knows it.
+   */
+  file: {
+    // The requested path, e.g. "@babel/env".
+    request: string,
+
+    // The resolved absolute path of the file.
+    resolved: string,
+  } | void;
+
+  constructor(descriptor: UnloadedDescriptor) {
+    // Make people less likely to stumble onto this if they are exploring
+    // programmatically, and also make sure that if people happen to
+    // pass the item through JSON.stringify, it doesn't show up.
+    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;
+    this.name = this._descriptor.name;
+    this.file = this._descriptor.file
+      ? {
+          request: this._descriptor.file.request,
+          resolved: this._descriptor.file.resolved,
+        }
+      : undefined;
+
+    // Freeze the object to make it clear that people shouldn't expect mutating
+    // this object to do anything. A new item should be created if they want
+    // to change something.
+    Object.freeze(this);
+  }
+}
+
+Object.freeze(ConfigItem.prototype);

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

@@ -0,0 +1,128 @@
+// @flow
+
+import path from "path";
+import Plugin from "./plugin";
+import { mergeOptions } from "./util";
+import { createItemFromDescriptor } from "./item";
+import { buildRootChain, type ConfigContext } from "./config-chain";
+import { getEnv } from "./helpers/environment";
+import { validate, type ValidatedOptions } from "./validation/options";
+
+import type { ConfigFile, IgnoreFile } from "./files";
+
+export default function loadPrivatePartialConfig(
+  inputOpts: mixed,
+): {
+  options: ValidatedOptions,
+  context: ConfigContext,
+  ignore: IgnoreFile | void,
+  babelrc: ConfigFile | void,
+} | null {
+  if (
+    inputOpts != null &&
+    (typeof inputOpts !== "object" || Array.isArray(inputOpts))
+  ) {
+    throw new Error("Babel options must be an object, null, or undefined");
+  }
+
+  const args = inputOpts ? validate("arguments", inputOpts) : {};
+
+  const { envName = getEnv(), cwd = "." } = args;
+  const absoluteCwd = path.resolve(cwd);
+
+  const context: ConfigContext = {
+    filename: args.filename ? path.resolve(cwd, args.filename) : null,
+    cwd: absoluteCwd,
+    envName,
+  };
+
+  const configChain = buildRootChain(args, context);
+  if (!configChain) return null;
+
+  const options = {};
+  configChain.options.forEach(opts => {
+    mergeOptions(options, opts);
+  });
+
+  // Tack the passes onto the object itself so that, if this object is
+  // passed back to Babel a second time, it will be in the right structure
+  // to not change behavior.
+  options.babelrc = false;
+  options.envName = envName;
+  options.cwd = absoluteCwd;
+  options.passPerPreset = false;
+
+  options.plugins = configChain.plugins.map(descriptor =>
+    createItemFromDescriptor(descriptor),
+  );
+  options.presets = configChain.presets.map(descriptor =>
+    createItemFromDescriptor(descriptor),
+  );
+
+  return {
+    options,
+    context,
+    ignore: configChain.ignore,
+    babelrc: configChain.babelrc,
+  };
+}
+
+export function loadPartialConfig(inputOpts: mixed): PartialConfig | null {
+  const result = loadPrivatePartialConfig(inputOpts);
+  if (!result) return null;
+
+  const { options, babelrc, ignore } = result;
+
+  (options.plugins || []).forEach(item => {
+    if (item.value instanceof Plugin) {
+      throw new Error(
+        "Passing cached plugin instances is not supported in " +
+          "babel.loadPartialConfig()",
+      );
+    }
+  });
+
+  return new PartialConfig(
+    options,
+    babelrc ? babelrc.filepath : undefined,
+    ignore ? ignore.filepath : undefined,
+  );
+}
+
+export type { PartialConfig };
+
+class PartialConfig {
+  /**
+   * These properties are public, so any changes to them should be considered
+   * a breaking change to Babel's API.
+   */
+  options: ValidatedOptions;
+  babelrc: string | void;
+  babelignore: string | void;
+
+  constructor(
+    options: ValidatedOptions,
+    babelrc: string | void,
+    ignore: string | void,
+  ) {
+    this.options = options;
+    this.babelignore = ignore;
+    this.babelrc = babelrc;
+
+    // Freeze since this is a public API and it should be extremely obvious that
+    // reassigning properties on here does nothing.
+    Object.freeze(this);
+  }
+
+  /**
+   * Returns true if their is a config file in the filesystem for this config.
+   *
+   * While this only means .babelrc(.mjs)?/package.json#babel right now, it
+   * may well expand in the future, so using this is recommended vs checking
+   * this.babelrc directly.
+   */
+  hasFilesystemConfig(): boolean {
+    return this.babelrc !== undefined;
+  }
+}
+Object.freeze(PartialConfig.prototype);

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

@@ -0,0 +1,30 @@
+// @flow
+
+import type { ValidatedOptions } from "./validation/options";
+
+export function mergeOptions(
+  target: ValidatedOptions,
+  source: ValidatedOptions,
+): void {
+  for (const k of Object.keys(source)) {
+    if (k === "parserOpts" && source.parserOpts) {
+      const parserOpts = source.parserOpts;
+      const targetObj = (target.parserOpts = target.parserOpts || {});
+      mergeDefaultFields(targetObj, parserOpts);
+    } else if (k === "generatorOpts" && source.generatorOpts) {
+      const generatorOpts = source.generatorOpts;
+      const targetObj = (target.generatorOpts = target.generatorOpts || {});
+      mergeDefaultFields(targetObj, generatorOpts);
+    } else {
+      const val = source[k];
+      if (val !== undefined) target[k] = (val: any);
+    }
+  }
+}
+
+function mergeDefaultFields<T: {}>(target: T, source: T) {
+  for (const k of Object.keys(source)) {
+    const val = source[k];
+    if (val !== undefined) target[k] = (val: any);
+  }
+}

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

@@ -140,6 +140,8 @@ export function assertConfigApplicableTest(
   key: string,
   value: mixed,
 ): ConfigApplicableTest | void {
+  if (value === undefined) return value;
+
   if (Array.isArray(value)) {
     value.forEach((item, i) => {
       if (!checkValidTest(item)) {

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

@@ -1,5 +1,8 @@
 // @flow
 
+import type { ConfigItem } from "../item";
+import Plugin from "../plugin";
+
 import removed from "./removed";
 import {
   assertString,
@@ -116,9 +119,6 @@ const COMMON_VALIDATORS: ValidatorSet = {
   sourceMap: (assertSourceMaps: Validator<
     $PropertyType<ValidatedOptions, "sourceMap">,
   >),
-  sourceMapTarget: (assertString: Validator<
-    $PropertyType<ValidatedOptions, "sourceMapTarget">,
-  >),
   sourceFileName: (assertString: Validator<
     $PropertyType<ValidatedOptions, "sourceFileName">,
   >),
@@ -189,7 +189,6 @@ export type ValidatedOptions = {
   // Sourcemap generation options.
   sourceMaps?: SourceMapsOption,
   sourceMap?: SourceMapsOption,
-  sourceMapTarget?: string,
   sourceFileName?: string,
   sourceRoot?: string,
 
@@ -214,10 +213,11 @@ export type IgnoreList = $ReadOnlyArray<IgnoreItem>;
 export type PluginOptions = {} | void | false;
 export type PluginTarget = string | {} | Function;
 export type PluginItem =
+  | ConfigItem
   | Plugin
   | PluginTarget
   | [PluginTarget, PluginOptions]
-  | [PluginTarget, PluginOptions, string];
+  | [PluginTarget, PluginOptions, string | void];
 export type PluginList = $ReadOnlyArray<PluginItem>;
 
 export type OverridesList = Array<ValidatedOptions>;

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

@@ -1,5 +1,4 @@
 // @flow
-/* eslint max-len: "off" */
 
 export default {
   auxiliaryComment: {
@@ -16,35 +15,42 @@ export default {
   },
   externalHelpers: {
     message:
-      "Use the `external-helpers` plugin instead. Check out http://babeljs.io/docs/plugins/external-helpers/",
+      "Use the `external-helpers` plugin instead. " +
+      "Check out http://babeljs.io/docs/plugins/external-helpers/",
   },
   extra: {
     message: "",
   },
   jsxPragma: {
     message:
-      "use the `pragma` option in the `react-jsx` plugin . Check out http://babeljs.io/docs/plugins/transform-react-jsx/",
+      "use the `pragma` option in the `react-jsx` plugin. " +
+      "Check out http://babeljs.io/docs/plugins/transform-react-jsx/",
   },
   loose: {
     message:
-      "Specify the `loose` option for the relevant plugin you are using or use a preset that sets the option.",
+      "Specify the `loose` option for the relevant plugin you are using " +
+      "or use a preset that sets the option.",
   },
   metadataUsedHelpers: {
     message: "Not required anymore as this is enabled by default",
   },
   modules: {
     message:
-      "Use the corresponding module transform plugin in the `plugins` option. Check out http://babeljs.io/docs/plugins/#modules",
+      "Use the corresponding module transform plugin in the `plugins` option. " +
+      "Check out http://babeljs.io/docs/plugins/#modules",
   },
   nonStandard: {
     message:
-      "Use the `react-jsx` and `flow-strip-types` plugins to support JSX and Flow. Also check out the react preset http://babeljs.io/docs/plugins/preset-react/",
+      "Use the `react-jsx` and `flow-strip-types` plugins to support JSX and Flow. " +
+      "Also check out the react preset http://babeljs.io/docs/plugins/preset-react/",
   },
   optional: {
     message: "Put the specific transforms you want in the `plugins` option",
   },
   sourceMapName: {
-    message: "Use the `sourceMapTarget` option",
+    message:
+      "The `sourceMapName` option has been removed because it makes more sense for the " +
+      "tooling that calls Babel to assign `map.file` themselves.",
   },
   stage: {
     message:
@@ -64,4 +70,11 @@ export default {
     message:
       "Generated plugin metadata is always included in the output result",
   },
+
+  sourceMapTarget: {
+    version: 6,
+    message:
+      "The `sourceMapTarget` option has been removed because it makes more sense for the tooling " +
+      "that calls Babel to assign `map.file` themselves.",
+  },
 };