Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE-THIRD-PARTY
Original file line number Diff line number Diff line change
Expand Up @@ -7322,7 +7322,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
******************************

ip-address
10.2.0 <https://github.com/beaugunderson/ip-address>
10.4.0 <https://github.com/beaugunderson/ip-address>
Copyright (C) 2011 by Beau Gunderson

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -9553,7 +9553,7 @@ THE SOFTWARE.
******************************

undici
7.28.0 <https://github.com/nodejs/undici>
7.29.0 <https://github.com/nodejs/undici>
MIT License

Copyright (c) Matteo Collina and Undici contributors
Expand Down
4 changes: 2 additions & 2 deletions overrides/LICENSE-THIRD-PARTY
Original file line number Diff line number Diff line change
Expand Up @@ -7322,7 +7322,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
******************************

ip-address
10.2.0 <https://github.com/beaugunderson/ip-address>
10.4.0 <https://github.com/beaugunderson/ip-address>
Copyright (C) 2011 by Beau Gunderson

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -9553,7 +9553,7 @@ THE SOFTWARE.
******************************

undici
7.28.0 <https://github.com/nodejs/undici>
7.29.0 <https://github.com/nodejs/undici>
MIT License

Copyright (c) Matteo Collina and Undici contributors
Expand Down
14 changes: 7 additions & 7 deletions package-lock-overrides/sagemaker.series/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package-lock-overrides/web-embedded.series/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package-lock-overrides/web-server.series/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions patches/common/finding-override-axios.diff
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ Remove when upstream Code-OSS updates axios to >= 1.18.0.
@generator: scripts/patches/apply-override.sh --patch common/finding-override-axios.diff --override 'global:axios=^1.18.0'
@override-package: axios@^1.18.0

Index: b/package.json
Index: code-editor-src/package.json
===================================================================
--- a/package.json
+++ b/package.json
--- code-editor-src.orig/package.json
+++ code-editor-src/package.json
@@ -254,7 +254,8 @@
},
"follow-redirects": "^1.16.0",
"uuid": "^14.0.0",
- "ip-address": "^10.1.1"
+ "ip-address": "^10.1.1",
- "ip-address": "^10.3.1"
+ "ip-address": "^10.3.1",
+ "axios": "^1.18.0"
},
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions patches/common/finding-override-form-data.diff
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ Override form-data to ^4.0.6 to fix CVE-2026-12143.
@generator: scripts/patches/apply-override.sh --patch common/finding-override-form-data.diff --override 'global:form-data=^4.0.6'
@override-package: form-data@^4.0.6

Index: b/package.json
Index: code-editor-src/package.json
===================================================================
--- a/package.json
+++ b/package.json
--- code-editor-src.orig/package.json
+++ code-editor-src/package.json
@@ -261,7 +261,8 @@
"ws": "^7.5.11"
},
"@github/copilot": "^1.0.43",
- "undici": "^7.28.0"
+ "undici": "^7.28.0",
- "undici": "^7.29.0"
+ "undici": "^7.29.0",
+ "form-data": "^4.0.6"
},
"repository": {
Expand Down
18 changes: 9 additions & 9 deletions patches/common/finding-override-github-copilot.diff
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ Remove when upstream Code-OSS updates @github/copilot to >= 1.0.43.
@generator: scripts/patches/apply-override.sh --patch common/finding-override-github-copilot.diff --override 'global:@github/copilot=^1.0.43' --override 'remote/package.json@global:@github/copilot=^1.0.43'
@override-package: @github/copilot@^1.0.43

Index: b/package.json
Index: code-editor-src/package.json
===================================================================
--- a/package.json
+++ b/package.json
--- code-editor-src.orig/package.json
+++ code-editor-src/package.json
@@ -258,7 +258,8 @@
"axios": "^1.15.2",
"axios": "^1.18.0",
"chrome-remote-interface": {
"ws": "^7.5.11"
- }
Expand All @@ -19,16 +19,16 @@ Index: b/package.json
},
"repository": {
"type": "git",
Index: b/remote/package.json
Index: code-editor-src/remote/package.json
===================================================================
--- a/remote/package.json
+++ b/remote/package.json
--- code-editor-src.orig/remote/package.json
+++ code-editor-src/remote/package.json
@@ -53,6 +53,7 @@
"cpu-features": "0.0.0"
},
"uuid": "^14.0.0",
- "ip-address": "^10.1.1"
+ "ip-address": "^10.1.1",
- "ip-address": "^10.3.1"
+ "ip-address": "^10.3.1",
+ "@github/copilot": "^1.0.43"
}
}
14 changes: 7 additions & 7 deletions patches/common/finding-override-ip-address.diff
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Override ip-address to ^10.1.1.
Regenerate: scripts/patches/apply-override.sh --patch common/finding-override-ip-address.diff --override global:ip-address=^10.1.1 --override remote/package.json@global:ip-address=^10.1.1
Remove when upstream Code-OSS updates ip-address to >= 10.1.1.
Override ip-address to ^10.3.1.
Regenerate: scripts/patches/apply-override.sh --patch common/finding-override-ip-address.diff --override global:ip-address=^10.3.1 --override remote/package.json@global:ip-address=^10.3.1
Remove when upstream Code-OSS updates ip-address to >= 10.3.1.

@generated
@generator: scripts/patches/apply-override.sh --patch common/finding-override-ip-address.diff --override 'global:ip-address=^10.1.1' --override 'remote/package.json@global:ip-address=^10.1.1'
@override-package: ip-address@^10.1.1
@generator: scripts/patches/apply-override.sh --patch common/finding-override-ip-address.diff --override 'global:ip-address=^10.3.1' --override 'remote/package.json@global:ip-address=^10.3.1'
@override-package: ip-address@^10.3.1

Index: code-editor-src/package.json
===================================================================
Expand All @@ -16,7 +16,7 @@ Index: code-editor-src/package.json
"follow-redirects": "^1.16.0",
- "uuid": "^14.0.0"
+ "uuid": "^14.0.0",
+ "ip-address": "^10.1.1"
+ "ip-address": "^10.3.1"
},
"repository": {
"type": "git",
Expand All @@ -30,6 +30,6 @@ Index: code-editor-src/remote/package.json
},
- "uuid": "^14.0.0"
+ "uuid": "^14.0.0",
+ "ip-address": "^10.1.1"
+ "ip-address": "^10.3.1"
}
}
Loading