jestjs · SimenB · Dec 18, 2018 · Sep 5, 2018 · Sep 5, 2018 · Sep 5, 2018
diff --git a/.babelrc b/.babelrc
diff --git a/README.md b/README.md
@@ -100,39 +100,22 @@ If you'd like to learn more about running `jest` through the command line, take
 
 ### Using Babel
 
-[Babel](http://babeljs.io/) is automatically handled by Jest using `babel-jest`. You don't need install anything extra for using Babel.
+To use [Babel](http://babeljs.io/), install the `babel-jest` and `@babel/core` packages:
 
-> Note: If you are using Babel version 7 then you need to install `babel-jest`, `babel-core@^7.0.0-bridge.0` and `@babel/core` with the following command:
->
-> ```bash
-> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
-> ```
+```bash
+yarn add --dev babel-jest @babel/core
+```
 
-Don't forget to add a [`.babelrc`](https://babeljs.io/docs/usage/babelrc/) file in your project's root folder. For example, if you are using ES6 and [React.js](https://reactjs.org) with the [`babel-preset-env`](https://babeljs.io/docs/plugins/preset-env/) and [`babel-preset-react`](https://babeljs.io/docs/plugins/preset-react/) presets:
+Don't forget to add a [`babel.config.js`](https://babeljs.io/docs/en/config-files) file in your project's root folder. For example, if you are using ES6 and [React.js](https://reactjs.org) with the [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env) and [`@babel/preset-react`](https://babeljs.io/docs/en/babel-preset-react) presets:
 
-```json
-{
-  "presets": ["env", "react"]
-}
+```js
+module.exports = {
+  presets: ['@babel/preset-env', '@babel/preset-react'],
+};
 ```
 
 You are now set up to use all ES6 features and React specific syntax.
 
-> Note: If you are using a more complicated Babel configuration, using Babel's `env` option, keep in mind that Jest will automatically define `NODE_ENV` as `test`. It will not use `development` section like Babel does by default when no `NODE_ENV` is set.
-
-> Note: If you've turned off transpilation of ES modules with the option `{ "modules": false }`, you have to make sure to turn this on in your test environment.
-
-```json
-{
-  "presets": [["env", {"modules": false}], "react"],
-  "env": {
-    "test": {
-      "presets": [["env"], "react"]
-    }
-  }
-}
-```
-
 > Note: `babel-jest` is automatically installed when installing Jest and will automatically transform files if a babel configuration exists in your project. To avoid this behavior, you can explicitly reset the `transform` configuration option:
 
 ```json

diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,22 @@
+module.exports = {
+  // babelrcRoots: ['.', 'packages/*', 'examples/*'],
+  plugins: [
+    // Required by some examples, like react-native. Without this plugin,
+    // they will simply crash before relative configs can be found.
+    // '@babel/plugin-proposal-class-properties',
+    ['@babel/plugin-transform-modules-commonjs', {allowTopLevelThis: true}],
+  ],
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        shippedProposals: true,
+        targets: {node: '6'},
+        useBuiltIns: 'usage',
+      },
+    ],
+    '@babel/preset-flow',
+    // Some tests contain JSX
+    '@babel/preset-react',
+  ],
+};
diff --git a/docs/Es6ClassMocks.md b/docs/Es6ClassMocks.md
@@ -227,7 +227,7 @@ jest.mock('./sound-player', () => {
 });
 ```
 
-This will throw **_TypeError: \_soundPlayer2.default is not a constructor_**, unless the code is transpiled to ES5, e.g. by babel-preset-env. (ES5 doesn't have arrow functions nor classes, so both will be transpiled to plain functions.)
+This will throw **_TypeError: \_soundPlayer2.default is not a constructor_**, unless the code is transpiled to ES5, e.g. by `@babel/preset-env`. (ES5 doesn't have arrow functions nor classes, so both will be transpiled to plain functions.)
 
 ## Keeping track of usage (spying on the mock)
 

diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
@@ -79,49 +79,22 @@ jest --init
 
 ### Using Babel
 
-To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-runtime` packages:
+To use [Babel](http://babeljs.io/), install the `babel-jest` and `@babel/core` packages:
 
 ```bash
-yarn add --dev babel-jest babel-core regenerator-runtime
+yarn add --dev babel-jest @babel/core
 ```
 
-> Note: If you are using Babel version 7 then you need to install `babel-jest`, `babel-core@^7.0.0-bridge.0` and `@babel/core` with the following command:
->
-> ```bash
-> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
-> ```
->
-> You will need to use `babel.config.js` in order to transpile `node_modules`. See https://babeljs.io/docs/en/next/config-files for more information.
->
-> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
+Don't forget to add a [`babel.config.js`](https://babeljs.io/docs/en/config-files) file in your project's root folder. For example, if you are using ES6 and [React.js](https://reactjs.org) with the [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env) and [`@babel/preset-react`](https://babeljs.io/docs/en/babel-preset-react) presets:
 
-_Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_
-
-Don't forget to add a [`.babelrc`](https://babeljs.io/docs/usage/babelrc/) file in your project's root folder. For example, if you are using ES6 and [React.js](https://facebook.github.io/react/) with the [`babel-preset-env`](https://babeljs.io/docs/plugins/preset-env/) and [`babel-preset-react`](https://babeljs.io/docs/plugins/preset-react/) presets:
-
-```json
-{
-  "presets": ["env", "react"]
-}
+```js
+module.exports = {
+  presets: ['@babel/preset-env', '@babel/preset-react'],
+};
 ```
 
 You are now set up to use all ES6 features and React specific syntax.
 
-> Note: If you are using a more complicated Babel configuration, using Babel's `env` option, keep in mind that Jest will automatically define `NODE_ENV` as `test`. It will not use `development` section like Babel does by default when no `NODE_ENV` is set.
-
-> Note: If you've turned off transpilation of ES6 modules with the option `{ "modules": false }`, you have to make sure to turn this on in your test environment.
-
-```json
-{
-  "presets": [["env", {"modules": false}], "react"],
-  "env": {
-    "test": {
-      "presets": [["env"], "react"]
-    }
-  }
-}
-```
-
 > Note: `babel-jest` is automatically installed when installing Jest and will automatically transform files if a babel configuration exists in your project. To avoid this behavior, you can explicitly reset the `transform` configuration option:
 
 ```json

diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md
@@ -132,7 +132,7 @@ If you are using Facebook's [`create-react-app`](https://github.com/facebookincu
 
 ## Caching Issues
 
-The transform script was changed or babel was updated and the changes aren't being recognized by Jest?
+The transform script was changed or Babel was updated and the changes aren't being recognized by Jest?
 
 Retry with [`--no-cache`](CLI.md#cache). Jest caches transformed module files to speed up test execution. If you are using your own custom transformer, consider adding a `getCacheKey` function to it: [getCacheKey in Relay](https://github.com/facebook/relay/blob/58cf36c73769690f0bbf90562707eadb062b029d/scripts/jest/preprocessor.js#L56-L61).
 

diff --git a/docs/TutorialAsync.md b/docs/TutorialAsync.md
@@ -109,7 +109,7 @@ it('works with async/await and resolves', async () => {
 });
 ```
 
-To enable async/await in your project, install [`babel-preset-env`](http://babeljs.io/docs/plugins/preset-env/) and enable the feature in your `.babelrc` file.
+To enable async/await in your project, install [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env) and enable the feature in your `babel.config.js` file.
 
 ## Error handling
 

diff --git a/docs/TutorialReact.md b/docs/TutorialReact.md
@@ -24,7 +24,7 @@ If you have an existing application you'll need to install a few packages to mak
 Run
 
 ```bash
-yarn add --dev jest babel-jest babel-preset-env babel-preset-react react-test-renderer
+yarn add --dev jest babel-jest @babel/preset-env @babel/preset-react react-test-renderer
 ```
 
 Your `package.json` should look something like this (where `<current-version>` is the actual latest version number for the package). Please add the scripts and jest configuration entries:
@@ -36,9 +36,9 @@ Your `package.json` should look something like this (where `<current-version>` i
     "react-dom": "<current-version>"
   },
   "devDependencies": {
+    "@babel/preset-env": "<current-version>",
+    "@babel/preset-react": "<current-version>",
     "babel-jest": "<current-version>",
-    "babel-preset-env": "<current-version>",
-    "babel-preset-react": "<current-version>",
     "jest": "<current-version>",
     "react-test-renderer": "<current-version>"
   },
@@ -47,11 +47,11 @@ Your `package.json` should look something like this (where `<current-version>` i
   }
 ```
 
-```json
-// .babelrc
-{
-  "presets": ["env", "react"]
-}
+```js
+// babel.config.js
+module.exports = {
+  presets: ['@babel/preset-env', '@babel/preset-react'],
+};
 ```
 
 **And you're good to go!**
@@ -279,23 +279,22 @@ If you need more advanced functionality, you can also build your own transformer
 // custom-transformer.js
 'use strict';
 
-const babel = require('babel-core');
+const {transform} = require('@babel/core');
 const jestPreset = require('babel-preset-jest');
 
 module.exports = {
   process(src, filename) {
-    if (babel.util.canCompile(filename)) {
-      return babel.transform(src, {
-        filename,
-        presets: [jestPreset],
-      });
-    }
-    return src;
+    const result = transform(src, {
+      filename,
+      presets: [jestPreset],
+    });
+
+    return result ? result.code : src;
   },
 };
 ```
 
-Don't forget to install the `babel-core` and `babel-preset-jest` packages for this example to work.
+Don't forget to install the `@babel/core` and `babel-preset-jest` packages for this example to work.
 
 To make this work with Jest you need to update your Jest configuration with this: `"transform": {"\\.js$": "path/to/custom-transformer.js"}`.
 

diff --git a/docs/TutorialReactNative.md b/docs/TutorialReactNative.md
@@ -134,7 +134,7 @@ The preset sets up the environment and is very opinionated and based on what we
 
 ### transformIgnorePatterns customization
 
-The [`transformIgnorePatterns`](configuration.html#transformignorepatterns-array-string) option can be used to whitelist or blacklist files from being transformed with babel. Many react-native npm modules unfortunately don't pre-compile their source code before publishing.
+The [`transformIgnorePatterns`](configuration.html#transformignorepatterns-array-string) option can be used to whitelist or blacklist files from being transformed with Babel. Many react-native npm modules unfortunately don't pre-compile their source code before publishing.
 
 By default the jest-react-native preset only processes the project's own source files and react-native. If you have npm dependencies that have to be transformed you can customize this configuration option by whitelisting modules other than react-native:
 

diff --git a/e2e/__tests__/__snapshots__/coverage_transform_instrumented.test.js.snap b/e2e/__tests__/__snapshots__/coverage_transform_instrumented.test.js.snap
@@ -3,7 +3,7 @@
 exports[`code coverage for transform instrumented code 1`] = `
 Object {
   "covered.js": Object {
-    "_coverageSchema": "332fd63041d2c1bcb487cc26dd0d5f7d97098a6c",
+    "_coverageSchema": "43e27e138ebf9cfc5966b082cf9a028302ed4184",
     "b": Object {},
     "branchMap": Object {},
     "f": Object {

diff --git a/e2e/__tests__/__snapshots__/expect-async-matcher.test.js.snap b/e2e/__tests__/__snapshots__/expect-async-matcher.test.js.snap
@@ -47,9 +47,10 @@ exports[`shows the correct errors in stderr when failing tests 1`] = `
       27 | });
 
       at __tests__/failure.test.js:24:54
-      at __tests__/failure.test.js:11:191
-      at __tests__/failure.test.js:11:437
-      at __tests__/failure.test.js:11:99
+      at __tests__/failure.test.js:13:103
+      at __tests__/failure.test.js:15:194
+      at __tests__/failure.test.js:15:364
+      at __tests__/failure.test.js:15:97
 
   ● fail with expected promise values and not
 
@@ -69,9 +70,10 @@ exports[`shows the correct errors in stderr when failing tests 1`] = `
       33 | });
 
       at __tests__/failure.test.js:30:61
-      at __tests__/failure.test.js:11:191
-      at __tests__/failure.test.js:11:437
-      at __tests__/failure.test.js:11:99
+      at __tests__/failure.test.js:13:103
+      at __tests__/failure.test.js:15:194
+      at __tests__/failure.test.js:15:364
+      at __tests__/failure.test.js:15:97
 
 "
 `;
diff --git a/e2e/__tests__/__snapshots__/failures.test.js.snap b/e2e/__tests__/__snapshots__/failures.test.js.snap
@@ -843,9 +843,10 @@ exports[`works with node assert 1`] = `
       83 | 
 
       at __tests__/node_assertion_error.test.js:81:10
-      at __tests__/node_assertion_error.test.js:12:191
-      at __tests__/node_assertion_error.test.js:12:437
-      at __tests__/node_assertion_error.test.js:12:99
+      at __tests__/node_assertion_error.test.js:13:103
+      at __tests__/node_assertion_error.test.js:15:194
+      at __tests__/node_assertion_error.test.js:15:364
+      at __tests__/node_assertion_error.test.js:15:97
 
 "
 `;

diff --git a/e2e/__tests__/__snapshots__/module_name_mapper.test.js.snap b/e2e/__tests__/__snapshots__/module_name_mapper.test.js.snap
@@ -32,7 +32,7 @@ exports[`moduleNameMapper wrong configuration 1`] = `
       12 | module.exports = () => 'test';
       13 | 
 
-      at packages/jest-resolve/build/index.js:411:17
+      at packages/jest-resolve/build/index.js:430:17
       at index.js:10:1
 
 "

diff --git a/e2e/__tests__/dependency_clash.test.js b/e2e/__tests__/dependency_clash.test.js
@@ -53,8 +53,8 @@ test('fails with syntax error on flow types', () => {
   writeFiles(tempDir, {
     '.babelrc': `
       {
-        "plugins": [
-          "${require.resolve('babel-plugin-transform-flow-strip-types')}"
+        "presets": [
+          "${require.resolve('@babel/preset-flow')}"
         ]
       }
     `,

diff --git a/e2e/babel-plugin-jest-hoist/.babelrc b/e2e/babel-plugin-jest-hoist/.babelrc
diff --git a/e2e/babel-plugin-jest-hoist/babel.config.js b/e2e/babel-plugin-jest-hoist/babel.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  plugins: ['jest-hoist'],
+  presets: ['@babel/preset-env', '@babel/preset-flow'],
+};
diff --git a/e2e/babel-plugin-jest-hoist/package.json b/e2e/babel-plugin-jest-hoist/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-preset-es2015": "^6.9.0",
+    "@babel/preset-env": "7.0.0",
+    "@babel/preset-flow": "7.0.0",
     "react": "*"
   },
   "jest": {