Skip to content

Commit 00c5c2f

Browse files
authored
Merge pull request #61 from BnayaZil/fix/jest_cli_as_jest_dependency
Consider jest-cli as jest dependency
2 parents b8fe64b + d05c67d commit 00c5c2f

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

__tests__/__snapshots__/packageData.test.js.snap

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,20 @@ Object {
2626
}
2727
`;
2828

29+
exports[`jest-cli babel-core bridge 1`] = `
30+
Object {
31+
"devDependencies": Object {
32+
"@babel/core": "7.0.0-beta.44",
33+
"@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.44",
34+
"@babel/preset-env": "7.0.0-beta.44",
35+
"babel-core": "^7.0.0-bridge.0",
36+
"babel-loader": "^8.0.0-beta.0",
37+
"jest-cli": "22.0.0",
38+
},
39+
"name": "add-@babel/core-peerDep",
40+
}
41+
`;
42+
2943
exports[`scripts 1`] = `
3044
Object {
3145
"name": "mocha-scripts-test",

__tests__/packageData.test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const { updatePackageJSON } = require('../src/');
22
const upgradeDeps = require('../src/upgradeDeps');
33
const babelCoreFixture = require('../fixtures/babel-core');
44
const jestFixture = require('../fixtures/jest');
5+
const jestCliFixture = require('../fixtures/jest-cli');
56
const depsFixture = require('../fixtures/deps');
67
const webpackV1Fixture = require('../fixtures/webpack-v1');
78
const depsFixtureEarlierBeta = require('../fixtures/deps-earlier-beta.json');
@@ -71,6 +72,10 @@ test('jest babel-core bridge', async () => {
7172
expect(await updatePackageJSON(jestFixture)).toMatchSnapshot();
7273
});
7374

75+
test('jest-cli babel-core bridge', async () => {
76+
expect(await updatePackageJSON(jestCliFixture)).toMatchSnapshot();
77+
});
78+
7479
test('webpack v1 compatibility', async () => {
7580
expect(await updatePackageJSON(webpackV1Fixture)).toMatchSnapshot();
7681
});

fixtures/jest-cli.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "add-@babel/core-peerDep",
3+
"devDependencies": {
4+
"babel-loader": "^7.1.1",
5+
"babel-plugin-transform-object-rest-spread": "^6.20.2",
6+
"babel-preset-es2015": "^6.18.0",
7+
"jest-cli": "22.0.0"
8+
}
9+
}

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ npx babel-upgrade --install
6262
}
6363
```
6464

65-
- [x] use `"babel-core": "^7.0.0-bridge-0"` if jest is a dependency ([#14](https://github.com/babel/babel-upgrade/pull/14))
65+
- [x] use `"babel-core": "^7.0.0-bridge-0"` if jest or jest-cli is a dependency ([#14](https://github.com/babel/babel-upgrade/pull/14))
6666

6767
```diff
6868
"devDependencies": {

src/upgradeDeps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module.exports = function upgradeDeps(dependencies, version, options = {}) {
7575
// https://github.com/babel/babel-upgrade/issues/29
7676
// https://github.com/babel/babel-loader/issues/505
7777
if (
78-
(dependencies['jest'] || (depsWebpack1 && dependencies['babel-loader'])) &&
78+
(dependencies['jest'] || dependencies['jest-cli'] || (depsWebpack1 && dependencies['babel-loader'])) &&
7979
!dependencies['babel-core']
8080
) {
8181
dependencies['babel-core'] = '^7.0.0-bridge.0';

0 commit comments

Comments
 (0)