diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md index 0e17c617a802..ae3e5ac5c3fe 100644 --- a/.rebase/CHANGELOG.md +++ b/.rebase/CHANGELOG.md @@ -2,6 +2,16 @@ The file to keep a list of changed files which will potentially help to resolve rebase conflicts. +#### @sbouchet +https://github.com/che-incubator/che-code/pull/796 + +- .rebase/add/code/package.json +- .rebase/add/code/build/npm/gyp/package.json +- .rebase/add/code/extensions/copilot/package.json +- .rebase/add/code/remote/package.json +- .rebase/add/code/test/mcp/package.json +--- + #### @sbouchet https://github.com/che-incubator/che-code/pull/791 diff --git a/.rebase/add/code/build/npm/gyp/package.json b/.rebase/add/code/build/npm/gyp/package.json index 5b48b7687659..2e04dea49f8f 100644 --- a/.rebase/add/code/build/npm/gyp/package.json +++ b/.rebase/add/code/build/npm/gyp/package.json @@ -1,6 +1,6 @@ { "overrides": { - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "brace-expansion@2": "^2.1.4", "tar": "^7.5.22" } diff --git a/.rebase/add/code/extensions/copilot/package.json b/.rebase/add/code/extensions/copilot/package.json index e67508252eb6..9b852ee43ff3 100644 --- a/.rebase/add/code/extensions/copilot/package.json +++ b/.rebase/add/code/extensions/copilot/package.json @@ -2,7 +2,7 @@ "overrides": { "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "brace-expansion@1": "^1.1.18", "brace-expansion@2": "^2.1.4", diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json index f010e2bb3598..d9c67873d844 100644 --- a/.rebase/add/code/package.json +++ b/.rebase/add/code/package.json @@ -14,7 +14,7 @@ "flatted": "^3.4.2", "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "brace-expansion@1": "^1.1.18", "brace-expansion@2": "^2.1.4", "test-exclude": { diff --git a/.rebase/add/code/remote/package.json b/.rebase/add/code/remote/package.json index 5bc4d51d67f4..eaa34e9f96c5 100644 --- a/.rebase/add/code/remote/package.json +++ b/.rebase/add/code/remote/package.json @@ -4,7 +4,7 @@ }, "overrides": { "shell-quote": "^1.8.4", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "undici": "^7.28.0", "@types/node-fetch": { "form-data": "^4.0.6" diff --git a/.rebase/add/code/test/mcp/package.json b/.rebase/add/code/test/mcp/package.json index c9abbd654ad0..955f0de7b971 100644 --- a/.rebase/add/code/test/mcp/package.json +++ b/.rebase/add/code/test/mcp/package.json @@ -2,7 +2,7 @@ "overrides": { "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "@types/node-fetch": { "form-data": "^4.0.6" } diff --git a/code/build/npm/gyp/package-lock.json b/code/build/npm/gyp/package-lock.json index 89cdc780e5bd..df17d7759027 100644 --- a/code/build/npm/gyp/package-lock.json +++ b/code/build/npm/gyp/package-lock.json @@ -438,9 +438,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "dev": true, "license": "MIT", "engines": { diff --git a/code/build/npm/gyp/package.json b/code/build/npm/gyp/package.json index 13db14d8dc77..88d80fafbefa 100644 --- a/code/build/npm/gyp/package.json +++ b/code/build/npm/gyp/package.json @@ -7,7 +7,7 @@ "node-gyp": "^11.2.0" }, "overrides": { - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "brace-expansion@2": "^2.1.4", "tar": "^7.5.22" }, diff --git a/code/extensions/che-api/package-lock.json b/code/extensions/che-api/package-lock.json index cdfc7f943681..0951dd0fafc6 100644 --- a/code/extensions/che-api/package-lock.json +++ b/code/extensions/che-api/package-lock.json @@ -2543,9 +2543,9 @@ "integrity": "sha512-i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA==" }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/extensions/che-api/package.json b/code/extensions/che-api/package.json index effad2bf3bdb..05460da13783 100644 --- a/code/extensions/che-api/package.json +++ b/code/extensions/che-api/package.json @@ -55,7 +55,7 @@ "axios": "^0.32.0" }, "follow-redirects": "^1.16.0", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "@devfile/api": { "form-data@2": "^2.5.6" diff --git a/code/extensions/che-commands/package-lock.json b/code/extensions/che-commands/package-lock.json index 2af589bb34f7..c75b48c6c041 100644 --- a/code/extensions/che-commands/package-lock.json +++ b/code/extensions/che-commands/package-lock.json @@ -565,9 +565,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/extensions/che-commands/package.json b/code/extensions/che-commands/package.json index 2a08627f3e56..416f7d7da37e 100644 --- a/code/extensions/che-commands/package.json +++ b/code/extensions/che-commands/package.json @@ -43,7 +43,7 @@ "@types/node": "22.x" }, "overrides": { - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "@devfile/api": { "form-data@2": "^2.5.6" diff --git a/code/extensions/che-github-authentication/package-lock.json b/code/extensions/che-github-authentication/package-lock.json index 20d35a49d1cd..6be226f8bd86 100644 --- a/code/extensions/che-github-authentication/package-lock.json +++ b/code/extensions/che-github-authentication/package-lock.json @@ -924,9 +924,9 @@ "integrity": "sha512-i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA==" }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/extensions/che-github-authentication/package.json b/code/extensions/che-github-authentication/package.json index 81bf5d94189e..801e4745c923 100644 --- a/code/extensions/che-github-authentication/package.json +++ b/code/extensions/che-github-authentication/package.json @@ -65,7 +65,7 @@ "@types/uuid": "8.0.0" }, "overrides": { - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "@devfile/api": { "form-data@2": "^2.5.6" diff --git a/code/extensions/che-resource-monitor/package-lock.json b/code/extensions/che-resource-monitor/package-lock.json index 7c76c928173b..a3e7abdd25d5 100644 --- a/code/extensions/che-resource-monitor/package-lock.json +++ b/code/extensions/che-resource-monitor/package-lock.json @@ -2514,9 +2514,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/extensions/che-resource-monitor/package.json b/code/extensions/che-resource-monitor/package.json index 5bf35269cf5c..0352e97d1146 100644 --- a/code/extensions/che-resource-monitor/package.json +++ b/code/extensions/che-resource-monitor/package.json @@ -49,7 +49,7 @@ "overrides": { "minimatch": "^3.1.5", "handlebars": "4.7.9", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "@devfile/api": { "form-data@2": "^2.5.6" diff --git a/code/extensions/copilot/package-lock.json b/code/extensions/copilot/package-lock.json index e2a9fdda6ccd..375ca194b7e1 100644 --- a/code/extensions/copilot/package-lock.json +++ b/code/extensions/copilot/package-lock.json @@ -10827,9 +10827,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/extensions/copilot/package.json b/code/extensions/copilot/package.json index c06e490d96e8..53a3213811e6 100644 --- a/code/extensions/copilot/package.json +++ b/code/extensions/copilot/package.json @@ -7250,7 +7250,7 @@ "zod": "3.25.76", "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "brace-expansion@1": "^1.1.18", "brace-expansion@2": "^2.1.4", diff --git a/code/package-lock.json b/code/package-lock.json index a9ed1aeaf3e1..8abcfa20394a 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -11159,9 +11159,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/package.json b/code/package.json index cd5582df76cf..3b2df582bee6 100644 --- a/code/package.json +++ b/code/package.json @@ -289,7 +289,7 @@ "flatted": "^3.4.2", "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "brace-expansion@1": "^1.1.18", "brace-expansion@2": "^2.1.4", "test-exclude": { diff --git a/code/remote/package-lock.json b/code/remote/package-lock.json index 207bdb8846ca..a65bde3485d5 100644 --- a/code/remote/package-lock.json +++ b/code/remote/package-lock.json @@ -1617,9 +1617,9 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/remote/package.json b/code/remote/package.json index f0a8ac9d8e6e..aecfddd2dbcb 100644 --- a/code/remote/package.json +++ b/code/remote/package.json @@ -64,7 +64,7 @@ }, "yauzl": "^3.3.1", "shell-quote": "^1.8.4", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "undici": "^7.28.0", "@types/node-fetch": { "form-data": "^4.0.6" diff --git a/code/test/mcp/package-lock.json b/code/test/mcp/package-lock.json index 01b614f675f4..253f7a425ac4 100644 --- a/code/test/mcp/package-lock.json +++ b/code/test/mcp/package-lock.json @@ -753,9 +753,9 @@ "license": "ISC" }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/code/test/mcp/package.json b/code/test/mcp/package.json index 4dc20d70308e..bd531a49d403 100644 --- a/code/test/mcp/package.json +++ b/code/test/mcp/package.json @@ -26,7 +26,7 @@ "overrides": { "shell-quote": "^1.8.4", "qs": "6.15.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "@types/node-fetch": { "form-data": "^4.0.6" } diff --git a/launcher/package-lock.json b/launcher/package-lock.json index 8c1d54b0b810..49dd29730835 100644 --- a/launcher/package-lock.json +++ b/launcher/package-lock.json @@ -3121,9 +3121,9 @@ "dev": true }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.5.0.tgz", + "integrity": "sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==", "license": "MIT", "engines": { "node": ">= 12" diff --git a/launcher/package.json b/launcher/package.json index c7685ddb9410..e0ada1bd8e7c 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -55,7 +55,7 @@ "minimatch": "^3.1.5", "handlebars": "4.7.9", "flatted": "^3.4.2", - "ip-address": "^10.2.0", + "ip-address": "^10.3.1", "ws": "^8.21.0", "@types/node-fetch": { "form-data": "^4.0.6"