Skip to content

Commit c071846

Browse files
Trotttargos
andcommitted
chore: resolve all npm install warnings
Replaces listr with listr2 and updates mocha. `npm install` no longer reports audit issues on install. Co-authored-by: Author: Michaël Zasso <[email protected]>
1 parent c092c3c commit c071846

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

lib/update-v8/applyNodeChanges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const path = require('path');
44

55
const fs = require('fs-extra');
6-
const Listr = require('listr');
6+
const { Listr } = require('listr2');
77

88
const {
99
getNodeV8Version,

lib/update-v8/backport.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ const path = require('path');
44

55
const fs = require('fs-extra');
66
const inquirer = require('inquirer');
7-
const Listr = require('listr');
8-
const input = require('listr-input');
7+
const { Listr } = require('listr2');
98

109
const { shortSha } = require('../utils');
1110

@@ -156,10 +155,10 @@ function generatePatches() {
156155
function applyPatches() {
157156
return {
158157
title: 'Apply patches to deps/v8',
159-
task: async(ctx) => {
158+
task: async(ctx, task) => {
160159
const { patches } = ctx;
161160
for (const patch of patches) {
162-
await applyPatch(ctx, patch);
161+
await applyPatch(ctx, task, patch);
163162
}
164163
}
165164
};
@@ -181,7 +180,7 @@ function applyPatchTask(patch) {
181180
const todo = [
182181
{
183182
title: 'Apply patch',
184-
task: (ctx) => applyPatch(ctx, patch)
183+
task: (ctx, task) => applyPatch(ctx, task, patch)
185184
}
186185
];
187186
if (ctx.bump !== false) {
@@ -197,7 +196,7 @@ function applyPatchTask(patch) {
197196
};
198197
}
199198

200-
async function applyPatch(ctx, patch) {
199+
async function applyPatch(ctx, task, patch) {
201200
try {
202201
await ctx.execGitNode(
203202
'apply',
@@ -206,7 +205,9 @@ async function applyPatch(ctx, patch) {
206205
);
207206
} catch (e) {
208207
patch.hadConflicts = true;
209-
return input("Resolve merge conflicts and enter 'RESOLVED'", {
208+
return task.prompt({
209+
type: 'input',
210+
message: "Resolve merge conflicts and enter 'RESOLVED'",
210211
validate: value => value.toUpperCase() === 'RESOLVED'
211212
});
212213
}

lib/update-v8/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const Listr = require('listr');
3+
const { Listr } = require('listr2');
44

55
const backport = require('./backport');
66
const updateVersionNumbers = require('./updateVersionNumbers');

lib/update-v8/majorUpdate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path');
44

55
const execa = require('execa');
66
const fs = require('fs-extra');
7-
const Listr = require('listr');
7+
const { Listr } = require('listr2');
88

99
const common = require('./common');
1010
const {

lib/update-v8/minorUpdate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path');
44

55
const execa = require('execa');
66
const fs = require('fs-extra');
7-
const Listr = require('listr');
7+
const { Listr } = require('listr2');
88

99
const common = require('./common');
1010

lib/update-v8/updateV8Clone.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const execa = require('execa');
4-
const Listr = require('listr');
4+
const { Listr } = require('listr2');
55
const fs = require('fs-extra');
66

77
const { v8Git } = require('./constants');

lib/update-v8/updateVersionNumbers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const path = require('path');
44

55
const fs = require('fs-extra');
6-
const Listr = require('listr');
6+
const { Listr } = require('listr2');
77

88
const util = require('./util');
99

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
"fs-extra": "^9.1.0",
4444
"ghauth": "^4.0.0",
4545
"inquirer": "^7.3.3",
46-
"listr": "^0.14.3",
47-
"listr-input": "^0.2.1",
46+
"listr2": "^3.13.1",
4847
"lodash": "^4.17.21",
4948
"log-symbols": "^4.1.0",
5049
"node-fetch": "^2.6.1",
@@ -62,7 +61,7 @@
6261
"eslint-plugin-promise": "^4.3.1",
6362
"eslint-plugin-standard": "^4.1.0",
6463
"intelli-espower-loader": "^1.0.1",
65-
"mocha": "^8.3.0",
64+
"mocha": "^9.1.3",
6665
"nyc": "^15.1.0",
6766
"power-assert": "^1.6.1",
6867
"sinon": "^9.2.4"

0 commit comments

Comments
 (0)