pnpm 6.29.1 → 6.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node_modules/.modules.yaml +2 -2
- package/dist/node_modules/.pnpm/lock.yaml +19 -20
- package/dist/node_modules/@npmcli/fs/package.json +2 -5
- package/dist/node_modules/are-we-there-yet/package.json +11 -7
- package/dist/node_modules/minimatch/minimatch.js +92 -70
- package/dist/node_modules/minimatch/package.json +6 -3
- package/dist/node_modules/npmlog/lib/log.js +5 -4
- package/dist/node_modules/npmlog/package.json +9 -6
- package/dist/node_modules/signal-exit/index.js +4 -2
- package/dist/node_modules/signal-exit/package.json +1 -1
- package/dist/node_modules/socks/build/client/socksclient.js +10 -7
- package/dist/node_modules/socks/build/client/socksclient.js.map +1 -1
- package/dist/node_modules/socks/package.json +9 -11
- package/dist/pnpm.cjs +940 -850
- package/dist/pnpx.cjs +3249 -52
- package/package.json +8 -8
|
@@ -7,11 +7,11 @@ included:
|
|
|
7
7
|
injectedDeps: {}
|
|
8
8
|
layoutVersion: 5
|
|
9
9
|
nodeLinker: hoisted
|
|
10
|
-
packageManager: pnpm@6.
|
|
10
|
+
packageManager: pnpm@6.30.1
|
|
11
11
|
pendingBuilds:
|
|
12
12
|
- /node-gyp/8.4.1
|
|
13
13
|
- /encoding/0.1.13
|
|
14
|
-
prunedAt: Mon,
|
|
14
|
+
prunedAt: Mon, 14 Feb 2022 01:15:12 GMT
|
|
15
15
|
publicHoistPattern:
|
|
16
16
|
- '*types*'
|
|
17
17
|
- '*eslint*'
|
|
@@ -13,9 +13,8 @@ packages:
|
|
|
13
13
|
dev: false
|
|
14
14
|
optional: true
|
|
15
15
|
|
|
16
|
-
/@npmcli/fs/1.1.
|
|
17
|
-
resolution: {integrity: sha512-
|
|
18
|
-
engines: {node: ^12.13.0 || ^14.15.0 || >=16}
|
|
16
|
+
/@npmcli/fs/1.1.1:
|
|
17
|
+
resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
|
|
19
18
|
dependencies:
|
|
20
19
|
'@gar/promisify': 1.1.2
|
|
21
20
|
semver: 7.3.5
|
|
@@ -84,9 +83,9 @@ packages:
|
|
|
84
83
|
dev: false
|
|
85
84
|
optional: true
|
|
86
85
|
|
|
87
|
-
/are-we-there-yet/
|
|
88
|
-
resolution: {integrity: sha512-
|
|
89
|
-
engines: {node:
|
|
86
|
+
/are-we-there-yet/3.0.0:
|
|
87
|
+
resolution: {integrity: sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==}
|
|
88
|
+
engines: {node: ^12.13.0 || ^14.15.0 || >=16}
|
|
90
89
|
dependencies:
|
|
91
90
|
delegates: 1.0.0
|
|
92
91
|
readable-stream: 3.6.0
|
|
@@ -110,7 +109,7 @@ packages:
|
|
|
110
109
|
resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
|
|
111
110
|
engines: {node: '>= 10'}
|
|
112
111
|
dependencies:
|
|
113
|
-
'@npmcli/fs': 1.1.
|
|
112
|
+
'@npmcli/fs': 1.1.1
|
|
114
113
|
'@npmcli/move-file': 1.1.2
|
|
115
114
|
chownr: 2.0.0
|
|
116
115
|
fs-minipass: 2.1.0
|
|
@@ -229,7 +228,7 @@ packages:
|
|
|
229
228
|
color-support: 1.1.3
|
|
230
229
|
console-control-strings: 1.1.0
|
|
231
230
|
has-unicode: 2.0.1
|
|
232
|
-
signal-exit: 3.0.
|
|
231
|
+
signal-exit: 3.0.7
|
|
233
232
|
string-width: 4.2.3
|
|
234
233
|
strip-ansi: 6.0.1
|
|
235
234
|
wide-align: 1.1.5
|
|
@@ -242,7 +241,7 @@ packages:
|
|
|
242
241
|
fs.realpath: 1.0.0
|
|
243
242
|
inflight: 1.0.6
|
|
244
243
|
inherits: 2.0.4
|
|
245
|
-
minimatch: 3.
|
|
244
|
+
minimatch: 3.1.1
|
|
246
245
|
once: 1.4.0
|
|
247
246
|
path-is-absolute: 1.0.1
|
|
248
247
|
dev: false
|
|
@@ -385,8 +384,8 @@ packages:
|
|
|
385
384
|
dev: false
|
|
386
385
|
optional: true
|
|
387
386
|
|
|
388
|
-
/minimatch/3.
|
|
389
|
-
resolution: {integrity: sha512-
|
|
387
|
+
/minimatch/3.1.1:
|
|
388
|
+
resolution: {integrity: sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==}
|
|
390
389
|
dependencies:
|
|
391
390
|
brace-expansion: 1.1.11
|
|
392
391
|
dev: false
|
|
@@ -487,7 +486,7 @@ packages:
|
|
|
487
486
|
graceful-fs: 4.2.9
|
|
488
487
|
make-fetch-happen: 9.1.0
|
|
489
488
|
nopt: 5.0.0
|
|
490
|
-
npmlog: 6.0.
|
|
489
|
+
npmlog: 6.0.1
|
|
491
490
|
rimraf: 3.0.2
|
|
492
491
|
semver: 7.3.5
|
|
493
492
|
tar: 6.1.11
|
|
@@ -506,11 +505,11 @@ packages:
|
|
|
506
505
|
dev: false
|
|
507
506
|
optional: true
|
|
508
507
|
|
|
509
|
-
/npmlog/6.0.
|
|
510
|
-
resolution: {integrity: sha512-
|
|
508
|
+
/npmlog/6.0.1:
|
|
509
|
+
resolution: {integrity: sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==}
|
|
511
510
|
engines: {node: ^12.13.0 || ^14.15.0 || >=16}
|
|
512
511
|
dependencies:
|
|
513
|
-
are-we-there-yet:
|
|
512
|
+
are-we-there-yet: 3.0.0
|
|
514
513
|
console-control-strings: 1.1.0
|
|
515
514
|
gauge: 4.0.0
|
|
516
515
|
set-blocking: 2.0.0
|
|
@@ -600,8 +599,8 @@ packages:
|
|
|
600
599
|
dev: false
|
|
601
600
|
optional: true
|
|
602
601
|
|
|
603
|
-
/signal-exit/3.0.
|
|
604
|
-
resolution: {integrity: sha512-
|
|
602
|
+
/signal-exit/3.0.7:
|
|
603
|
+
resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
|
|
605
604
|
dev: false
|
|
606
605
|
optional: true
|
|
607
606
|
|
|
@@ -617,14 +616,14 @@ packages:
|
|
|
617
616
|
dependencies:
|
|
618
617
|
agent-base: 6.0.2
|
|
619
618
|
debug: 4.3.3
|
|
620
|
-
socks: 2.6.
|
|
619
|
+
socks: 2.6.2
|
|
621
620
|
transitivePeerDependencies:
|
|
622
621
|
- supports-color
|
|
623
622
|
dev: false
|
|
624
623
|
optional: true
|
|
625
624
|
|
|
626
|
-
/socks/2.6.
|
|
627
|
-
resolution: {integrity: sha512-
|
|
625
|
+
/socks/2.6.2:
|
|
626
|
+
resolution: {integrity: sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==}
|
|
628
627
|
engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
|
|
629
628
|
dependencies:
|
|
630
629
|
ip: 1.1.5
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@npmcli/fs",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"description": "filesystem utilities for the npm cli",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -34,8 +34,5 @@
|
|
|
34
34
|
"@gar/promisify": "^1.0.1",
|
|
35
35
|
"semver": "^7.3.5"
|
|
36
36
|
},
|
|
37
|
-
"templateVersion": "2.3.1"
|
|
38
|
-
"engines": {
|
|
39
|
-
"node": "^12.13.0 || ^14.15.0 || >=16"
|
|
40
|
-
}
|
|
37
|
+
"templateVersion": "2.3.1"
|
|
41
38
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "are-we-there-yet",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "Keep track of the overall completion of many disparate processes",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,7 +13,9 @@
|
|
|
13
13
|
"preversion": "npm test",
|
|
14
14
|
"postversion": "npm publish",
|
|
15
15
|
"prepublishOnly": "git push origin --follow-tags",
|
|
16
|
-
"snap": "tap"
|
|
16
|
+
"snap": "tap",
|
|
17
|
+
"postlint": "npm-template-check",
|
|
18
|
+
"template-copy": "npm-template-copy --force"
|
|
17
19
|
},
|
|
18
20
|
"repository": {
|
|
19
21
|
"type": "git",
|
|
@@ -26,9 +28,9 @@
|
|
|
26
28
|
},
|
|
27
29
|
"homepage": "https://github.com/npm/are-we-there-yet",
|
|
28
30
|
"devDependencies": {
|
|
29
|
-
"@npmcli/eslint-config": "^
|
|
30
|
-
"@npmcli/template-oss": "^
|
|
31
|
-
"eslint": "^
|
|
31
|
+
"@npmcli/eslint-config": "^2.0.0",
|
|
32
|
+
"@npmcli/template-oss": "^2.7.1",
|
|
33
|
+
"eslint": "^8.8.0",
|
|
32
34
|
"eslint-plugin-node": "^11.1.0",
|
|
33
35
|
"tap": "^15.0.9"
|
|
34
36
|
},
|
|
@@ -41,7 +43,7 @@
|
|
|
41
43
|
"lib"
|
|
42
44
|
],
|
|
43
45
|
"engines": {
|
|
44
|
-
"node": ">=
|
|
46
|
+
"node": "^12.13.0 || ^14.15.0 || >=16"
|
|
45
47
|
},
|
|
46
48
|
"tap": {
|
|
47
49
|
"branches": 68,
|
|
@@ -49,5 +51,7 @@
|
|
|
49
51
|
"functions": 86,
|
|
50
52
|
"lines": 92
|
|
51
53
|
},
|
|
52
|
-
"
|
|
54
|
+
"templateOSS": {
|
|
55
|
+
"version": "2.7.1"
|
|
56
|
+
}
|
|
53
57
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
module.exports = minimatch
|
|
2
2
|
minimatch.Minimatch = Minimatch
|
|
3
3
|
|
|
4
|
-
var path = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
var path = (function () { try { return require('path') } catch (e) {}}()) || {
|
|
5
|
+
sep: '/'
|
|
6
|
+
}
|
|
7
|
+
minimatch.sep = path.sep
|
|
8
8
|
|
|
9
9
|
var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
|
|
10
10
|
var expand = require('brace-expansion')
|
|
@@ -56,43 +56,64 @@ function filter (pattern, options) {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
function ext (a, b) {
|
|
59
|
-
a = a || {}
|
|
60
59
|
b = b || {}
|
|
61
60
|
var t = {}
|
|
62
|
-
Object.keys(b).forEach(function (k) {
|
|
63
|
-
t[k] = b[k]
|
|
64
|
-
})
|
|
65
61
|
Object.keys(a).forEach(function (k) {
|
|
66
62
|
t[k] = a[k]
|
|
67
63
|
})
|
|
64
|
+
Object.keys(b).forEach(function (k) {
|
|
65
|
+
t[k] = b[k]
|
|
66
|
+
})
|
|
68
67
|
return t
|
|
69
68
|
}
|
|
70
69
|
|
|
71
70
|
minimatch.defaults = function (def) {
|
|
72
|
-
if (!def || !Object.keys(def).length)
|
|
71
|
+
if (!def || typeof def !== 'object' || !Object.keys(def).length) {
|
|
72
|
+
return minimatch
|
|
73
|
+
}
|
|
73
74
|
|
|
74
75
|
var orig = minimatch
|
|
75
76
|
|
|
76
77
|
var m = function minimatch (p, pattern, options) {
|
|
77
|
-
return orig
|
|
78
|
+
return orig(p, pattern, ext(def, options))
|
|
78
79
|
}
|
|
79
80
|
|
|
80
81
|
m.Minimatch = function Minimatch (pattern, options) {
|
|
81
82
|
return new orig.Minimatch(pattern, ext(def, options))
|
|
82
83
|
}
|
|
84
|
+
m.Minimatch.defaults = function defaults (options) {
|
|
85
|
+
return orig.defaults(ext(def, options)).Minimatch
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
m.filter = function filter (pattern, options) {
|
|
89
|
+
return orig.filter(pattern, ext(def, options))
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
m.defaults = function defaults (options) {
|
|
93
|
+
return orig.defaults(ext(def, options))
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
m.makeRe = function makeRe (pattern, options) {
|
|
97
|
+
return orig.makeRe(pattern, ext(def, options))
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
m.braceExpand = function braceExpand (pattern, options) {
|
|
101
|
+
return orig.braceExpand(pattern, ext(def, options))
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
m.match = function (list, pattern, options) {
|
|
105
|
+
return orig.match(list, pattern, ext(def, options))
|
|
106
|
+
}
|
|
83
107
|
|
|
84
108
|
return m
|
|
85
109
|
}
|
|
86
110
|
|
|
87
111
|
Minimatch.defaults = function (def) {
|
|
88
|
-
if (!def || !Object.keys(def).length) return Minimatch
|
|
89
112
|
return minimatch.defaults(def).Minimatch
|
|
90
113
|
}
|
|
91
114
|
|
|
92
115
|
function minimatch (p, pattern, options) {
|
|
93
|
-
|
|
94
|
-
throw new TypeError('glob pattern string required')
|
|
95
|
-
}
|
|
116
|
+
assertValidPattern(pattern)
|
|
96
117
|
|
|
97
118
|
if (!options) options = {}
|
|
98
119
|
|
|
@@ -101,9 +122,6 @@ function minimatch (p, pattern, options) {
|
|
|
101
122
|
return false
|
|
102
123
|
}
|
|
103
124
|
|
|
104
|
-
// "" only matches ""
|
|
105
|
-
if (pattern.trim() === '') return p === ''
|
|
106
|
-
|
|
107
125
|
return new Minimatch(pattern, options).match(p)
|
|
108
126
|
}
|
|
109
127
|
|
|
@@ -112,15 +130,12 @@ function Minimatch (pattern, options) {
|
|
|
112
130
|
return new Minimatch(pattern, options)
|
|
113
131
|
}
|
|
114
132
|
|
|
115
|
-
|
|
116
|
-
throw new TypeError('glob pattern string required')
|
|
117
|
-
}
|
|
133
|
+
assertValidPattern(pattern)
|
|
118
134
|
|
|
119
135
|
if (!options) options = {}
|
|
120
|
-
pattern = pattern.trim()
|
|
121
136
|
|
|
122
137
|
// windows support: need to use /, not \
|
|
123
|
-
if (path.sep !== '/') {
|
|
138
|
+
if (!options.allowWindowsEscape && path.sep !== '/') {
|
|
124
139
|
pattern = pattern.split(path.sep).join('/')
|
|
125
140
|
}
|
|
126
141
|
|
|
@@ -131,6 +146,7 @@ function Minimatch (pattern, options) {
|
|
|
131
146
|
this.negate = false
|
|
132
147
|
this.comment = false
|
|
133
148
|
this.empty = false
|
|
149
|
+
this.partial = !!options.partial
|
|
134
150
|
|
|
135
151
|
// make the set of regexps etc.
|
|
136
152
|
this.make()
|
|
@@ -140,9 +156,6 @@ Minimatch.prototype.debug = function () {}
|
|
|
140
156
|
|
|
141
157
|
Minimatch.prototype.make = make
|
|
142
158
|
function make () {
|
|
143
|
-
// don't do it more than once.
|
|
144
|
-
if (this._made) return
|
|
145
|
-
|
|
146
159
|
var pattern = this.pattern
|
|
147
160
|
var options = this.options
|
|
148
161
|
|
|
@@ -162,7 +175,7 @@ function make () {
|
|
|
162
175
|
// step 2: expand braces
|
|
163
176
|
var set = this.globSet = this.braceExpand()
|
|
164
177
|
|
|
165
|
-
if (options.debug) this.debug = console.error
|
|
178
|
+
if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
|
|
166
179
|
|
|
167
180
|
this.debug(this.pattern, set)
|
|
168
181
|
|
|
@@ -242,12 +255,11 @@ function braceExpand (pattern, options) {
|
|
|
242
255
|
pattern = typeof pattern === 'undefined'
|
|
243
256
|
? this.pattern : pattern
|
|
244
257
|
|
|
245
|
-
|
|
246
|
-
throw new TypeError('undefined pattern')
|
|
247
|
-
}
|
|
258
|
+
assertValidPattern(pattern)
|
|
248
259
|
|
|
249
|
-
|
|
250
|
-
|
|
260
|
+
// Thanks to Yeting Li <https://github.com/yetingli> for
|
|
261
|
+
// improving this regexp to avoid a ReDOS vulnerability.
|
|
262
|
+
if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
|
|
251
263
|
// shortcut. no need to expand.
|
|
252
264
|
return [pattern]
|
|
253
265
|
}
|
|
@@ -255,6 +267,17 @@ function braceExpand (pattern, options) {
|
|
|
255
267
|
return expand(pattern)
|
|
256
268
|
}
|
|
257
269
|
|
|
270
|
+
var MAX_PATTERN_LENGTH = 1024 * 64
|
|
271
|
+
var assertValidPattern = function (pattern) {
|
|
272
|
+
if (typeof pattern !== 'string') {
|
|
273
|
+
throw new TypeError('invalid pattern')
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
if (pattern.length > MAX_PATTERN_LENGTH) {
|
|
277
|
+
throw new TypeError('pattern is too long')
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
|
|
258
281
|
// parse a component of the expanded set.
|
|
259
282
|
// At this point, no pattern may contain "/" in it
|
|
260
283
|
// so we're going to return a 2d array, where each entry is the full
|
|
@@ -269,14 +292,17 @@ function braceExpand (pattern, options) {
|
|
|
269
292
|
Minimatch.prototype.parse = parse
|
|
270
293
|
var SUBPARSE = {}
|
|
271
294
|
function parse (pattern, isSub) {
|
|
272
|
-
|
|
273
|
-
throw new TypeError('pattern is too long')
|
|
274
|
-
}
|
|
295
|
+
assertValidPattern(pattern)
|
|
275
296
|
|
|
276
297
|
var options = this.options
|
|
277
298
|
|
|
278
299
|
// shortcuts
|
|
279
|
-
if (
|
|
300
|
+
if (pattern === '**') {
|
|
301
|
+
if (!options.noglobstar)
|
|
302
|
+
return GLOBSTAR
|
|
303
|
+
else
|
|
304
|
+
pattern = '*'
|
|
305
|
+
}
|
|
280
306
|
if (pattern === '') return ''
|
|
281
307
|
|
|
282
308
|
var re = ''
|
|
@@ -332,10 +358,12 @@ function parse (pattern, isSub) {
|
|
|
332
358
|
}
|
|
333
359
|
|
|
334
360
|
switch (c) {
|
|
335
|
-
|
|
361
|
+
/* istanbul ignore next */
|
|
362
|
+
case '/': {
|
|
336
363
|
// completely not allowed, even escaped.
|
|
337
364
|
// Should already be path-split by now.
|
|
338
365
|
return false
|
|
366
|
+
}
|
|
339
367
|
|
|
340
368
|
case '\\':
|
|
341
369
|
clearStateChar()
|
|
@@ -454,25 +482,23 @@ function parse (pattern, isSub) {
|
|
|
454
482
|
|
|
455
483
|
// handle the case where we left a class open.
|
|
456
484
|
// "[z-a]" is valid, equivalent to "\[z-a\]"
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
continue
|
|
475
|
-
}
|
|
485
|
+
// split where the last [ was, make sure we don't have
|
|
486
|
+
// an invalid re. if so, re-walk the contents of the
|
|
487
|
+
// would-be class to re-translate any characters that
|
|
488
|
+
// were passed through as-is
|
|
489
|
+
// TODO: It would probably be faster to determine this
|
|
490
|
+
// without a try/catch and a new RegExp, but it's tricky
|
|
491
|
+
// to do safely. For now, this is safe and works.
|
|
492
|
+
var cs = pattern.substring(classStart + 1, i)
|
|
493
|
+
try {
|
|
494
|
+
RegExp('[' + cs + ']')
|
|
495
|
+
} catch (er) {
|
|
496
|
+
// not a valid class!
|
|
497
|
+
var sp = this.parse(cs, SUBPARSE)
|
|
498
|
+
re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
|
|
499
|
+
hasMagic = hasMagic || sp[1]
|
|
500
|
+
inClass = false
|
|
501
|
+
continue
|
|
476
502
|
}
|
|
477
503
|
|
|
478
504
|
// finish up the class.
|
|
@@ -556,9 +582,7 @@ function parse (pattern, isSub) {
|
|
|
556
582
|
// something that could conceivably capture a dot
|
|
557
583
|
var addPatternStart = false
|
|
558
584
|
switch (re.charAt(0)) {
|
|
559
|
-
case '.':
|
|
560
|
-
case '[':
|
|
561
|
-
case '(': addPatternStart = true
|
|
585
|
+
case '[': case '.': case '(': addPatternStart = true
|
|
562
586
|
}
|
|
563
587
|
|
|
564
588
|
// Hack to work around lack of negative lookbehind in JS
|
|
@@ -620,7 +644,7 @@ function parse (pattern, isSub) {
|
|
|
620
644
|
var flags = options.nocase ? 'i' : ''
|
|
621
645
|
try {
|
|
622
646
|
var regExp = new RegExp('^' + re + '$', flags)
|
|
623
|
-
} catch (er) {
|
|
647
|
+
} catch (er) /* istanbul ignore next - should be impossible */ {
|
|
624
648
|
// If it was an invalid regular expression, then it can't match
|
|
625
649
|
// anything. This trick looks for a character after the end of
|
|
626
650
|
// the string, which is of course impossible, except in multi-line
|
|
@@ -678,7 +702,7 @@ function makeRe () {
|
|
|
678
702
|
|
|
679
703
|
try {
|
|
680
704
|
this.regexp = new RegExp(re, flags)
|
|
681
|
-
} catch (ex) {
|
|
705
|
+
} catch (ex) /* istanbul ignore next - should be impossible */ {
|
|
682
706
|
this.regexp = false
|
|
683
707
|
}
|
|
684
708
|
return this.regexp
|
|
@@ -696,8 +720,8 @@ minimatch.match = function (list, pattern, options) {
|
|
|
696
720
|
return list
|
|
697
721
|
}
|
|
698
722
|
|
|
699
|
-
Minimatch.prototype.match = match
|
|
700
|
-
|
|
723
|
+
Minimatch.prototype.match = function match (f, partial) {
|
|
724
|
+
if (typeof partial === 'undefined') partial = this.partial
|
|
701
725
|
this.debug('match', f, this.pattern)
|
|
702
726
|
// short-circuit in the case of busted things.
|
|
703
727
|
// comments, etc.
|
|
@@ -779,6 +803,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|
|
779
803
|
|
|
780
804
|
// should be impossible.
|
|
781
805
|
// some invalid regexp stuff in the set.
|
|
806
|
+
/* istanbul ignore if */
|
|
782
807
|
if (p === false) return false
|
|
783
808
|
|
|
784
809
|
if (p === GLOBSTAR) {
|
|
@@ -852,6 +877,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|
|
852
877
|
// no match was found.
|
|
853
878
|
// However, in partial mode, we can't say this is necessarily over.
|
|
854
879
|
// If there's more *pattern* left, then
|
|
880
|
+
/* istanbul ignore if */
|
|
855
881
|
if (partial) {
|
|
856
882
|
// ran out of file
|
|
857
883
|
this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
|
|
@@ -865,11 +891,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|
|
865
891
|
// patterns with magic have been turned into regexps.
|
|
866
892
|
var hit
|
|
867
893
|
if (typeof p === 'string') {
|
|
868
|
-
|
|
869
|
-
hit = f.toLowerCase() === p.toLowerCase()
|
|
870
|
-
} else {
|
|
871
|
-
hit = f === p
|
|
872
|
-
}
|
|
894
|
+
hit = f === p
|
|
873
895
|
this.debug('string match', p, f, hit)
|
|
874
896
|
} else {
|
|
875
897
|
hit = f.match(p)
|
|
@@ -900,16 +922,16 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|
|
900
922
|
// this is ok if we're doing the match as part of
|
|
901
923
|
// a glob fs traversal.
|
|
902
924
|
return partial
|
|
903
|
-
} else if (pi === pl) {
|
|
925
|
+
} else /* istanbul ignore else */ if (pi === pl) {
|
|
904
926
|
// ran out of pattern, still have file left.
|
|
905
927
|
// this is only acceptable if we're on the very last
|
|
906
928
|
// empty segment of a file with a trailing slash.
|
|
907
929
|
// a/* should match a/b/
|
|
908
|
-
|
|
909
|
-
return emptyFileEnd
|
|
930
|
+
return (fi === fl - 1) && (file[fi] === '')
|
|
910
931
|
}
|
|
911
932
|
|
|
912
933
|
// should be unreachable.
|
|
934
|
+
/* istanbul ignore next */
|
|
913
935
|
throw new Error('wtf?')
|
|
914
936
|
}
|
|
915
937
|
|
|
@@ -2,14 +2,17 @@
|
|
|
2
2
|
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
|
|
3
3
|
"name": "minimatch",
|
|
4
4
|
"description": "a glob matcher in javascript",
|
|
5
|
-
"version": "3.
|
|
5
|
+
"version": "3.1.1",
|
|
6
|
+
"publishConfig": {
|
|
7
|
+
"tag": "v3-legacy"
|
|
8
|
+
},
|
|
6
9
|
"repository": {
|
|
7
10
|
"type": "git",
|
|
8
11
|
"url": "git://github.com/isaacs/minimatch.git"
|
|
9
12
|
},
|
|
10
13
|
"main": "minimatch.js",
|
|
11
14
|
"scripts": {
|
|
12
|
-
"test": "tap
|
|
15
|
+
"test": "tap",
|
|
13
16
|
"preversion": "npm test",
|
|
14
17
|
"postversion": "npm publish",
|
|
15
18
|
"postpublish": "git push origin --all; git push origin --tags"
|
|
@@ -21,7 +24,7 @@
|
|
|
21
24
|
"brace-expansion": "^1.1.7"
|
|
22
25
|
},
|
|
23
26
|
"devDependencies": {
|
|
24
|
-
"tap": "^
|
|
27
|
+
"tap": "^15.1.6"
|
|
25
28
|
},
|
|
26
29
|
"license": "ISC",
|
|
27
30
|
"files": [
|
|
@@ -292,8 +292,9 @@ log.emitLog = function (m) {
|
|
|
292
292
|
var disp = log.disp[m.level] != null ? log.disp[m.level] : m.level
|
|
293
293
|
this.clearProgress()
|
|
294
294
|
m.message.split(/\r?\n/).forEach(function (line) {
|
|
295
|
-
|
|
296
|
-
|
|
295
|
+
var heading = this.heading
|
|
296
|
+
if (heading) {
|
|
297
|
+
this.write(heading, this.headingStyle)
|
|
297
298
|
this.write(' ')
|
|
298
299
|
}
|
|
299
300
|
this.write(disp, log.style[m.level])
|
|
@@ -390,11 +391,11 @@ log.style = {}
|
|
|
390
391
|
log.levels = {}
|
|
391
392
|
log.disp = {}
|
|
392
393
|
log.addLevel('silly', -Infinity, { inverse: true }, 'sill')
|
|
393
|
-
log.addLevel('verbose', 1000, { fg: '
|
|
394
|
+
log.addLevel('verbose', 1000, { fg: 'cyan', bg: 'black' }, 'verb')
|
|
394
395
|
log.addLevel('info', 2000, { fg: 'green' })
|
|
395
396
|
log.addLevel('timing', 2500, { fg: 'green', bg: 'black' })
|
|
396
397
|
log.addLevel('http', 3000, { fg: 'green', bg: 'black' })
|
|
397
|
-
log.addLevel('notice', 3500, { fg: '
|
|
398
|
+
log.addLevel('notice', 3500, { fg: 'cyan', bg: 'black' })
|
|
398
399
|
log.addLevel('warn', 4000, { fg: 'black', bg: 'yellow' }, 'WARN')
|
|
399
400
|
log.addLevel('error', 5000, { fg: 'red', bg: 'black' }, 'ERR!')
|
|
400
401
|
log.addLevel('silent', Infinity)
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "GitHub Inc.",
|
|
3
3
|
"name": "npmlog",
|
|
4
4
|
"description": "logger for npm",
|
|
5
|
-
"version": "6.0.
|
|
5
|
+
"version": "6.0.1",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/npm/npmlog.git"
|
|
@@ -23,24 +23,27 @@
|
|
|
23
23
|
"preversion": "npm test",
|
|
24
24
|
"postversion": "npm publish",
|
|
25
25
|
"prepublishOnly": "git push origin --follow-tags",
|
|
26
|
-
"snap": "tap"
|
|
26
|
+
"snap": "tap",
|
|
27
|
+
"template-copy": "npm-template-copy --force"
|
|
27
28
|
},
|
|
28
29
|
"dependencies": {
|
|
29
|
-
"are-we-there-yet": "^
|
|
30
|
+
"are-we-there-yet": "^3.0.0",
|
|
30
31
|
"console-control-strings": "^1.1.0",
|
|
31
32
|
"gauge": "^4.0.0",
|
|
32
33
|
"set-blocking": "^2.0.0"
|
|
33
34
|
},
|
|
34
35
|
"devDependencies": {
|
|
35
|
-
"@npmcli/template-oss": "^2.
|
|
36
|
-
"tap": "^15.
|
|
36
|
+
"@npmcli/template-oss": "^2.7.1",
|
|
37
|
+
"tap": "^15.1.6"
|
|
37
38
|
},
|
|
38
39
|
"license": "ISC",
|
|
39
|
-
"templateVersion": "2.3.0",
|
|
40
40
|
"engines": {
|
|
41
41
|
"node": "^12.13.0 || ^14.15.0 || >=16"
|
|
42
42
|
},
|
|
43
43
|
"tap": {
|
|
44
44
|
"branches": 95
|
|
45
|
+
},
|
|
46
|
+
"templateOSS": {
|
|
47
|
+
"version": "2.7.1"
|
|
45
48
|
}
|
|
46
49
|
}
|
|
@@ -19,7 +19,9 @@ const processOk = function (process) {
|
|
|
19
19
|
// some kind of non-node environment, just no-op
|
|
20
20
|
/* istanbul ignore if */
|
|
21
21
|
if (!processOk(process)) {
|
|
22
|
-
module.exports = function () {
|
|
22
|
+
module.exports = function () {
|
|
23
|
+
return function () {}
|
|
24
|
+
}
|
|
23
25
|
} else {
|
|
24
26
|
var assert = require('assert')
|
|
25
27
|
var signals = require('./signals.js')
|
|
@@ -52,7 +54,7 @@ if (!processOk(process)) {
|
|
|
52
54
|
module.exports = function (cb, opts) {
|
|
53
55
|
/* istanbul ignore if */
|
|
54
56
|
if (!processOk(global.process)) {
|
|
55
|
-
return
|
|
57
|
+
return function () {}
|
|
56
58
|
}
|
|
57
59
|
assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
|
|
58
60
|
|