Skip to content

Commit e9d9917

Browse files
committed
Merge branch 'refactor/use-electron-storage-service'
2 parents 52149a3 + 8c74f4d commit e9d9917

45 files changed

Lines changed: 555 additions & 1344 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
outputs:
2222
ci: ${{ steps.filter.outputs.ci }}
2323
code: ${{ steps.filter.outputs.code }}
24-
deps: ${{ steps.filter.outputs.deps }}
24+
npm: ${{ steps.filter.outputs.npm }}
25+
vscode: ${{ steps.filter.outputs.vscode }}
2526
docs: ${{ steps.filter.outputs.docs }}
2627
helm: ${{ steps.filter.outputs.helm }}
2728
steps:
@@ -42,11 +43,12 @@ jobs:
4243
code:
4344
- "src/**"
4445
- "test/**"
45-
deps:
46-
- "lib/**"
47-
- "patches/**"
46+
npm:
4847
- "package-lock.json"
4948
- "test/package-lock.json"
49+
vscode:
50+
- "lib/**"
51+
- "patches/**"
5052
- id: debug
5153
run: |
5254
echo "${{ toJSON(steps.filter )}}"
@@ -56,7 +58,7 @@ jobs:
5658
runs-on: ubuntu-22.04
5759
steps:
5860
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
59-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
61+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
6062
with:
6163
node-version-file: .node-version
6264
cache: npm
@@ -73,7 +75,7 @@ jobs:
7375
if: needs.changes.outputs.docs == 'true'
7476
steps:
7577
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
76-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
78+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
7779
with:
7880
node-version-file: .node-version
7981
cache: npm
@@ -90,12 +92,10 @@ jobs:
9092
if: needs.changes.outputs.helm == 'true'
9193
steps:
9294
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
93-
- uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1
95+
- uses: bmuschko/setup-kubeconform@e5d264ec1eafe2314e750c429a9da7639dd5a003 # v1.1.0
9496
with:
95-
token: ${{ secrets.GITHUB_TOKEN }}
96-
version: "v3.19.2"
97-
- run: helm plugin install https://github.com/instrumenta/helm-kubeval
98-
- run: helm kubeval ci/helm-chart
97+
kubeconform-version: "0.8.0"
98+
- run: kubeconform ci/helm-chart
9999

100100
lint-ts:
101101
name: Lint TypeScript files
@@ -104,7 +104,7 @@ jobs:
104104
if: needs.changes.outputs.code == 'true'
105105
steps:
106106
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
107-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
107+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
108108
with:
109109
node-version-file: .node-version
110110
cache: npm
@@ -132,10 +132,10 @@ jobs:
132132
name: Run unit tests
133133
runs-on: ubuntu-22.04
134134
needs: changes
135-
if: needs.changes.outputs.code == 'true'
135+
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true'
136136
steps:
137137
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
138-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
138+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
139139
with:
140140
node-version-file: .node-version
141141
cache: npm
@@ -172,7 +172,7 @@ jobs:
172172
with:
173173
submodules: true
174174
- run: quilt push -a
175-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
175+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
176176
with:
177177
node-version-file: .node-version
178178
cache: npm
@@ -194,7 +194,7 @@ jobs:
194194
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
195195
with:
196196
path: lib/vscode-reh-web-linux-x64
197-
key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'patches/series', 'ci/build/build-vscode.sh') }}
197+
key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }}
198198
- name: Build vscode
199199
if: steps.cache-vscode.outputs.cache-hit != 'true'
200200
run: |
@@ -216,11 +216,11 @@ jobs:
216216
env:
217217
LOG_LEVEL: debug
218218
needs: [changes, build]
219-
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
219+
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true' || needs.changes.outputs.vscode == 'true' || needs.changes.outputs.ci == 'true'
220220

221221
steps:
222222
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
223-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
223+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
224224
with:
225225
node-version-file: .node-version
226226
cache: npm
@@ -252,7 +252,7 @@ jobs:
252252
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
253253
LOG_LEVEL: debug
254254
needs: [changes, build]
255-
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
255+
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.npm == 'true' || needs.changes.outputs.vscode == 'true' || needs.changes.outputs.ci == 'true'
256256

