From 87243ef061971df5197153ab5b1898237c45f409 Mon Sep 17 00:00:00 2001 From: Charles Stover Date: Mon, 23 Jul 2018 17:51:20 -0500 Subject: [PATCH 1/6] resolves #6720 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a15324a470d..83eaf31699ec 100644 --- a/README.md +++ b/README.md @@ -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 a babel version 7 then you need to install `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-core@^7.0.0-bridge.0' @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: From 04619b81a539b5b824b277547b1adca2547e9acc Mon Sep 17 00:00:00 2001 From: Charles Stover Date: Tue, 24 Jul 2018 12:27:58 -0500 Subject: [PATCH 2/6] removes single quotes from package name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83eaf31699ec..6bb561d1e47f 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ If you'd like to learn more about running `jest` through the command line, take > Note: If you are using a babel version 7 then you need to install `babel-core@^7.0.0-bridge.0` and `@babel/core` with the following command: > > ```bash -> yarn add --dev 'babel-core@^7.0.0-bridge.0' @babel/core +> yarn add --dev babel-core@^7.0.0-bridge.0 @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: From 3ab91f5beb6887f58e0d04ab86ddaff2708efe44 Mon Sep 17 00:00:00 2001 From: Charles Stover Date: Tue, 24 Jul 2018 12:38:09 -0500 Subject: [PATCH 3/6] Update README.md Removed single quotes from around the package name and improved grammar. The PR did not update from pushing the change to original branch. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bb561d1e47f..ceb9a9261df5 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ 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-bridge.0` and `@babel/core` with the following command: +> Note: If you are using Babel version 7, then you need to install `babel-core@^7.0.0-bridge.0` and `@babel/core` with the following command: > > ```bash > yarn add --dev babel-core@^7.0.0-bridge.0 @babel/core From ab7a233ba90304795e7e723b267dfe86dc31a18c Mon Sep 17 00:00:00 2001 From: Charles Stover Date: Thu, 30 Aug 2018 13:49:21 -0500 Subject: [PATCH 4/6] Update GettingStarted and CHANGELOG --- CHANGELOG.md | 1 + docs/GettingStarted.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2cbf673415b..eb60f502476e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ - `[babel-jest]` Make `getCacheKey()` take into account `createTransformer` options ([#6699](https://github.com/facebook/jest/pull/6699)) - `[jest-jasmine2]` Use prettier through `require` instead of `localRequire`. Fixes `matchInlineSnapshot` where prettier dependencies like `path` and `fs` are mocked with `jest.mock`. ([#6776](https://github.com/facebook/jest/pull/6776)) - `[docs]` Fix contributors link ([#6711](https://github.com/facebook/jest/pull/6711)) +- `[docs]` Fix babel-core installation instructions ([#6745](https://github.com/facebook/jest/pull/6745)) - `[website]` Fix website versions page to link to correct language ([#6734](https://github.com/facebook/jest/pull/6734)) - `[expect]` Update `toContain` suggestion to contain equal message ([#6792](https://github.com/facebook/jest/pull/6810)) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index fb8d2a6c5092..9d017ca80fee 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -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` 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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ From e743c729f5b7c6876ffdd89aa61fb117cac3ec97 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 15 Sep 2018 17:01:42 +0200 Subject: [PATCH 5/6] move hcangelog entry --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb60f502476e..37191ffdcc36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - `[jest-haste-map]` [**BREAKING**] Replaced internal data structures to improve performance ([#6960](https://github.com/facebook/jest/pull/6960)) +### Chore & Maintenance + +- `[docs]` Fix babel-core installation instructions ([#6745](https://github.com/facebook/jest/pull/6745)) + ## 23.6.0 ### Features @@ -76,7 +80,6 @@ - `[babel-jest]` Make `getCacheKey()` take into account `createTransformer` options ([#6699](https://github.com/facebook/jest/pull/6699)) - `[jest-jasmine2]` Use prettier through `require` instead of `localRequire`. Fixes `matchInlineSnapshot` where prettier dependencies like `path` and `fs` are mocked with `jest.mock`. ([#6776](https://github.com/facebook/jest/pull/6776)) - `[docs]` Fix contributors link ([#6711](https://github.com/facebook/jest/pull/6711)) -- `[docs]` Fix babel-core installation instructions ([#6745](https://github.com/facebook/jest/pull/6745)) - `[website]` Fix website versions page to link to correct language ([#6734](https://github.com/facebook/jest/pull/6734)) - `[expect]` Update `toContain` suggestion to contain equal message ([#6792](https://github.com/facebook/jest/pull/6810)) From 10c0330be96dd5e11c1fcd68431e7621165368e2 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 15 Sep 2018 17:06:51 +0200 Subject: [PATCH 6/6] update versioned docs --- README.md | 4 ++-- docs/GettingStarted.md | 2 +- website/versioned_docs/version-22.0/GettingStarted.md | 6 +++--- website/versioned_docs/version-22.1/GettingStarted.md | 6 +++--- website/versioned_docs/version-22.2/GettingStarted.md | 4 ++-- website/versioned_docs/version-22.3/GettingStarted.md | 4 ++-- website/versioned_docs/version-22.4/GettingStarted.md | 4 ++-- website/versioned_docs/version-23.2/GettingStarted.md | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ceb9a9261df5..2c5d74597e93 100644 --- a/README.md +++ b/README.md @@ -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 Babel version 7, then you need to install `babel-core@^7.0.0-bridge.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-bridge.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: diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index 9d017ca80fee..41892c602384 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -85,7 +85,7 @@ 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 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-bridge.0 @babel/core regenerator-runtime diff --git a/website/versioned_docs/version-22.0/GettingStarted.md b/website/versioned_docs/version-22.0/GettingStarted.md index bd7cce4116d9..8fd6902339ae 100644 --- a/website/versioned_docs/version-22.0/GettingStarted.md +++ b/website/versioned_docs/version-22.0/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ diff --git a/website/versioned_docs/version-22.1/GettingStarted.md b/website/versioned_docs/version-22.1/GettingStarted.md index bcf86e0c3882..92c0a1c0fbcd 100644 --- a/website/versioned_docs/version-22.1/GettingStarted.md +++ b/website/versioned_docs/version-22.1/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ diff --git a/website/versioned_docs/version-22.2/GettingStarted.md b/website/versioned_docs/version-22.2/GettingStarted.md index 4c19692d92dd..5901e3c546e9 100644 --- a/website/versioned_docs/version-22.2/GettingStarted.md +++ b/website/versioned_docs/version-22.2/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ diff --git a/website/versioned_docs/version-22.3/GettingStarted.md b/website/versioned_docs/version-22.3/GettingStarted.md index 430b74a89050..5488b083ff2e 100644 --- a/website/versioned_docs/version-22.3/GettingStarted.md +++ b/website/versioned_docs/version-22.3/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ diff --git a/website/versioned_docs/version-22.4/GettingStarted.md b/website/versioned_docs/version-22.4/GettingStarted.md index e221f88f07c0..8b559eb1e1e2 100644 --- a/website/versioned_docs/version-22.4/GettingStarted.md +++ b/website/versioned_docs/version-22.4/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_ diff --git a/website/versioned_docs/version-23.2/GettingStarted.md b/website/versioned_docs/version-23.2/GettingStarted.md index 7148f5c6d41c..4526e9ec9803 100644 --- a/website/versioned_docs/version-23.2/GettingStarted.md +++ b/website/versioned_docs/version-23.2/GettingStarted.md @@ -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 > ``` _Note: Explicitly installing `regenerator-runtime` is not needed if you use `npm` 3 or 4 or Yarn_