Skip to content

Commit 157ad3e

Browse files
committed
fix: update listr2@2.0.1
1 parent fc72170 commit 157ad3e

File tree

7 files changed

+867
-714
lines changed

7 files changed

+867
-714
lines changed

lib/getRenderer.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
'use strict'
22

33
const getRenderer = ({ debug, quiet }, env = process.env) => {
4-
if (quiet) return 'silent'
4+
if (quiet) return { renderer: 'silent' }
55
// Better support for dumb terminals: https://en.wikipedia.org/wiki/Computer_terminal#Dumb_terminals
66
const isDumbTerminal = env.TERM === 'dumb'
7-
if (isDumbTerminal || env.NODE_ENV === 'test') return 'test'
8-
if (debug) return 'verbose'
9-
return 'update'
7+
if (debug || isDumbTerminal || env.NODE_ENV === 'test') return { renderer: 'verbose' }
8+
return { renderer: 'update', rendererOptions: { dateFormat: false } }
109
}
1110

1211
module.exports = getRenderer

lib/runAll.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ const runAll = async (
117117

118118
const listrOptions = {
119119
ctx,
120-
dateFormat: false,
121120
exitOnError: false,
122-
renderer: getRenderer({ debug, quiet }),
121+
nonTTYRenderer: 'verbose',
122+
...getRenderer({ debug, quiet }),
123123
}
124124

125125
const listrTasks = []

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,37 @@
3333
},
3434
"dependencies": {
3535
"chalk": "^4.0.0",
36-
"commander": "^5.0.0",
36+
"commander": "^5.1.0",
3737
"cosmiconfig": "^6.0.0",
3838
"debug": "^4.1.1",
3939
"dedent": "^0.7.0",
4040
"execa": "^4.0.0",
41-
"listr2": "1.3.8",
42-
"log-symbols": "^3.0.0",
41+
"listr2": "2.0.1",
42+
"log-symbols": "^4.0.0",
4343
"micromatch": "^4.0.2",
4444
"normalize-path": "^3.0.0",
4545
"please-upgrade-node": "^3.2.0",
4646
"string-argv": "0.3.1",
4747
"stringify-object": "^3.3.0"
4848
},
4949
"devDependencies": {
50-
"@babel/core": "^7.9.0",
51-
"@babel/plugin-proposal-object-rest-spread": "^7.9.5",
52-
"@babel/preset-env": "^7.9.5",
50+
"@babel/core": "^7.9.6",
51+
"@babel/plugin-proposal-object-rest-spread": "^7.9.6",
52+
"@babel/preset-env": "^7.9.6",
5353
"babel-eslint": "10.1.0",
54-
"babel-jest": "^25.3.0",
54+
"babel-jest": "^26.0.1",
5555
"consolemock": "^1.1.0",
5656
"eslint": "^6.8.0",
57-
"eslint-config-prettier": "^6.10.1",
57+
"eslint-config-prettier": "^6.11.0",
5858
"eslint-plugin-import": "^2.20.2",
5959
"eslint-plugin-node": "^11.1.0",
6060
"eslint-plugin-prettier": "^3.1.3",
6161
"fs-extra": "^9.0.0",
6262
"husky": "^4.2.5",
63-
"jest": "^25.3.0",
63+
"jest": "^26.0.1",
6464
"jest-snapshot-serializer-ansi": "^1.0.0",
65-
"nanoid": "^3.1.3",
66-
"prettier": "^2.0.4"
65+
"nanoid": "^3.1.5",
66+
"prettier": "^2.0.5"
6767
},
6868
"config": {
6969
"commitizen": {

test/__mocks__/cosmiconfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const actual = require.requireActual('cosmiconfig')
1+
const actual = jest.requireActual('cosmiconfig')
22

33
function cosmiconfig(name, options) {
44
return actual.cosmiconfig(name, options)

test/getRenderer.spec.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
import getRenderer from '../lib/getRenderer'
22

33
describe('getRenderer', () => {
4-
it('should return silent when quiet', () => {
5-
expect(getRenderer({ quiet: true }, {})).toEqual('silent')
4+
it('should return silent renderer when quiet', () => {
5+
expect(getRenderer({ quiet: true }, {})).toEqual({ renderer: 'silent' })
66
})
77

8-
it('should return test when NODE_ENV=test', () => {
9-
expect(getRenderer({}, { NODE_ENV: 'test' })).toEqual('test')
8+
it('should return verbose renderer when NODE_ENV=test', () => {
9+
expect(getRenderer({}, { NODE_ENV: 'test' })).toEqual({ renderer: 'verbose' })
1010
})
1111

12-
it('should return test when TERM=dumb', () => {
13-
expect(getRenderer({}, { TERM: 'dumb' })).toEqual('test')
12+
it('should return test renderer when TERM=dumb', () => {
13+
expect(getRenderer({}, { TERM: 'dumb' })).toEqual({ renderer: 'verbose' })
1414
})
1515

16-
it('should return verbose when debug', () => {
17-
expect(getRenderer({ debug: true }, {})).toEqual('verbose')
16+
it('should return verbose renderer when debug', () => {
17+
expect(getRenderer({ debug: true }, {})).toEqual({ renderer: 'verbose' })
1818
})
1919

20-
it('should return update by default', () => {
21-
expect(getRenderer({}, {})).toEqual('update')
20+
it('should return update renderer by default', () => {
21+
expect(getRenderer({}, {})).toEqual({
22+
renderer: 'update',
23+
rendererOptions: {
24+
dateFormat: false,
25+
},
26+
})
2227
})
2328
})

test/index2.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ describe('lintStaged', () => {
3131
"quiet": true,
3232
"shouldBackup": true,
3333
},
34-
"dateFormat": false,
3534
"exitOnError": false,
35+
"nonTTYRenderer": "verbose",
3636
"renderer": "silent",
3737
}
3838
`)
@@ -56,9 +56,9 @@ describe('lintStaged', () => {
5656
"quiet": false,
5757
"shouldBackup": true,
5858
},
59-
"dateFormat": false,
6059
"exitOnError": false,
61-
"renderer": "test",
60+
"nonTTYRenderer": "verbose",
61+
"renderer": "verbose",
6262
}
6363
`)
6464
})

0 commit comments

Comments
 (0)