build: remove klaw dependency (#42701)

* refactor: remove klaw dependency

Node 20 added recursive readdir() so klaw is not needed

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* fixup! refactor: remove klaw dependency

findMatchingFiles returns a Promise<string[]>

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-06-28 10:11:42 +02:00 committed by GitHub
parent 8322c61a0a
commit 2c3a9fd3c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 30 deletions

View file

@ -20,7 +20,6 @@
"@types/dirty-chai": "^2.0.2", "@types/dirty-chai": "^2.0.2",
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/fs-extra": "^9.0.1", "@types/fs-extra": "^9.0.1",
"@types/klaw": "^3.0.1",
"@types/minimist": "^1.2.0", "@types/minimist": "^1.2.0",
"@types/mocha": "^7.0.2", "@types/mocha": "^7.0.2",
"@types/node": "^20.9.0", "@types/node": "^20.9.0",
@ -54,7 +53,6 @@
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"got": "^11.8.5", "got": "^11.8.5",
"husky": "^8.0.1", "husky": "^8.0.1",
"klaw": "^3.0.0",
"lint": "^1.1.2", "lint": "^1.1.2",
"lint-staged": "^10.2.11", "lint-staged": "^10.2.11",
"minimist": "^1.2.6", "minimist": "^1.2.6",

View file

@ -1,6 +1,5 @@
const { GitProcess } = require('dugite'); const { GitProcess } = require('dugite');
const fs = require('node:fs'); const fs = require('node:fs');
const klaw = require('klaw');
const os = require('node:os'); const os = require('node:os');
const path = require('node:path'); const path = require('node:path');
@ -130,18 +129,13 @@ function chunkFilenames (filenames, offset = 0) {
* @returns {Promise<string[]>} * @returns {Promise<string[]>}
*/ */
async function findMatchingFiles (top, test) { async function findMatchingFiles (top, test) {
return new Promise(resolve => { return fs.promises.readdir(top, { encoding: 'utf8', recursive: true })
const matches = []; .then(files => {
klaw(top, { return files
filter: f => path.basename(f) !== '.bin' .filter(name => path.basename(name) !== '.bin')
}) .filter(name => test(name))
.on('end', () => resolve(matches)) .map(name => path.join(top, name));
.on('data', item => { });
if (test(item.path)) {
matches.push(item.path);
}
});
});
} }
module.exports = { module.exports = {

View file

@ -859,13 +859,6 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/klaw@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/klaw/-/klaw-3.0.1.tgz#29f90021c0234976aa4eb97efced9cb6db9fa8b3"
integrity sha512-acnF3n9mYOr1aFJKFyvfNX0am9EtPUsYPq22QUCGdJE+MVt6UyAN1jwo+PmOPqXD4K7ZS9MtxDEp/un0lxFccA==
dependencies:
"@types/node" "*"
"@types/linkify-it@*": "@types/linkify-it@*":
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806"
@ -3281,7 +3274,7 @@ got@^11.8.5:
p-cancelable "^2.0.0" p-cancelable "^2.0.0"
responselike "^2.0.0" responselike "^2.0.0"
graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
version "4.2.10" version "4.2.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@ -3930,13 +3923,6 @@ kind-of@^6.0.2:
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
klaw@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
dependencies:
graceful-fs "^4.1.9"
kleur@^4.0.3: kleur@^4.0.3:
version "4.1.5" version "4.1.5"
resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"