257257
steps:
258258
- name: Cache Caddy
@@ -270,7 +270,7 @@ jobs:
270270
tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
271271
272272
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
273-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
273+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
274274
with:
275275
node-version-file: .node-version
276276
cache: npm

‎.github/workflows/publish.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
3535
3636
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
37-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
37+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
3838
with:
3939
node-version-file: .node-version
4040

@@ -112,11 +112,11 @@ jobs:
112112
- uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
113113
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
114114

115-
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
115+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
116116
with:
117117
username: ${{ secrets.DOCKER_USERNAME }}
118118
password: ${{ secrets.DOCKER_PASSWORD }}
119-
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
119+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
120120
with:
121121
registry: ghcr.io
122122
username: ${{ github.actor }}

‎.github/workflows/release.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
with:
8181
submodules: true
8282
- run: quilt push -a
83-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
83+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
8484
with:
8585
node-version-file: .node-version
8686
cache: npm
@@ -110,7 +110,7 @@ jobs:
110110
- run: |
111111
sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes
112112
if: ${{ matrix.vscode_arch == 'x64' }}
113-
- uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
113+
- uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
114114
if: ${{ matrix.vscode_arch == 'x64' }}
115115
with:
116116
draft: true
@@ -123,7 +123,7 @@ jobs:
123123
# Platform-specific release.
124124
- run: KEEP_MODULES=1 npm run release
125125
- run: npm run package
126-
- uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
126+
- uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
127127
with:
128128
draft: true
129129
discussion_category_name: "📣 Announcements"
@@ -174,7 +174,7 @@ jobs:
174174
with:
175175
submodules: true
176176
- run: quilt push -a
177-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
177+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
178178
with:
179179
node-version-file: .node-version
180180
cache: npm
@@ -189,7 +189,7 @@ jobs:
189189
- run: npm run test:native
190190

191191
- run: npm run package
192-
- uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
192+
- uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
193193
with:
194194
draft: true
195195
discussion_category_name: "📣 Announcements"

‎.github/workflows/security.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 0
3131

3232
- name: Install Node.js
33-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
33+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
3434
with:
3535
node-version-file: .node-version
3636

@@ -62,7 +62,7 @@ jobs:
6262
severity: "HIGH,CRITICAL"
6363

6464
- name: Upload Trivy scan results to GitHub Security tab
65-
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
65+
uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4
6666
with:
6767
sarif_file: "trivy-repo-results.sarif"
6868

@@ -80,13 +80,13 @@ jobs:
8080

8181
# Initializes the CodeQL tools for scanning.
8282
- name: Initialize CodeQL
83-
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
83+
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
8484
with:
8585
config-file: ./.github/codeql-config.yml
8686
languages: javascript
8787

8888
- name: Autobuild
89-
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
89+
uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
9090

9191
- name: Perform CodeQL Analysis
92-
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
92+
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6

‎.github/workflows/trivy-docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ jobs:
5858
severity: "HIGH,CRITICAL"
5959

6060
- name: Upload Trivy scan results to GitHub Security tab
61-
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
61+
uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4
6262
with:
6363
sarif_file: "trivy-image-results.sarif"

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.18.0
1+
24.18.1

‎CHANGELOG.md‎

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

2323
## Unreleased
2424

