Skip to content

Commit 0707729

Browse files
authored
fix(deps)!: update dependencies pulling in old glob (#1612)
BREAKING CHANGE: transitive dependencies now require node 20 || >=22.
1 parent 41f4476 commit 0707729

File tree

16 files changed

+1799
-1193
lines changed

16 files changed

+1799
-1193
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
node: [18, 20]
15+
node: [20, 24]
1616
steps:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-node@v4

build-self-coverage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path')
44
const fs = require('fs')
55
const istanbul = require('istanbul-lib-instrument')
66
const makeDir = require('make-dir')
7-
const glob = require('glob')
7+
const { globSync } = require('glob')
88

99
const instrumenter = istanbul.createInstrumenter({
1010
coverageVariable: '___NYC_SELF_COVERAGE___',
@@ -23,7 +23,7 @@ function instrumentFile (name) {
2323
}
2424

2525
function instrumentGlob (pattern) {
26-
const result = glob.sync(pattern, {
26+
const result = globSync(pattern, {
2727
cwd: __dirname,
2828
nodir: true
2929
})

index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const cachingTransform = require('caching-transform')
66
const findCacheDir = require('find-cache-dir')
77
const fs = require('./lib/fs-promises')
88
const os = require('os')
9-
const { debuglog, promisify } = require('util')
10-
const glob = promisify(require('glob'))
9+
const { debuglog } = require('util')
10+
const { glob } = require('glob')
1111
const Hash = require('./lib/hash')
1212
const libCoverage = require('istanbul-lib-coverage')
1313
const libHook = require('istanbul-lib-hook')
@@ -16,7 +16,7 @@ const mkdirp = require('make-dir')
1616
const Module = require('module')
1717
const onExit = require('signal-exit')
1818
const path = require('path')
19-
const rimraf = promisify(require('rimraf'))
19+
const { rimraf } = require('rimraf')
2020
const SourceMaps = require('./lib/source-maps')
2121
const TestExclude = require('test-exclude')
2222
const pMap = require('p-map')
@@ -240,10 +240,10 @@ class NYC {
240240

241241
const concurrency = output ? os.cpus().length : 1
242242
if (this.config.completeCopy && output) {
243-
const files = await glob(path.resolve(input, '**'), {
243+
const files = await glob(path.resolve(input, '**').split(path.sep).join('/'), {
244244
dot: true,
245245
nodir: true,
246-
ignore: ['**/.git', '**/.git/**', path.join(output, '**')]
246+
ignore: ['**/.git', '**/.git/**', path.join(output, '**').split(path.sep).join('/')]
247247
})
248248
const destDirs = new Set(
249249
files.map(src => path.dirname(path.join(output, path.relative(input, src))))

lib/commands/instrument.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
const NYC = require('../../index.js')
44
const path = require('path')
5-
const { promisify } = require('util')
65
const resolveFrom = require('resolve-from')
7-
const rimraf = promisify(require('rimraf'))
6+
const { rimraf } = require('rimraf')
87
const { cliWrapper, setupOptions } = require('./helpers.js')
98

109
exports.command = 'instrument <input> [output]'

npm-run-clean.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/usr/bin/env node
22
'use strict'
33

4-
const { promisify } = require('util')
5-
const rimraf = promisify(require('rimraf'))
4+
const { rimraf } = require('rimraf')
65

76
Promise.all([
87
'**/.nyc_output',
@@ -16,4 +15,4 @@ Promise.all([
1615
'test/fixtures/cli/nyc-config-js/node_modules',
1716
'test/temp-dir-*',
1817
'self-coverage'
19-
].map(f => rimraf(f, { cwd: __dirname })))
18+
].map(f => rimraf(f, { glob: { cwd: __dirname } })))

0 commit comments

Comments
 (0)