Skip to content

Commit

Permalink
Merge branch 'master' into babel-7-example
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Sep 15, 2018
2 parents 0efd35b + 8b1be33 commit de1c20d
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 18 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Chore & Maintenance

- `[docs]` Fix babel-core installation instructions ([#6745](https://github.com/facebook/jest/pull/6745))
- `[examples]` add example using Babel 7 ([#6983](https://github.com/facebook/jest/pull/6983))

## 23.6.0
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ If you'd like to learn more about running `jest` through the command line, take

[Babel](http://babeljs.io/) is automatically handled by Jest using `babel-jest`. You don't need install anything extra for using Babel.

> Note: If you are using a babel version 7 then you need to install `babel-core@^7.0.0-0` and `@babel/core` with the following command:
> 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-core@^7.0.0-0' @babel/core
> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
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:
Expand Down
4 changes: 2 additions & 2 deletions docs/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
yarn add --dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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-0' @babel/core regenerator-runtime
> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
6 changes: 3 additions & 3 deletions website/versioned_docs/version-22.0/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
npm install --save-dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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:
>
> ```
> npm install --save-dev babel-jest 'babel-core@^7.0.0-0' @babel/core regenerator-runtime
> ```bash
> npm install --save-dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
6 changes: 3 additions & 3 deletions website/versioned_docs/version-22.1/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
npm install --save-dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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:
>
> ```
> npm install --save-dev babel-jest 'babel-core@^7.0.0-0' @babel/core regenerator-runtime
> ```bash
> npm install --save-dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
4 changes: 2 additions & 2 deletions website/versioned_docs/version-22.2/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
npm install --save-dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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
> npm install --save-dev babel-jest 'babel-core@^7.0.0-0' @babel/core regenerator-runtime
> npm install --save-dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
4 changes: 2 additions & 2 deletions website/versioned_docs/version-22.3/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
npm install --save-dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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
> npm install --save-dev babel-jest 'babel-core@^7.0.0-0' @babel/core regenerator-runtime
> npm install --save-dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
4 changes: 2 additions & 2 deletions website/versioned_docs/version-22.4/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
yarn add --dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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-0' @babel/core regenerator-runtime
> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down
4 changes: 2 additions & 2 deletions website/versioned_docs/version-23.2/GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ To use [Babel](http://babeljs.io/), install the `babel-jest` and `regenerator-ru
yarn add --dev babel-jest babel-core regenerator-runtime
```

> Note: If you are using a babel version 7 then you need to install `babel-jest` with the following command:
> 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-0' @babel/core regenerator-runtime
> yarn add --dev babel-jest babel-core@^7.0.0-bridge.0 @babel/core regenerator-runtime
> ```
>
> You can also see the example in the Jest repository: https://github.com/facebook/jest/tree/master/examples/babel-7
Expand Down

0 comments on commit de1c20d

Please sign in to comment.