From 4924f453f029d10e92c2b7d03fe15547fcaa4c27 Mon Sep 17 00:00:00 2001 From: Stephane Bouchet Date: Fri, 6 Mar 2026 16:08:50 +0100 Subject: [PATCH 1/5] bump minimatch to patched versions fixes: - CVE-2026-27904 - CVE-2026-26996 - CVE-2026-27903 Signed-off-by: Stephane Bouchet --- code/build/npm/gyp/package-lock.json | 14 +- code/build/npm/gyp/package.json | 3 +- code/build/package-lock.json | 16 +- code/build/package.json | 8 +- code/extensions/che-api/package-lock.json | 6 +- code/extensions/che-api/package.json | 3 + code/extensions/che-port/package-lock.json | 6 +- code/extensions/che-port/package.json | 3 +- code/extensions/che-remote/package-lock.json | 7 +- code/extensions/che-remote/package.json | 3 +- .../che-resource-monitor/package-lock.json | 6 +- .../che-resource-monitor/package.json | 3 + .../css-language-features/package-lock.json | 35 +-- .../css-language-features/package.json | 3 + .../html-language-features/package-lock.json | 34 +-- .../html-language-features/package.json | 3 + .../json-language-features/package-lock.json | 34 +-- .../json-language-features/package.json | 3 + .../package-lock.json | 7 +- .../markdown-language-features/package.json | 3 + code/extensions/npm/package-lock.json | 9 +- code/extensions/npm/package.json | 2 +- code/package-lock.json | 224 ++++++++++++++++-- code/package.json | 19 +- code/test/automation/package-lock.json | 7 +- code/test/automation/package.json | 3 +- .../integration/browser/package-lock.json | 7 +- code/test/integration/browser/package.json | 3 + code/test/mcp/package-lock.json | 6 +- code/test/mcp/package.json | 3 +- code/test/smoke/package-lock.json | 7 +- code/test/smoke/package.json | 3 +- launcher/package-lock.json | 7 +- launcher/package.json | 3 +- 34 files changed, 379 insertions(+), 124 deletions(-) diff --git a/code/build/npm/gyp/package-lock.json b/code/build/npm/gyp/package-lock.json index 8b384216bca..9ad9f77e8a4 100644 --- a/code/build/npm/gyp/package-lock.json +++ b/code/build/npm/gyp/package-lock.json @@ -138,9 +138,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -525,13 +525,13 @@ } }, "node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" diff --git a/code/build/npm/gyp/package.json b/code/build/npm/gyp/package.json index 843029ceae1..36768779e81 100644 --- a/code/build/npm/gyp/package.json +++ b/code/build/npm/gyp/package.json @@ -8,7 +8,8 @@ }, "overrides": { "glob": "10.5.0", - "tar": "^7.5.8" + "tar": "^7.5.8", + "minimatch": "^9.0.9" }, "scripts": {} } diff --git a/code/build/package-lock.json b/code/build/package-lock.json index 6ae866508d2..817f529c49d 100644 --- a/code/build/package-lock.json +++ b/code/build/package-lock.json @@ -3381,10 +3381,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4658,12 +4659,13 @@ } }, "node_modules/vscode-universal-bundler/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, + "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" diff --git a/code/build/package.json b/code/build/package.json index f7b9a427e65..ed83e3c7fa2 100644 --- a/code/build/package.json +++ b/code/build/package.json @@ -80,6 +80,12 @@ "jws": "^3.2.3" }, "qs": "6.14.1", - "lodash": "^4.17.23" + "lodash": "^4.17.23", + "@vscode/vsce": { + "minimatch": "^3.1.5" + }, + "vscode-universal-bundler": { + "minimatch": "^9.0.9" + } } } diff --git a/code/extensions/che-api/package-lock.json b/code/extensions/che-api/package-lock.json index a868cc0ef38..f302a8b275f 100644 --- a/code/extensions/che-api/package-lock.json +++ b/code/extensions/che-api/package-lock.json @@ -3574,9 +3574,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { diff --git a/code/extensions/che-api/package.json b/code/extensions/che-api/package.json index 4b785ed7247..9471c8e9773 100644 --- a/code/extensions/che-api/package.json +++ b/code/extensions/che-api/package.json @@ -50,6 +50,9 @@ "ts-jest": "29.4.5", "webpack-node-externals": "^3.0.0" }, + "overrides": { + "minimatch": "^3.1.5" + }, "repository": { "type": "git", "url": "https://github.com/che-incubator/che-code.git" diff --git a/code/extensions/che-port/package-lock.json b/code/extensions/che-port/package-lock.json index c08f66da918..7f409d325ed 100644 --- a/code/extensions/che-port/package-lock.json +++ b/code/extensions/che-port/package-lock.json @@ -3199,9 +3199,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { diff --git a/code/extensions/che-port/package.json b/code/extensions/che-port/package.json index ec375d5bb3e..838437991ad 100644 --- a/code/extensions/che-port/package.json +++ b/code/extensions/che-port/package.json @@ -53,7 +53,8 @@ }, "jsdom": { "form-data": "3.0.4" - } + }, + "minimatch": "^3.1.5" }, "repository": { "type": "git", diff --git a/code/extensions/che-remote/package-lock.json b/code/extensions/che-remote/package-lock.json index 8190f42e51a..e68219d9a5f 100644 --- a/code/extensions/che-remote/package-lock.json +++ b/code/extensions/che-remote/package-lock.json @@ -3995,10 +3995,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index ac6a7be989a..64c551df1e1 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -58,7 +58,8 @@ "form-data": "3.0.4" }, "lodash": "^4.17.23", - "ajv": "6.14.0" + "ajv": "6.14.0", + "minimatch": "^3.1.5" }, "repository": { "type": "git", diff --git a/code/extensions/che-resource-monitor/package-lock.json b/code/extensions/che-resource-monitor/package-lock.json index f9a316112d9..f22cdc6c6c0 100644 --- a/code/extensions/che-resource-monitor/package-lock.json +++ b/code/extensions/che-resource-monitor/package-lock.json @@ -3537,9 +3537,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { diff --git a/code/extensions/che-resource-monitor/package.json b/code/extensions/che-resource-monitor/package.json index 414ca4d21f7..aba7d25097f 100644 --- a/code/extensions/che-resource-monitor/package.json +++ b/code/extensions/che-resource-monitor/package.json @@ -46,6 +46,9 @@ "typescript": "^5.9.2", "ts-jest": "29.4.5" }, + "overrides": { + "minimatch": "^3.1.5" + }, "repository": { "type": "git", "url": "https://github.com/che-incubator/che-code.git" diff --git a/code/extensions/css-language-features/package-lock.json b/code/extensions/css-language-features/package-lock.json index dcd8acd1aab..cb94a6ba87d 100644 --- a/code/extensions/css-language-features/package-lock.json +++ b/code/extensions/css-language-features/package-lock.json @@ -30,29 +30,36 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "license": "MIT" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "license": "ISC", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/code/extensions/css-language-features/package.json b/code/extensions/css-language-features/package.json index cd46d998e65..f4a80bb6da3 100644 --- a/code/extensions/css-language-features/package.json +++ b/code/extensions/css-language-features/package.json @@ -1000,6 +1000,9 @@ "devDependencies": { "@types/node": "22.x" }, + "overrides": { + "minimatch": "^10.2.4" + }, "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" diff --git a/code/extensions/html-language-features/package-lock.json b/code/extensions/html-language-features/package-lock.json index b30e18f8c65..892846c29dd 100644 --- a/code/extensions/html-language-features/package-lock.json +++ b/code/extensions/html-language-features/package-lock.json @@ -169,30 +169,36 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "license": "MIT" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "license": "ISC", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/code/extensions/html-language-features/package.json b/code/extensions/html-language-features/package.json index 4380032fada..42ea155332b 100644 --- a/code/extensions/html-language-features/package.json +++ b/code/extensions/html-language-features/package.json @@ -265,6 +265,9 @@ "devDependencies": { "@types/node": "22.x" }, + "overrides": { + "minimatch": "^10.2.4" + }, "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" diff --git a/code/extensions/json-language-features/package-lock.json b/code/extensions/json-language-features/package-lock.json index 11c7b3a7a91..d6c43a49007 100644 --- a/code/extensions/json-language-features/package-lock.json +++ b/code/extensions/json-language-features/package-lock.json @@ -169,30 +169,36 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "license": "MIT" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "license": "ISC", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/code/extensions/json-language-features/package.json b/code/extensions/json-language-features/package.json index 322e508b93e..167f389d021 100644 --- a/code/extensions/json-language-features/package.json +++ b/code/extensions/json-language-features/package.json @@ -176,6 +176,9 @@ "devDependencies": { "@types/node": "22.x" }, + "overrides": { + "minimatch": "^10.2.4" + }, "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" diff --git a/code/extensions/markdown-language-features/package-lock.json b/code/extensions/markdown-language-features/package-lock.json index d8169c35e67..a4ccc11e6cb 100644 --- a/code/extensions/markdown-language-features/package-lock.json +++ b/code/extensions/markdown-language-features/package-lock.json @@ -500,9 +500,10 @@ "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/code/extensions/markdown-language-features/package.json b/code/extensions/markdown-language-features/package.json index 922fe087af5..8693fdd413e 100644 --- a/code/extensions/markdown-language-features/package.json +++ b/code/extensions/markdown-language-features/package.json @@ -791,6 +791,9 @@ "vscode-languageserver-types": "^3.17.2", "vscode-markdown-languageservice": "^0.3.0-alpha.3" }, + "overrides": { + "minimatch": "^3.1.5" + }, "repository": { "type": "git", "url": "https://github.com/microsoft/vscode.git" diff --git a/code/extensions/npm/package-lock.json b/code/extensions/npm/package-lock.json index 352ee31ae9f..4fe07503d0f 100644 --- a/code/extensions/npm/package-lock.json +++ b/code/extensions/npm/package-lock.json @@ -12,7 +12,7 @@ "find-up": "^5.0.0", "find-yarn-workspace-root": "^2.0.0", "jsonc-parser": "^3.2.0", - "minimatch": "^5.1.6", + "minimatch": "^5.1.9", "request-light": "^0.7.0", "vscode-uri": "^3.0.8", "which": "^4.0.0", @@ -208,9 +208,10 @@ } }, "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, diff --git a/code/extensions/npm/package.json b/code/extensions/npm/package.json index 9a67c3a83ec..bbe4bd0aeff 100644 --- a/code/extensions/npm/package.json +++ b/code/extensions/npm/package.json @@ -24,7 +24,7 @@ "find-up": "^5.0.0", "find-yarn-workspace-root": "^2.0.0", "jsonc-parser": "^3.2.0", - "minimatch": "^5.1.6", + "minimatch": "^5.1.9", "request-light": "^0.7.0", "which": "^4.0.0", "which-pm": "^2.1.1", diff --git a/code/package-lock.json b/code/package-lock.json index 06d57dc5ee1..137c3cbf4bb 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -139,7 +139,7 @@ "lazy.js": "^0.4.2", "merge-options": "^1.0.1", "mime": "^1.4.1", - "minimatch": "^3.0.5", + "minimatch": "^3.1.5", "mocha": "^10.8.2", "mocha-junit-reporter": "^2.2.1", "mocha-multi-reporters": "^1.5.1", @@ -2143,12 +2143,13 @@ } }, "node_modules/@ts-morph/common/node_modules/minimatch": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "version": "7.4.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.9.tgz", + "integrity": "sha512-Brg/fp/iAVDOQoHxkuN5bEYhyQlZhxddI78yWsCbeEwTHXQjlNLtiJDUsp1GIptVqMI7/gkJMz4vVAc01mpoBw==", "dev": true, + "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=10" @@ -2726,13 +2727,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3291,9 +3292,9 @@ } }, "node_modules/@vscode/l10n-dev/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", "dev": true, "license": "ISC", "dependencies": { @@ -3506,6 +3507,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@vscode/test-cli/node_modules/glob/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@vscode/test-cli/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3517,13 +3531,13 @@ } }, "node_modules/@vscode/test-cli/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3585,6 +3599,19 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/@vscode/test-cli/node_modules/mocha/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@vscode/test-cli/node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -4576,6 +4603,16 @@ "@types/glob": "^7.1.1" } }, + "node_modules/asar/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/asar/node_modules/commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", @@ -4606,6 +4643,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/asar/node_modules/glob/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -8149,6 +8199,16 @@ "node": ">= 0.10" } }, + "node_modules/glob-stream/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/glob-stream/node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -8192,6 +8252,19 @@ "node": ">=0.10.0" } }, + "node_modules/glob-stream/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/glob-stream/node_modules/readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -8367,6 +8440,29 @@ "node": ">=0.10" } }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/global-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", @@ -10945,6 +11041,16 @@ "js-beautify": "js/bin/js-beautify.js" } }, + "node_modules/js-beautify/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/js-beautify/node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -10966,6 +11072,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/js-beautify/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/js-beautify/node_modules/mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -12136,9 +12255,9 @@ } }, "node_modules/mocha/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", "dev": true, "license": "ISC", "dependencies": { @@ -14441,6 +14560,16 @@ "rimraf": "bin.js" } }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/rimraf/node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -14462,6 +14591,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/roarr": { "version": "2.15.4", "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", @@ -15762,15 +15904,28 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "node_modules/test-exclude/node_modules/glob/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, + "engines": { + "node": ">=10" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, "engines": { "node": ">=16 || 14 >=14.17" }, @@ -16182,6 +16337,16 @@ "typescript": ">=3.9.2" } }, + "node_modules/tsec/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/tsec/node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -16203,6 +16368,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/tsec/node_modules/glob/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", diff --git a/code/package.json b/code/package.json index 37a3d89ff3e..c48c79ecedf 100644 --- a/code/package.json +++ b/code/package.json @@ -194,7 +194,7 @@ "lazy.js": "^0.4.2", "merge-options": "^1.0.1", "mime": "^1.4.1", - "minimatch": "^3.0.5", + "minimatch": "^3.1.5", "mocha": "^10.8.2", "mocha-junit-reporter": "^2.2.1", "mocha-multi-reporters": "^1.5.1", @@ -262,7 +262,22 @@ "ajv": "^8.18.0" }, "tar": "^7.5.8", - "lodash": "^4.17.23" + "lodash": "^4.17.23", + "mocha": { + "minimatch": "^5.1.9" + }, + "@vscode/test-cli": { + "minimatch": "^9.0.9" + }, + "@ts-morph/common": { + "minimatch": "^7.4.9" + }, + "glob": { + "minimatch": "^5.1.9" + }, + "@typescript-eslint/typescript-estree": { + "minimatch": "^9.0.9" + } }, "repository": { "type": "git", diff --git a/code/test/automation/package-lock.json b/code/test/automation/package-lock.json index 1e729fa7a27..b87cb108fc2 100644 --- a/code/test/automation/package-lock.json +++ b/code/test/automation/package-lock.json @@ -720,10 +720,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/code/test/automation/package.json b/code/test/automation/package.json index 311743aa9e9..b2542fe95c6 100644 --- a/code/test/automation/package.json +++ b/code/test/automation/package.json @@ -34,6 +34,7 @@ "overrides": { "npm-run-all": { "cross-spawn": "7.0.6" - } + }, + "minimatch": "^3.1.5" } } diff --git a/code/test/integration/browser/package-lock.json b/code/test/integration/browser/package-lock.json index 5d6ce3dc57e..36ae92e756c 100644 --- a/code/test/integration/browser/package-lock.json +++ b/code/test/integration/browser/package-lock.json @@ -134,10 +134,11 @@ "dev": true }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/code/test/integration/browser/package.json b/code/test/integration/browser/package.json index b69cf976c68..900db2b005a 100644 --- a/code/test/integration/browser/package.json +++ b/code/test/integration/browser/package.json @@ -14,5 +14,8 @@ "tmp": "0.2.4", "tree-kill": "1.2.2", "vscode-uri": "^3.0.2" + }, + "overrides": { + "minimatch": "^3.1.5" } } diff --git a/code/test/mcp/package-lock.json b/code/test/mcp/package-lock.json index d2f7126a468..2db151830dd 100644 --- a/code/test/mcp/package-lock.json +++ b/code/test/mcp/package-lock.json @@ -1863,9 +1863,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { diff --git a/code/test/mcp/package.json b/code/test/mcp/package.json index 3cf59a067c4..6a4ce3a25bf 100644 --- a/code/test/mcp/package.json +++ b/code/test/mcp/package.json @@ -30,6 +30,7 @@ }, "overrides": { "qs": "6.14.1", - "ajv": "6.14.0" + "ajv": "6.14.0", + "minimatch": "^3.1.5" } } diff --git a/code/test/smoke/package-lock.json b/code/test/smoke/package-lock.json index cc4af3e1220..8951f5c6849 100644 --- a/code/test/smoke/package-lock.json +++ b/code/test/smoke/package-lock.json @@ -460,10 +460,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/code/test/smoke/package.json b/code/test/smoke/package.json index 6e3c17d02ca..6a88cb0c700 100644 --- a/code/test/smoke/package.json +++ b/code/test/smoke/package.json @@ -23,6 +23,7 @@ "overrides": { "npm-run-all": { "cross-spawn": "7.0.6" - } + }, + "minimatch": "^3.1.5" } } diff --git a/launcher/package-lock.json b/launcher/package-lock.json index ccb99e26318..0735288b52e 100644 --- a/launcher/package-lock.json +++ b/launcher/package-lock.json @@ -4184,10 +4184,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, diff --git a/launcher/package.json b/launcher/package.json index 86cddf30fbf..ab2dab5ed0a 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -51,7 +51,8 @@ "table": { "ajv": "^8.18.0" }, - "ajv": "6.14.0" + "ajv": "6.14.0", + "minimatch": "^3.1.5" }, "jest": { "collectCoverage": true, From 139dc9748624d603ac99f7d7f3f2ad34479e0b41 Mon Sep 17 00:00:00 2001 From: Stephane Bouchet Date: Mon, 9 Mar 2026 15:42:39 +0100 Subject: [PATCH 2/5] chore: Add rebasing rules for minimatch related changes Co-Authored-By: Claude Opus 4.6 --- .rebase/add/code/build/npm/gyp/package.json | 3 ++- .rebase/add/code/build/package.json | 8 +++++++- .../css-language-features/package.json | 5 +++++ .../html-language-features/package.json | 5 +++++ .../json-language-features/package.json | 5 +++++ .../markdown-language-features/package.json | 5 +++++ .rebase/add/code/package.json | 17 ++++++++++++++++- .rebase/add/code/test/automation/package.json | 5 +++++ .../code/test/integration/browser/package.json | 5 +++++ .rebase/add/code/test/mcp/package.json | 3 ++- .rebase/add/code/test/smoke/package.json | 5 +++++ .../override/code/extensions/npm/package.json | 5 +++++ .rebase/override/code/package.json | 2 +- rebase.sh | 16 ++++++++++++++++ 14 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 .rebase/add/code/extensions/css-language-features/package.json create mode 100644 .rebase/add/code/extensions/html-language-features/package.json create mode 100644 .rebase/add/code/extensions/json-language-features/package.json create mode 100644 .rebase/add/code/extensions/markdown-language-features/package.json create mode 100644 .rebase/add/code/test/automation/package.json create mode 100644 .rebase/add/code/test/integration/browser/package.json create mode 100644 .rebase/add/code/test/smoke/package.json create mode 100644 .rebase/override/code/extensions/npm/package.json diff --git a/.rebase/add/code/build/npm/gyp/package.json b/.rebase/add/code/build/npm/gyp/package.json index 59e487c2cd0..68f8075941f 100644 --- a/.rebase/add/code/build/npm/gyp/package.json +++ b/.rebase/add/code/build/npm/gyp/package.json @@ -1,6 +1,7 @@ { "overrides": { "glob": "10.5.0", - "tar": "^7.5.8" + "tar": "^7.5.8", + "minimatch": "^9.0.9" } } diff --git a/.rebase/add/code/build/package.json b/.rebase/add/code/build/package.json index 68d4c14f92e..d04d61b2c66 100644 --- a/.rebase/add/code/build/package.json +++ b/.rebase/add/code/build/package.json @@ -7,6 +7,12 @@ "jws": "^3.2.3" }, "qs": "6.14.1", - "lodash": "^4.17.23" + "lodash": "^4.17.23", + "@vscode/vsce": { + "minimatch": "^3.1.5" + }, + "vscode-universal-bundler": { + "minimatch": "^9.0.9" + } } } diff --git a/.rebase/add/code/extensions/css-language-features/package.json b/.rebase/add/code/extensions/css-language-features/package.json new file mode 100644 index 00000000000..e15aba875bb --- /dev/null +++ b/.rebase/add/code/extensions/css-language-features/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^10.2.4" + } +} diff --git a/.rebase/add/code/extensions/html-language-features/package.json b/.rebase/add/code/extensions/html-language-features/package.json new file mode 100644 index 00000000000..e15aba875bb --- /dev/null +++ b/.rebase/add/code/extensions/html-language-features/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^10.2.4" + } +} diff --git a/.rebase/add/code/extensions/json-language-features/package.json b/.rebase/add/code/extensions/json-language-features/package.json new file mode 100644 index 00000000000..e15aba875bb --- /dev/null +++ b/.rebase/add/code/extensions/json-language-features/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^10.2.4" + } +} diff --git a/.rebase/add/code/extensions/markdown-language-features/package.json b/.rebase/add/code/extensions/markdown-language-features/package.json new file mode 100644 index 00000000000..a37c17e0033 --- /dev/null +++ b/.rebase/add/code/extensions/markdown-language-features/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^3.1.5" + } +} diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json index 3c3c140cfb9..902448c5786 100644 --- a/.rebase/add/code/package.json +++ b/.rebase/add/code/package.json @@ -40,6 +40,21 @@ "schema-utils": { "ajv": "^8.18.0" }, - "tar": "^7.5.8" + "tar": "^7.5.8", + "mocha": { + "minimatch": "^5.1.9" + }, + "@vscode/test-cli": { + "minimatch": "^9.0.9" + }, + "@ts-morph/common": { + "minimatch": "^7.4.9" + }, + "glob": { + "minimatch": "^5.1.9" + }, + "@typescript-eslint/typescript-estree": { + "minimatch": "^9.0.9" + } } } diff --git a/.rebase/add/code/test/automation/package.json b/.rebase/add/code/test/automation/package.json new file mode 100644 index 00000000000..a37c17e0033 --- /dev/null +++ b/.rebase/add/code/test/automation/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^3.1.5" + } +} diff --git a/.rebase/add/code/test/integration/browser/package.json b/.rebase/add/code/test/integration/browser/package.json new file mode 100644 index 00000000000..a37c17e0033 --- /dev/null +++ b/.rebase/add/code/test/integration/browser/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^3.1.5" + } +} diff --git a/.rebase/add/code/test/mcp/package.json b/.rebase/add/code/test/mcp/package.json index 57ad10824b6..17bc7c3cc6c 100644 --- a/.rebase/add/code/test/mcp/package.json +++ b/.rebase/add/code/test/mcp/package.json @@ -1,6 +1,7 @@ { "overrides": { "qs": "6.14.1", - "ajv": "6.14.0" + "ajv": "6.14.0", + "minimatch": "^3.1.5" } } diff --git a/.rebase/add/code/test/smoke/package.json b/.rebase/add/code/test/smoke/package.json new file mode 100644 index 00000000000..a37c17e0033 --- /dev/null +++ b/.rebase/add/code/test/smoke/package.json @@ -0,0 +1,5 @@ +{ + "overrides": { + "minimatch": "^3.1.5" + } +} diff --git a/.rebase/override/code/extensions/npm/package.json b/.rebase/override/code/extensions/npm/package.json new file mode 100644 index 00000000000..91020bdbd37 --- /dev/null +++ b/.rebase/override/code/extensions/npm/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "minimatch": "^5.1.9" + } +} diff --git a/.rebase/override/code/package.json b/.rebase/override/code/package.json index da4e79a3f82..7213e09b8ca 100644 --- a/.rebase/override/code/package.json +++ b/.rebase/override/code/package.json @@ -5,7 +5,7 @@ "@vscode/l10n-dev": "0.0.18", "@vscode/test-cli": "^0.0.12", "@vscode/test-web": "^0.0.77", - "minimatch": "^3.0.5", + "minimatch": "^3.1.5", "eslint": "^9.39.3" } } \ No newline at end of file diff --git a/rebase.sh b/rebase.sh index 47e99b38321..6f5d71f9104 100755 --- a/rebase.sh +++ b/rebase.sh @@ -537,6 +537,22 @@ resolve_conflicts() { apply_multi_line_replace "$conflictingFile" elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts" ]]; then apply_multi_line_replace "$conflictingFile" + elif [[ "$conflictingFile" == "code/extensions/css-language-features/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/extensions/html-language-features/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/extensions/json-language-features/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/extensions/markdown-language-features/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/extensions/npm/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/test/automation/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/test/integration/browser/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" + elif [[ "$conflictingFile" == "code/test/smoke/package.json" ]]; then + apply_package_changes_by_path "$conflictingFile" elif [[ "$conflictingFile" == "code/build/gulpfile.cli.js" ]]; then apply_changes_multi_line "$conflictingFile" elif [[ "$conflictingFile" == "code/build/gulpfile.reh.js" ]]; then From dca232860d798eee84d71328c6eb8263939b06ca Mon Sep 17 00:00:00 2001 From: Stephane Bouchet Date: Mon, 9 Mar 2026 16:05:55 +0100 Subject: [PATCH 3/5] updated changelog Signed-off-by: Stephane Bouchet --- .rebase/CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md index 1d8b786fca6..4277930e545 100644 --- a/.rebase/CHANGELOG.md +++ b/.rebase/CHANGELOG.md @@ -2,6 +2,24 @@ The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts. + +#### @sbouchet +https://github.com/che-incubator/che-code/pull/659 + +- code/package.json +- code/build/package.json +- code/build/npm/gyp/package.json +- code/extensions/css-language-features/package.json +- code/extensions/html-language-features/package.json +- code/extensions/json-language-features/package.json +- code/extensions/markdown-language-features/package.json +- code/extensions/npm/package.json +- code/test/mcp/package.json +- code/test/automation/package.json +- code/test/integration/browser/package.json +- code/test/smoke/package.json +--- + #### @RomanNikitenko https://github.com/che-incubator/che-code/pull/655 From 3caa8d5cb3772b012e183c1ba8911d0f231f2e09 Mon Sep 17 00:00:00 2001 From: Stephane Bouchet Date: Wed, 11 Mar 2026 12:56:16 +0100 Subject: [PATCH 4/5] fix minimatch versions Signed-off-by: Stephane Bouchet --- .rebase/add/code/package.json | 13 ++- code/package-lock.json | 177 ---------------------------------- code/package.json | 13 ++- 3 files changed, 18 insertions(+), 185 deletions(-) diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json index 902448c5786..e6abff4148c 100644 --- a/.rebase/add/code/package.json +++ b/.rebase/add/code/package.json @@ -41,20 +41,25 @@ "ajv": "^8.18.0" }, "tar": "^7.5.8", - "mocha": { - "minimatch": "^5.1.9" - }, "@vscode/test-cli": { "minimatch": "^9.0.9" }, "@ts-morph/common": { "minimatch": "^7.4.9" }, - "glob": { + "@vscode/l10n-dev": { "minimatch": "^5.1.9" }, + "tsec": { + "minimatch": "^3.1.5" + }, "@typescript-eslint/typescript-estree": { "minimatch": "^9.0.9" + }, + "mocha": { + "glob": { + "minimatch": "^5.1.9" + } } } } diff --git a/code/package-lock.json b/code/package-lock.json index 137c3cbf4bb..1fab73de11b 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -3507,19 +3507,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@vscode/test-cli/node_modules/glob/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@vscode/test-cli/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3599,19 +3586,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@vscode/test-cli/node_modules/mocha/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@vscode/test-cli/node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -4603,16 +4577,6 @@ "@types/glob": "^7.1.1" } }, - "node_modules/asar/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/asar/node_modules/commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", @@ -4643,19 +4607,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/asar/node_modules/glob/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -8199,16 +8150,6 @@ "node": ">= 0.10" } }, - "node_modules/glob-stream/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/glob-stream/node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -8252,19 +8193,6 @@ "node": ">=0.10.0" } }, - "node_modules/glob-stream/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/glob-stream/node_modules/readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -8440,29 +8368,6 @@ "node": ">=0.10" } }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/global-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", @@ -11041,16 +10946,6 @@ "js-beautify": "js/bin/js-beautify.js" } }, - "node_modules/js-beautify/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/js-beautify/node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -11072,19 +10967,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/js-beautify/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/js-beautify/node_modules/mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -14560,16 +14442,6 @@ "rimraf": "bin.js" } }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/rimraf/node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -14591,19 +14463,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/roarr": { "version": "2.15.4", "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", @@ -15904,19 +15763,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/test-exclude/node_modules/glob/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/test-exclude/node_modules/minimatch": { "version": "9.0.9", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", @@ -16337,16 +16183,6 @@ "typescript": ">=3.9.2" } }, - "node_modules/tsec/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/tsec/node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -16368,19 +16204,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/tsec/node_modules/glob/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", diff --git a/code/package.json b/code/package.json index c48c79ecedf..40553fc309d 100644 --- a/code/package.json +++ b/code/package.json @@ -263,20 +263,25 @@ }, "tar": "^7.5.8", "lodash": "^4.17.23", - "mocha": { - "minimatch": "^5.1.9" - }, "@vscode/test-cli": { "minimatch": "^9.0.9" }, "@ts-morph/common": { "minimatch": "^7.4.9" }, - "glob": { + "@vscode/l10n-dev": { "minimatch": "^5.1.9" }, + "tsec": { + "minimatch": "^3.1.5" + }, "@typescript-eslint/typescript-estree": { "minimatch": "^9.0.9" + }, + "mocha": { + "glob": { + "minimatch": "^5.1.9" + } } }, "repository": { From 8183c9af83da1d2136c5496cec424fa93b905f4e Mon Sep 17 00:00:00 2001 From: Stephane Bouchet Date: Thu, 19 Mar 2026 14:45:00 +0100 Subject: [PATCH 5/5] fix leftover merge result Signed-off-by: Stephane Bouchet --- .rebase/add/code/build/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.rebase/add/code/build/package.json b/.rebase/add/code/build/package.json index 9582b2abcf8..4524040f5ec 100644 --- a/.rebase/add/code/build/package.json +++ b/.rebase/add/code/build/package.json @@ -8,15 +8,12 @@ }, "qs": "6.14.1", "lodash": "^4.17.23", -<<<<<<< CVE-2026-27904 "@vscode/vsce": { "minimatch": "^3.1.5" }, "vscode-universal-bundler": { "minimatch": "^9.0.9" - } -======= + }, "fast-xml-parser": "^4.5.4" ->>>>>>> main } }