Skip to content

Commit e7edb75

Browse files
authored
chore: remove is-ci in favor of ci-info (#11973)
1 parent 9d737d7 commit e7edb75

File tree

7 files changed

+17
-39
lines changed

7 files changed

+17
-39
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
### Chore & Maintenance
88

9+
- `[jest-config, jest-util]` Use `ci-info` instead of `is-ci` to detect CI environment ([11973](https://github.com/facebook/jest/pull/11973))
10+
911
### Performance
1012

1113
## 27.3.0

packages/jest-config/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"@jest/types": "^27.2.5",
2828
"babel-jest": "^27.3.0",
2929
"chalk": "^4.0.0",
30+
"ci-info": "^3.2.0",
3031
"deepmerge": "^4.2.2",
3132
"glob": "^7.1.1",
3233
"graceful-fs": "^4.2.4",
33-
"is-ci": "^3.0.0",
3434
"jest-circus": "^27.3.0",
3535
"jest-environment-jsdom": "^27.3.0",
3636
"jest-environment-node": "^27.3.0",
@@ -48,7 +48,6 @@
4848
"@types/babel__core": "^7.0.4",
4949
"@types/glob": "^7.1.1",
5050
"@types/graceful-fs": "^4.1.3",
51-
"@types/is-ci": "^3.0.0",
5251
"@types/micromatch": "^4.0.1",
5352
"jest-snapshot-serializer-raw": "^1.1.0",
5453
"semver": "^7.3.5",

packages/jest-config/src/Defaults.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import {sep} from 'path';
9-
import isCI = require('is-ci');
9+
import {isCI} from 'ci-info';
1010
import type {Config} from '@jest/types';
1111
import {replacePathSepForRegex} from 'jest-regex-util';
1212
import {NODE_MODULES} from './constants';

packages/jest-util/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
"@jest/types": "^27.2.5",
1818
"@types/node": "*",
1919
"chalk": "^4.0.0",
20+
"ci-info": "^3.2.0",
2021
"graceful-fs": "^4.2.4",
21-
"is-ci": "^3.0.0",
2222
"picomatch": "^2.2.3"
2323
},
2424
"devDependencies": {
2525
"@types/graceful-fs": "^4.1.2",
26-
"@types/is-ci": "^3.0.0",
2726
"@types/micromatch": "^4.0.1",
2827
"@types/picomatch": "^2.2.2"
2928
},

packages/jest-util/src/__tests__/isInteractive.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ afterEach(() => {
2020
});
2121

2222
it('Returns true when running on interactive environment', () => {
23-
jest.doMock('is-ci', () => false);
23+
jest.doMock('ci-info', () => ({isCI: false}));
2424
process.stdout.isTTY = true;
2525
process.env.TERM = 'xterm-256color';
2626

@@ -32,32 +32,32 @@ it('Returns false when running on a non-interactive environment', () => {
3232
let isInteractive;
3333
const expectedResult = false;
3434

35-
// Test with is-ci being true and isTTY false
36-
jest.doMock('is-ci', () => true);
35+
// Test with isCI being true and isTTY false
36+
jest.doMock('ci-info', () => ({isCI: true}));
3737
process.stdout.isTTY = undefined;
3838
process.env.TERM = 'xterm-256color';
3939
isInteractive = require('../isInteractive').default;
4040
expect(isInteractive).toBe(expectedResult);
4141

42-
// Test with is-ci being false and isTTY false
42+
// Test with isCI being false and isTTY false
4343
jest.resetModules();
44-
jest.doMock('is-ci', () => false);
44+
jest.doMock('ci-info', () => ({isCI: false}));
4545
process.stdout.isTTY = undefined;
4646
process.env.TERM = 'xterm-256color';
4747
isInteractive = require('../isInteractive').default;
4848
expect(isInteractive).toBe(expectedResult);
4949

50-
// Test with is-ci being true and isTTY true
50+
// Test with isCI being true and isTTY true
5151
jest.resetModules();
52-
jest.doMock('is-ci', () => true);
52+
jest.doMock('ci-info', () => ({isCI: true}));
5353
process.stdout.isTTY = true;
5454
process.env.TERM = 'xterm-256color';
5555
isInteractive = require('../isInteractive').default;
5656
expect(isInteractive).toBe(expectedResult);
5757

5858
// Test with dumb terminal
5959
jest.resetModules();
60-
jest.doMock('is-ci', () => false);
60+
jest.doMock('ci-info', () => ({isCI: false}));
6161
process.stdout.isTTY = undefined;
6262
process.env.TERM = 'dumb';
6363
isInteractive = require('../isInteractive').default;

packages/jest-util/src/isInteractive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import isCI = require('is-ci');
8+
import {isCI} from 'ci-info';
99

1010
export default !!process.stdout.isTTY && process.env.TERM !== 'dumb' && !isCI;

yarn.lock

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4552,15 +4552,6 @@ __metadata:
45524552
languageName: node
45534553
linkType: hard
45544554

4555-
"@types/is-ci@npm:^3.0.0":
4556-
version: 3.0.0
4557-
resolution: "@types/is-ci@npm:3.0.0"
4558-
dependencies:
4559-
ci-info: ^3.1.0
4560-
checksum: 661e9cc9ba61e1c283f3814fbb1355aca70b281b5d71def665348f8e17db1fbdf5e62db496b0c2ab7b913e49ad626faa28478c06b9fecf70f860f4386469973f
4561-
languageName: node
4562-
linkType: hard
4563-
45644555
"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
45654556
version: 2.0.3
45664557
resolution: "@types/istanbul-lib-coverage@npm:2.0.3"
@@ -7089,7 +7080,7 @@ __metadata:
70897080
languageName: node
70907081
linkType: hard
70917082

7092-
"ci-info@npm:^3.0.0, ci-info@npm:^3.1.0, ci-info@npm:^3.1.1":
7083+
"ci-info@npm:^3.0.0, ci-info@npm:^3.2.0":
70937084
version: 3.2.0
70947085
resolution: "ci-info@npm:3.2.0"
70957086
checksum: d4a898d60111d00f2b7a06a349162971fe0603aefa208fe8d1343ce9e93c48e3d37311c47211d5c9040d25b43038c817588e5b7d8eab5d17b00aec49c7b5fade
@@ -11989,17 +11980,6 @@ fsevents@^1.2.7:
1198911980
languageName: node
1199011981
linkType: hard
1199111982

11992-
"is-ci@npm:^3.0.0":
11993-
version: 3.0.0
11994-
resolution: "is-ci@npm:3.0.0"
11995-
dependencies:
11996-
ci-info: ^3.1.1
11997-
bin:
11998-
is-ci: bin.js
11999-
checksum: 1e26d3ba6634ebee83f9d22f260354c5d950eada4d609c30cc2642069f8ba52f3aeb4c9bbf8099aaf04a2f44a1ed7beef2a24485f988753c8c078a57e9b3a2fd
12000-
languageName: node
12001-
linkType: hard
12002-
1200311983
"is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.6.0":
1200411984
version: 2.7.0
1200511985
resolution: "is-core-module@npm:2.7.0"
@@ -12657,14 +12637,13 @@ fsevents@^1.2.7:
1265712637
"@types/babel__core": ^7.0.4
1265812638
"@types/glob": ^7.1.1
1265912639
"@types/graceful-fs": ^4.1.3
12660-
"@types/is-ci": ^3.0.0
1266112640
"@types/micromatch": ^4.0.1
1266212641
babel-jest: ^27.3.0
1266312642
chalk: ^4.0.0
12643+
ci-info: ^3.2.0
1266412644
deepmerge: ^4.2.2
1266512645
glob: ^7.1.1
1266612646
graceful-fs: ^4.2.4
12667-
is-ci: ^3.0.0
1266812647
jest-circus: ^27.3.0
1266912648
jest-environment-jsdom: ^27.3.0
1267012649
jest-environment-node: ^27.3.0
@@ -13199,13 +13178,12 @@ fsevents@^1.2.7:
1319913178
dependencies:
1320013179
"@jest/types": ^27.2.5
1320113180
"@types/graceful-fs": ^4.1.2
13202-
"@types/is-ci": ^3.0.0
1320313181
"@types/micromatch": ^4.0.1
1320413182
"@types/node": "*"
1320513183
"@types/picomatch": ^2.2.2
1320613184
chalk: ^4.0.0
13185+
ci-info: ^3.2.0
1320713186
graceful-fs: ^4.2.4
13208-
is-ci: ^3.0.0
1320913187
picomatch: ^2.2.3
1321013188
languageName: unknown
1321113189
linkType: soft

0 commit comments

Comments
 (0)