Skip to content

Commit dd85c09

Browse files
davidmurdochHowardBraham
authored andcommitted
release(cp): chore: fix newly reported dependency audit vulnerabilities by updating minimatch-related deps (#40315)
1 parent 76eb087 commit dd85c09

File tree

22 files changed

+234
-205
lines changed

22 files changed

+234
-205
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ module.exports = {
588588
files: ['development/**/*.js', 'test/helpers/setup-helper.js'],
589589
rules: {
590590
'n/no-process-exit': 'off',
591-
'n/shebang': 'off',
591+
'n/hashbang': 'off',
592592
},
593593
},
594594
/**

.eslintrc.node.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ module.exports = {
22
extends: ['@metamask/eslint-config-nodejs'],
33
rules: {
44
'n/no-process-env': 'off',
5+
// eslint-plugin-n@17 started treating these browser globals as Node builtins
6+
// and `n/hashbang` started flagging existing script headers in this repo.
7+
// Keep prior behavior while we remain on the current shared config stack.
8+
'n/no-unsupported-features/node-builtins': [
9+
'error',
10+
{
11+
ignores: ['navigator', 'Navigator', 'localStorage'],
12+
},
13+
],
14+
'n/hashbang': 'off',
515
// TODO: re-enable these rules
616
'n/no-sync': 'off',
717
'n/no-unpublished-import': 'off',

.yarnrc.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,6 @@ npmAuditIgnoreAdvisories:
2626
# We are ignoring this on April 24, 2025 to unblock CI, we will follow with a proper fix or confirmation this does not affect our users
2727
- 1104001
2828

29-
# Issue: `glob` vulnerability, already fixed in the version we're using (v10.5.0) but the
30-
# advisory range hasn't been updated yet.
31-
# URL: https://github.com/advisories/GHSA-5j98-mcp5-4vw2
32-
- 1109809
33-
34-
# Issue: `body-parser` denial of service vulnerability
35-
# Seemingly only impacts v2.2.0, but we're on v1. The advisory range is overly wide.
36-
# The attack vector also does not apply to how we use the package.
37-
# URL: https://github.com/advisories/GHSA-wqch-xfxh-vrr4
38-
- 1110857
39-
40-
# Issue: ajv has ReDoS when using `$data` option
41-
# A lot of our linting tooling relies on old versions of ajv, which proves hard to deal with
42-
# For now, we are ignoring this to unblock CI
43-
# URL: https://github.com/advisories/GHSA-2g4f-4pwh-qvx6
44-
- 1113214
45-
46-
# Issue: minimatch has a ReDoS via repeated wildcards with non-matching literal in pattern
47-
# Only affects dev/build-time dependencies (eslint-plugin-n, glob) — not shipped to users.
48-
# URL: https://github.com/advisories/GHSA-3ppc-4f35-3m26
49-
- 1113371
50-
- 1113459
51-
5229
### Package Deprecations:
5330

5431
# React-tippy brings in popper.js and react-tippy has not been updated in
@@ -104,3 +81,5 @@ npmPreapprovedPackages:
10481
- 'lavamoat-node'
10582
- 'lavamoat'
10683
- 'extension-port-stream'
84+
# Temporary bypass for recent minimatch security patch; remove once older than age gate.
85+
- 'minimatch'

lavamoat/browserify/beta/policy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,7 +3877,7 @@
38773877
"buffer>ieee754": true
38783878
}
38793879
},
3880-
"eslint-plugin-n>builtins": {
3880+
"@metamask/snaps-utils>validate-npm-package-name>builtins": {
38813881
"packages": {
38823882
"process": true,
38833883
"semver": true
@@ -6433,7 +6433,7 @@
64336433
},
64346434
"@metamask/snaps-utils>validate-npm-package-name": {
64356435
"packages": {
6436-
"eslint-plugin-n>builtins": true
6436+
"@metamask/snaps-utils>validate-npm-package-name>builtins": true
64376437
}
64386438
},
64396439
"react-markdown>vfile>vfile-message": {

lavamoat/browserify/experimental/policy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,7 +3877,7 @@
38773877
"buffer>ieee754": true
38783878
}
38793879
},
3880-
"eslint-plugin-n>builtins": {
3880+
"@metamask/snaps-utils>validate-npm-package-name>builtins": {
38813881
"packages": {
38823882
"process": true,
38833883
"semver": true
@@ -6433,7 +6433,7 @@
64336433
},
64346434
"@metamask/snaps-utils>validate-npm-package-name": {
64356435
"packages": {
6436-
"eslint-plugin-n>builtins": true
6436+
"@metamask/snaps-utils>validate-npm-package-name>builtins": true
64376437
}
64386438
},
64396439
"react-markdown>vfile>vfile-message": {

lavamoat/browserify/flask/policy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,7 +3877,7 @@
38773877
"buffer>ieee754": true
38783878
}
38793879
},
3880-
"eslint-plugin-n>builtins": {
3880+
"@metamask/snaps-utils>validate-npm-package-name>builtins": {
38813881
"packages": {
38823882
"process": true,
38833883
"semver": true
@@ -6433,7 +6433,7 @@
64336433
},
64346434
"@metamask/snaps-utils>validate-npm-package-name": {
64356435
"packages": {
6436-
"eslint-plugin-n>builtins": true
6436+
"@metamask/snaps-utils>validate-npm-package-name>builtins": true
64376437
}
64386438
},
64396439
"react-markdown>vfile>vfile-message": {

lavamoat/browserify/main/policy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,7 +3877,7 @@
38773877
"buffer>ieee754": true
38783878
}
38793879
},
3880-
"eslint-plugin-n>builtins": {
3880+
"@metamask/snaps-utils>validate-npm-package-name>builtins": {
38813881
"packages": {
38823882
"process": true,
38833883
"semver": true
@@ -6433,7 +6433,7 @@
64336433
},
64346434
"@metamask/snaps-utils>validate-npm-package-name": {
64356435
"packages": {
6436-
"eslint-plugin-n>builtins": true
6436+
"@metamask/snaps-utils>validate-npm-package-name>builtins": true
64376437
}
64386438
},
64396439
"react-markdown>vfile>vfile-message": {

lavamoat/build-system/policy.json

Lines changed: 95 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,14 +1781,6 @@
17811781
"Buffer": true
17821782
}
17831783
},
1784-
"eslint-plugin-n>builtins": {
1785-
"globals": {
1786-
"process.version": true
1787-
},
1788-
"packages": {
1789-
"semver": true
1790-
}
1791-
},
17921784
"gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": {
17931785
"packages": {
17941786
"gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": true,
@@ -2526,6 +2518,30 @@
25262518
"@metamask/object-multiplex>once": true
25272519
}
25282520
},
2521+
"webpack>enhanced-resolve": {
2522+
"builtin": {
2523+
"module.findPnpApi": true,
2524+
"path.basename": true,
2525+
"path.posix.dirname": true,
2526+
"path.posix.normalize": true,
2527+
"path.win32.dirname": true,
2528+
"path.win32.normalize": true,
2529+
"process.nextTick": true,
2530+
"process.versions.pnp": true,
2531+
"url": true
2532+
},
2533+
"globals": {
2534+
"Buffer.isBuffer": true,
2535+
"URL": true,
2536+
"clearTimeout": true,
2537+
"process.cwd": true,
2538+
"setTimeout": true
2539+
},
2540+
"packages": {
2541+
"del>graceful-fs": true,
2542+
"webpack>tapable": true
2543+
}
2544+
},
25292545
"gulp-livereload>tiny-lr>body>error": {
25302546
"builtin": {
25312547
"assert": true
@@ -2708,6 +2724,17 @@
27082724
"eslint>natural-compare": true
27092725
}
27102726
},
2727+
"eslint-plugin-n>eslint-plugin-es-x>eslint-compat-utils": {
2728+
"builtin": {
2729+
"fs.existsSync": true,
2730+
"path.basename": true,
2731+
"path.dirname": true,
2732+
"path.extname": true
2733+
},
2734+
"globals": {
2735+
"process.cwd": true
2736+
}
2737+
},
27112738
"eslint-config-prettier": {
27122739
"globals": {
27132740
"process.env.ESLINT_CONFIG_PRETTIER_NO_DEPRECATED": true
@@ -2766,13 +2793,14 @@
27662793
"eslint-import-resolver-node": true
27672794
}
27682795
},
2769-
"eslint-plugin-n>eslint-plugin-es": {
2796+
"eslint-plugin-n>eslint-plugin-es-x": {
27702797
"globals": {
27712798
"process": true
27722799
},
27732800
"packages": {
2774-
"eslint-plugin-n>eslint-plugin-es>eslint-utils": true,
2775-
"eslint-plugin-n>eslint-plugin-es>regexpp": true
2801+
"eslint>@eslint-community/eslint-utils": true,
2802+
"eslint>@eslint-community/regexpp": true,
2803+
"eslint-plugin-n>eslint-plugin-es-x>eslint-compat-utils": true
27762804
}
27772805
},
27782806
"eslint-plugin-import": {
@@ -2839,29 +2867,34 @@
28392867
},
28402868
"eslint-plugin-n": {
28412869
"builtin": {
2842-
"assert": true,
2843-
"fs": true,
2844-
"path": true,
2845-
"url.URL": true,
2846-
"url.fileURLToPath": true,
2847-
"url.pathToFileURL": true,
2848-
"util.format": true,
2849-
"util.inspect": true
2870+
"fs.existsSync": true,
2871+
"fs.readFileSync": true,
2872+
"fs.readdirSync": true,
2873+
"fs.statSync": true,
2874+
"node:module.isBuiltin": true,
2875+
"path.basename": true,
2876+
"path.dirname": true,
2877+
"path.extname": true,
2878+
"path.isAbsolute": true,
2879+
"path.join": true,
2880+
"path.posix.normalize": true,
2881+
"path.relative": true,
2882+
"path.resolve": true,
2883+
"path.sep": true
28502884
},
28512885
"globals": {
2852-
"process.cwd": true,
2853-
"process.emitWarning": true,
2854-
"process.platform": true
2886+
"process.cwd": true
28552887
},
28562888
"packages": {
2857-
"eslint-plugin-n>builtins": true,
2858-
"eslint-plugin-n>eslint-plugin-es": true,
2859-
"eslint-plugin-n>eslint-utils": true,
2889+
"eslint>@eslint-community/eslint-utils": true,
2890+
"webpack>enhanced-resolve": true,
2891+
"eslint-plugin-n>eslint-plugin-es-x": true,
2892+
"tsx>get-tsconfig": true,
2893+
"eslint-plugin-n>globals": true,
2894+
"eslint-plugin-n>globrex": true,
28602895
"eslint>ignore": true,
2861-
"depcheck>is-core-module": true,
2862-
"eslint>minimatch": true,
2863-
"depcheck>resolve": true,
2864-
"semver": true
2896+
"semver": true,
2897+
"typescript": true
28652898
}
28662899
},
28672900
"eslint-plugin-prettier": {
@@ -2940,21 +2973,11 @@
29402973
"semver": true
29412974
}
29422975
},
2943-
"eslint-plugin-n>eslint-plugin-es>eslint-utils": {
2944-
"packages": {
2945-
"eslint-plugin-n>eslint-plugin-es>eslint-utils>eslint-visitor-keys": true
2946-
}
2947-
},
29482976
"eslint-plugin-mocha>eslint-utils": {
29492977
"packages": {
29502978
"eslint-plugin-mocha>eslint-utils>eslint-visitor-keys": true
29512979
}
29522980
},
2953-
"eslint-plugin-n>eslint-utils": {
2954-
"packages": {
2955-
"eslint-plugin-n>eslint-utils>eslint-visitor-keys": true
2956-
}
2957-
},
29582981
"eslint>espree": {
29592982
"packages": {
29602983
"eslint>espree>acorn-jsx": true,
@@ -3495,6 +3518,29 @@
34953518
"pumpify>pump": true
34963519
}
34973520
},
3521+
"tsx>get-tsconfig": {
3522+
"builtin": {
3523+
"fs": true,
3524+
"node:fs": true,
3525+
"node:module": true,
3526+
"node:path.dirname": true,
3527+
"node:path.isAbsolute": true,
3528+
"node:path.join": true,
3529+
"node:path.posix": true,
3530+
"node:path.relative": true,
3531+
"node:path.resolve": true,
3532+
"os.tmpdir": true,
3533+
"path.join": true
3534+
},
3535+
"globals": {
3536+
"process.cwd": true,
3537+
"process.pid": true,
3538+
"process.platform": true
3539+
},
3540+
"packages": {
3541+
"tsx>get-tsconfig>resolve-pkg-maps": true
3542+
}
3543+
},
34983544
"gulp-watch>anymatch>micromatch>parse-glob>glob-base": {
34993545
"builtin": {
35003546
"path.dirname": true
@@ -3600,6 +3646,11 @@
36003646
"del>slash": true
36013647
}
36023648
},
3649+
"eslint-plugin-n>globrex": {
3650+
"globals": {
3651+
"process.platform": true
3652+
}
3653+
},
36033654
"del>graceful-fs": {
36043655
"builtin": {
36053656
"assert.equal": true,
@@ -7204,6 +7255,11 @@
72047255
"tailwindcss>sucrase": true
72057256
}
72067257
},
7258+
"webpack>tapable": {
7259+
"builtin": {
7260+
"util.deprecate": true
7261+
}
7262+
},
72077263
"terser": {
72087264
"globals": {
72097265
"Buffer": true,

lavamoat/webpack/build/policy-override.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
},
1313
"native": true
1414
},
15+
"copy-webpack-plugin": {
16+
"packages": {
17+
"copy-webpack-plugin>serialize-javascript": true
18+
}
19+
},
20+
"copy-webpack-plugin>serialize-javascript": {
21+
"globals": {
22+
"URL": true
23+
},
24+
"packages": {
25+
"crypto-browserify>randombytes": true
26+
}
27+
},
1528
"@swc/core": {
1629
"packages": {
1730
"@swc/core>@swc/core-darwin-x64": true,

lavamoat/webpack/build/policy.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,9 @@
13361336
"builtin": {
13371337
"module.findPnpApi": true,
13381338
"path.basename": true,
1339+
"path.posix.dirname": true,
13391340
"path.posix.normalize": true,
1341+
"path.win32.dirname": true,
13401342
"path.win32.normalize": true,
13411343
"process.nextTick": true,
13421344
"process.versions.pnp": true,
@@ -1346,6 +1348,7 @@
13461348
"Buffer.isBuffer": true,
13471349
"URL": true,
13481350
"clearTimeout": true,
1351+
"process.cwd": true,
13491352
"setTimeout": true
13501353
},
13511354
"packages": {

0 commit comments

Comments
 (0)