Skip to content

Commit 8c04a62

Browse files
Merge branch 'coder:main' into main
2 parents 6a12cd0 + 417c1f3 commit 8c04a62

File tree

8 files changed

+282
-191
lines changed

8 files changed

+282
-191
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,11 @@ jobs:
229229
with:
230230
node-version-file: .node-version
231231

232+
# node-gyp is missing in (at least) npm 9.8.1.
233+
# TODO: Remove once we update to npm>=10?
234+
- name: Install node-gyp
235+
run: npm install -g node-gyp
236+
232237
- name: Fetch dependencies from cache
233238
id: cache-node-modules
234239
uses: actions/cache@v4

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,29 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
## [4.23.1](https://github.com/coder/code-server/releases/tag/v4.23.1) - 2024-04-15
26+
27+
Code v1.88.1
28+
29+
## Changed
30+
31+
- Updated to Code 1.88.1.
32+
33+
## [4.23.0](https://github.com/coder/code-server/releases/tag/v4.23.0) - 2024-04-08
34+
35+
Code v1.88.0
36+
37+
## Changed
38+
39+
- Updated to Code 1.88.0.
40+
- Updated Node to 18.18.2.
41+
42+
## Fixed
43+
44+
- Fix masking the exit code when failing to install extensions on the command
45+
line outside the integrated terminal. Installing extensions inside the
46+
integrated terminal still masks the exit code and is an upstream bug.
47+
2548
## [4.22.1](https://github.com/coder/code-server/releases/tag/v4.22.1) - 2024-03-14
2649

2750
Code v1.87.2

ci/helm-chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.18.1
18+
version: 3.19.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
23-
appVersion: 4.22.1
23+
appVersion: 4.23.1

ci/helm-chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replicaCount: 1
66

77
image:
88
repository: codercom/code-server
9-
tag: '4.22.1'
9+
tag: '4.23.1'
1010
pullPolicy: Always
1111

1212
# Specifies one or more secrets to be used when pulling images from a

package.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
"compression": "^1.7.4",
7272
"cookie-parser": "^1.4.6",
7373
"env-paths": "^2.2.1",
74-
"express": "5.0.0-alpha.8",
74+
"express": "5.0.0-beta.3",
7575
"http-proxy": "^1.18.1",
7676
"httpolyglot": "^0.1.2",
7777
"i18next": "^23.5.1",
7878
"js-yaml": "^4.1.0",
7979
"limiter": "^2.1.0",
8080
"pem": "^1.14.8",
8181
"proxy-agent": "^6.3.1",
82-
"qs": "6.9.7",
82+
"qs": "6.12.1",
8383
"rotating-file-stream": "^3.1.1",
8484
"safe-buffer": "^5.2.1",
8585
"safe-compare": "^1.1.4",
@@ -88,11 +88,7 @@
8888
"xdg-basedir": "^4.0.0"
8989
},
9090
"resolutions": {
91-
"@types/node": "^18.0.0",
92-
"qs": "6.9.7"
93-
},
94-
"overrides": {
95-
"qs": "6.9.7"
91+
"@types/node": "^18.0.0"
9692
},
9793
"bin": {
9894
"code-server": "out/node/entry.js"

test/yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2626,6 +2626,11 @@ minipass@^3.0.0:
26262626
dependencies:
26272627
yallist "^4.0.0"
26282628

2629+
minipass@^5.0.0:
2630+
version "5.0.0"
2631+
resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
2632+
integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
2633+
26292634
minizlib@^2.1.1:
26302635
version "2.1.2"
26312636
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -3293,13 +3298,13 @@ symbol-tree@^3.2.4:
32933298
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
32943299

32953300
tar@^6.1.11, tar@^6.1.9:
3296-
version "6.1.11"
3297-
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
3298-
integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
3301+
version "6.2.1"
3302+
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
3303+
integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
32993304
dependencies:
33003305
chownr "^2.0.0"
33013306
fs-minipass "^2.0.0"
3302-
minipass "^3.0.0"
3307+
minipass "^5.0.0"
33033308
minizlib "^2.1.1"
33043309
mkdirp "^1.0.3"
33053310
yallist "^4.0.0"

0 commit comments

Comments
 (0)