25+
## [4.135.0](https://github.com/coder/code-server/releases/tag/v4.135.0) - 2026-08-27
26+
27+
Code v1.135.0
28+
29+
### Changed
30+
31+
- Update to Code 1.135.0
32+
33+
## [4.134.0](https://github.com/coder/code-server/releases/tag/v4.134.0) - 2026-08-24
34+
35+
Code v1.134.0
36+
37+
### Added
38+
39+
- New `--socket-fd` flag that can be used to listen on a file descriptor. In
40+
particular, this allows using code-server with systemd's socket activation.
41+
- New `--vscode-option` repeatable flag that can be used to pass through options
42+
to VS Code. It requires `flag=value` or simply `flag` for booleans. For
43+
example: `--vscode-option enable-sandbox --vscode-option agents=true`. The
44+
`VSCODE_OPTIONS` environment variable may also be used. For example:
45+
`VSCODE_OPTIONS="enable-sandbox agents=true"`. Note that code-server simply
46+
splits this variable on spaces and is not aware of quoting.
47+
48+
### Changed
49+
50+
- Update to Code 1.134.0
51+
- Remove `--unsafe-perm` from installation scripts. This flag results in an
52+
error when used with npm since v12 and has been a no-op since v7. If you are
53+
installing with a version of npm older than v7 as root, installation may not
54+
work correctly.
55+
56+
## [4.133.0](https://github.com/coder/code-server/releases/tag/v4.133.0) - 2026-08-17
57+
58+
Code v1.133.0
59+
60+
### Changed
61+
62+
- Update to Code 1.133.0
63+
64+
## [4.132.0](https://github.com/coder/code-server/releases/tag/v4.132.0) - 2026-08-10
65+
66+
Code v1.132.0
67+
68+
### Changed
69+
70+
- Update to Code 1.132.0
71+
72+
### Fixed
73+
74+
- When proxying, cookies were being decoded and re-encoded, which could cause
75+
issues for applications that encode differently. Cookies are now passed
76+
through unchanged (aside from stripping out code-server's session token).
77+
2578
## [4.131.0](https://github.com/coder/code-server/releases/tag/v4.131.0) - 2026-07-30
2679

2780
Code v1.131.0

‎ci/build/npm-postinstall.sh‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ symlink() {
1818
dest="$2"
1919
rm -rf "$dest"
2020
case $OS in
21-
windows) mklink /J "$dest" "$source" ;;
21+
windows) cmd //c mklink //J "$dest" "$source" ;;
2222
*) ln -s "$source" "$dest" ;;
2323
esac
2424
}
@@ -65,9 +65,9 @@ main() {
6565
echo "USE AT YOUR OWN RISK!"
6666
fi
6767

68-
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-22}" ]; then
69-
echo "ERROR: code-server currently requires node v22."
70-
if [ -n "$FORCE_NODE_VERSION" ]; then
68+
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-24}" ]; then
69+
echo "ERROR: code-server currently requires node v24."
70+
if [ -n "${FORCE_NODE_VERSION:-}" ]; then
7171
echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
7272
fi
7373
echo "We have detected that you are on node v$major_node_version"
@@ -76,20 +76,6 @@ main() {
7676
exit 1
7777
fi
7878

79-
# Under npm, if we are running as root, we need --unsafe-perm otherwise
80-
# post-install scripts will not have sufficient permissions to do their thing.
81-
if is_root; then
82-
case "${npm_config_user_agent-}" in npm*)
83-
if [ "${npm_config_unsafe_perm-}" != "true" ]; then
84-
echo "Please pass --unsafe-perm to npm to install code-server"
85-
echo "Otherwise post-install scripts will not have permissions to run"
86-
echo "See https://docs.npmjs.com/misc/config#unsafe-perm"
87-
echo "See https://stackoverflow.com/questions/49084929/npm-sudo-global-installation-unsafe-perm"
88-
exit 1
89-
fi
90-
;;
91-
esac
92-
fi
9379

9480
if ! vscode_install; then
9581
echo "You may not have the required dependencies to build the native modules."
@@ -110,7 +96,7 @@ install_with_yarn_or_npm() {
11096
# end-user we want to keep using whatever package manager is in use.
11197
case "${npm_config_user_agent-}" in
11298
npm*)
113-
if ! npm install --unsafe-perm --omit=dev; then
99+
if ! npm install --omit=dev; then
114100
return 1
115101
fi
116102
;;

‎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.46.0
18+
version: 3.50.0
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.131.0
23+
appVersion: 4.135.0

‎ci/helm-chart/values.yaml‎

Lines changed: 5 additions & 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.131.0'
9+
tag: '4.135.0'
1010
pullPolicy: Always
1111

1212
# Specifies one or more secrets to be used when pulling images from a
@@ -34,6 +34,10 @@ serviceAccount:
3434
# Specifies annotations for deployment
3535
annotations: {}
3636

37+
# code-server.labels -- The Deployment labels. See:
38+
# https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
39+
labels: {}
40+
3741
podAnnotations: {}
3842

3943
podSecurityContext: {}

0 commit comments

Comments
 (0)