mirror of
https://github.com/coder/code-server.git
synced 2026-05-23 20:57:26 +02:00
Compare commits
1 Commits
dependabot
...
asher/enab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e904a24ce4 |
6
.github/workflows/publish.yaml
vendored
6
.github/workflows/publish.yaml
vendored
@@ -38,7 +38,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version-file: .node-version
|
node-version-file: .node-version
|
||||||
|
|
||||||
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
|
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
|
||||||
with:
|
with:
|
||||||
repository: "coder/code-server"
|
repository: "coder/code-server"
|
||||||
tag: ${{ env.TAG }}
|
tag: ${{ env.TAG }}
|
||||||
@@ -122,13 +122,13 @@ jobs:
|
|||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
|
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
|
||||||
with:
|
with:
|
||||||
repository: "coder/code-server"
|
repository: "coder/code-server"
|
||||||
tag: v${{ env.VERSION }}
|
tag: v${{ env.VERSION }}
|
||||||
fileName: "*.deb"
|
fileName: "*.deb"
|
||||||
out-file-path: "release-packages"
|
out-file-path: "release-packages"
|
||||||
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
|
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
|
||||||
with:
|
with:
|
||||||
repository: "coder/code-server"
|
repository: "coder/code-server"
|
||||||
tag: v${{ env.VERSION }}
|
tag: v${{ env.VERSION }}
|
||||||
|
|||||||
12
.github/workflows/release.yaml
vendored
12
.github/workflows/release.yaml
vendored
@@ -10,7 +10,7 @@ on:
|
|||||||
types:
|
types:
|
||||||
- closed
|
- closed
|
||||||
branches:
|
branches:
|
||||||
- main
|
- "update/**"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write # For creating releases.
|
contents: write # For creating releases.
|
||||||
@@ -26,9 +26,7 @@ jobs:
|
|||||||
package-linux:
|
package-linux:
|
||||||
name: ${{ format('linux-{0}', matrix.vscode_arch) }}
|
name: ${{ format('linux-{0}', matrix.vscode_arch) }}
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
if: >-
|
if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
|
||||||
(github.event_name == 'workflow_dispatch') ||
|
|
||||||
(github.event_name == 'pull_request_target' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'update/'))
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -119,7 +117,7 @@ jobs:
|
|||||||
files: package.tar.gz
|
files: package.tar.gz
|
||||||
tag_name: v${{ env.VERSION }}
|
tag_name: v${{ env.VERSION }}
|
||||||
name: v${{ env.VERSION }}
|
name: v${{ env.VERSION }}
|
||||||
body_path: .cache/release-notes
|
body: .cache/release-notes
|
||||||
|
|
||||||
# Platform-specific release.
|
# Platform-specific release.
|
||||||
- run: KEEP_MODULES=1 npm run release
|
- run: KEEP_MODULES=1 npm run release
|
||||||
@@ -135,9 +133,7 @@ jobs:
|
|||||||
package-macos:
|
package-macos:
|
||||||
name: ${{ matrix.vscode_target }}
|
name: ${{ matrix.vscode_target }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
if: >-
|
if: github.event_name == 'workflow_dispatch' || github.event.pull_request_merged == true
|
||||||
(github.event_name == 'workflow_dispatch') ||
|
|
||||||
(github.event_name == 'pull_request_target' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'update/'))
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
|||||||
2
.github/workflows/security.yaml
vendored
2
.github/workflows/security.yaml
vendored
@@ -51,7 +51,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Run Trivy vulnerability scanner in repo mode
|
- name: Run Trivy vulnerability scanner in repo mode
|
||||||
uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest
|
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest
|
||||||
with:
|
with:
|
||||||
scan-type: "fs"
|
scan-type: "fs"
|
||||||
scan-ref: "."
|
scan-ref: "."
|
||||||
|
|||||||
2
.github/workflows/trivy-docker.yaml
vendored
2
.github/workflows/trivy-docker.yaml
vendored
@@ -49,7 +49,7 @@ jobs:
|
|||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
|
||||||
- name: Run Trivy vulnerability scanner in image mode
|
- name: Run Trivy vulnerability scanner in image mode
|
||||||
uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest
|
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # latest
|
||||||
with:
|
with:
|
||||||
image-ref: "docker.io/codercom/code-server:latest"
|
image-ref: "docker.io/codercom/code-server:latest"
|
||||||
ignore-unfixed: true
|
ignore-unfixed: true
|
||||||
|
|||||||
4
.github/workflows/update.yaml
vendored
4
.github/workflows/update.yaml
vendored
@@ -63,10 +63,10 @@ jobs:
|
|||||||
git config --global user.email opensource@coder.com
|
git config --global user.email opensource@coder.com
|
||||||
git checkout -b "update/$VERSION"
|
git checkout -b "update/$VERSION"
|
||||||
git add .
|
git add .
|
||||||
git commit -m "Update Code to $VERSION"
|
git commit -m "Update VS Code to $VERSION"
|
||||||
git push -u origin "$(git branch --show)"
|
git push -u origin "$(git branch --show)"
|
||||||
gh pr create \
|
gh pr create \
|
||||||
--repo coder/code-server \
|
--repo coder/code-server \
|
||||||
--title "Update Code to $VERSION" \
|
--title "Update VS Code to $VERSION" \
|
||||||
--body-file .cache/checklist \
|
--body-file .cache/checklist \
|
||||||
--draft
|
--draft
|
||||||
|
|||||||
10
CHANGELOG.md
10
CHANGELOG.md
@@ -22,14 +22,20 @@ Code v99.99.999
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20
|
|
||||||
|
|
||||||
Code v1.121.0
|
Code v1.121.0
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Update to Code 1.121.0
|
- Update to Code 1.121.0
|
||||||
|
|
||||||
|
## [4.119.0](https://github.com/coder/code-server/releases/tag/v4.119.0) - 2026-05-07
|
||||||
|
|
||||||
|
Code v1.119.0
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update to Code 1.119.0
|
||||||
|
|
||||||
## [4.118.0](https://github.com/coder/code-server/releases/tag/v4.118.0) - 2026-05-06
|
## [4.118.0](https://github.com/coder/code-server/releases/tag/v4.118.0) - 2026-05-06
|
||||||
|
|
||||||
Code v1.118.0
|
Code v1.118.0
|
||||||
|
|||||||
@@ -132,12 +132,12 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
target_vscode_version="${VERSION#v}"
|
target_vscode_version="${VERSION#v}"
|
||||||
steps+=(
|
steps+=(
|
||||||
"Update Code to $target_vscode_version" "update_vscode"
|
"Update VS Code to $target_vscode_version" "update_vscode"
|
||||||
"Refresh Code patches" "refresh_patches"
|
"Refresh VS Code patches" "refresh_patches"
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
target_vscode_version="$(git -C lib/vscode describe --tags --exact-match)"
|
target_vscode_version="$(git -C lib/vscode describe --tags --exact-match)"
|
||||||
echo "Detected Code version $target_vscode_version"
|
echo "Detected VS Code version $target_vscode_version"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
steps+=(
|
steps+=(
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 3.36.0
|
version: 3.35.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
appVersion: 4.121.0
|
appVersion: 4.116.0
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ replicaCount: 1
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: codercom/code-server
|
repository: codercom/code-server
|
||||||
tag: '4.121.0'
|
tag: '4.116.0'
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
|
|
||||||
# Specifies one or more secrets to be used when pulling images from a
|
# Specifies one or more secrets to be used when pulling images from a
|
||||||
|
|||||||
20
package-lock.json
generated
20
package-lock.json
generated
@@ -58,7 +58,7 @@
|
|||||||
"eslint-plugin-import": "^2.28.1",
|
"eslint-plugin-import": "^2.28.1",
|
||||||
"eslint-plugin-prettier": "^5.0.0",
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
"globals": "^16.1.0",
|
"globals": "^16.1.0",
|
||||||
"prettier": "3.8.3",
|
"prettier": "3.6.2",
|
||||||
"prettier-plugin-sh": "^0.18.0",
|
"prettier-plugin-sh": "^0.18.0",
|
||||||
"ts-node": "^10.9.1",
|
"ts-node": "^10.9.1",
|
||||||
"typescript": "^5.6.2",
|
"typescript": "^5.6.2",
|
||||||
@@ -5100,9 +5100,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/prettier": {
|
"node_modules/prettier": {
|
||||||
"version": "3.8.3",
|
"version": "3.6.2",
|
||||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
|
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
|
||||||
"integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
|
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -5197,9 +5197,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/qs": {
|
"node_modules/qs": {
|
||||||
"version": "6.15.2",
|
"version": "6.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz",
|
||||||
"integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
|
"integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"side-channel": "^1.1.0"
|
"side-channel": "^1.1.0"
|
||||||
@@ -6613,9 +6613,9 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/ws": {
|
"node_modules/ws": {
|
||||||
"version": "8.20.1",
|
"version": "8.19.0",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
|
||||||
"integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
|
"integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
"eslint-plugin-import": "^2.28.1",
|
"eslint-plugin-import": "^2.28.1",
|
||||||
"eslint-plugin-prettier": "^5.0.0",
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
"globals": "^16.1.0",
|
"globals": "^16.1.0",
|
||||||
"prettier": "3.8.3",
|
"prettier": "3.6.2",
|
||||||
"prettier-plugin-sh": "^0.18.0",
|
"prettier-plugin-sh": "^0.18.0",
|
||||||
"ts-node": "^10.9.1",
|
"ts-node": "^10.9.1",
|
||||||
"typescript": "^5.6.2",
|
"typescript": "^5.6.2",
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
Apply --app-name to VS Code web page titles
|
|
||||||
|
|
||||||
VS Code's `${appName}` title variable comes from `productService.nameLong` in the
|
|
||||||
web client. code-server already injects per-request product configuration into
|
|
||||||
VS Code's web bootstrap, so set `nameShort`/`nameLong` from the existing
|
|
||||||
`--app-name` CLI arg there.
|
|
||||||
|
|
||||||
This keeps the patch minimal and makes browser tab titles honor `--app-name`
|
|
||||||
without changing unrelated product metadata.
|
|
||||||
|
|
||||||
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
||||||
===================================================================
|
|
||||||
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
||||||
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
||||||
@@ -24,6 +24,7 @@ export const serverOptions: OptionDescri
|
|
||||||
'disable-getting-started-override': { type: 'boolean' },
|
|
||||||
'locale': { type: 'string' },
|
|
||||||
'link-protection-trusted-domains': { type: 'string[]' },
|
|
||||||
+ 'app-name': { type: 'string' },
|
|
||||||
|
|
||||||
/* ----- server setup ----- */
|
|
||||||
|
|
||||||
@@ -120,6 +121,7 @@ export interface ServerParsedArgs {
|
|
||||||
'disable-getting-started-override'?: boolean,
|
|
||||||
'locale'?: string
|
|
||||||
'link-protection-trusted-domains'?: string[],
|
|
||||||
+ 'app-name'?: string,
|
|
||||||
|
|
||||||
/* ----- server setup ----- */
|
|
||||||
|
|
||||||
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
||||||
===================================================================
|
|
||||||
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
||||||
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
||||||
@@ -366,8 +366,11 @@ export class WebClientServer {
|
|
||||||
linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ const appName = this._environmentService.args['app-name'];
|
|
||||||
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
|
|
||||||
codeServerVersion: this._productService.codeServerVersion,
|
|
||||||
+ nameShort: appName,
|
|
||||||
+ nameLong: appName,
|
|
||||||
rootEndpoint: rootBase,
|
|
||||||
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
|
|
||||||
logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
|
|
||||||
@@ -23,4 +23,3 @@ display-language.diff
|
|||||||
trusted-domains.diff
|
trusted-domains.diff
|
||||||
signature-verification.diff
|
signature-verification.diff
|
||||||
copilot.diff
|
copilot.diff
|
||||||
app-name.diff
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import { version } from "../../src/node/constants"
|
|
||||||
import { describe, test, expect } from "./baseFixture"
|
|
||||||
|
|
||||||
const appName = "testnäme"
|
|
||||||
describe("--app-name", [`--app-name=${appName}`], {}, () => {
|
|
||||||
test("should use app-name for the title", async ({ codeServerPage }) => {
|
|
||||||
expect(await codeServerPage.page.title()).toContain(appName)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -5,10 +5,10 @@ import path from "path"
|
|||||||
// The default configuration runs all tests in three browsers with workers equal
|
// The default configuration runs all tests in three browsers with workers equal
|
||||||
// to half the available threads. See 'npm run test:e2e --help' to customize
|
// to half the available threads. See 'npm run test:e2e --help' to customize
|
||||||
// from the command line. For example:
|
// from the command line. For example:
|
||||||
// npm run test:e2e -- --workers 1 # Run with one worker
|
// npm run test:e2e --workers 1 # Run with one worker
|
||||||
// npm run test:e2e -- --project Chromium # Only run on Chromium
|
// npm run test:e2e --project Chromium # Only run on Chromium
|
||||||
// npm run test:e2e -- --grep login # Run tests matching "login"
|
// npm run test:e2e --grep login # Run tests matching "login"
|
||||||
// PWDEBUG=1 npm run test:e2e # Run Playwright inspector
|
// PWDEBUG=1 npm run test:e2e # Run Playwright inspector
|
||||||
const config: PlaywrightTestConfig = {
|
const config: PlaywrightTestConfig = {
|
||||||
testDir: path.join(__dirname, "e2e"), // Search for tests in this directory.
|
testDir: path.join(__dirname, "e2e"), // Search for tests in this directory.
|
||||||
timeout: 60000, // Each test is given 60 seconds.
|
timeout: 60000, // Each test is given 60 seconds.
|
||||||
@@ -33,12 +33,10 @@ const config: PlaywrightTestConfig = {
|
|||||||
// name: "Firefox",
|
// name: "Firefox",
|
||||||
// use: { browserName: "firefox" },
|
// use: { browserName: "firefox" },
|
||||||
// },
|
// },
|
||||||
// Keeps failing with "Underlying ArrayBuffer has been detached from the view or out-of-bounds"
|
{
|
||||||
// Not sure what we can do about it...so skip for now.
|
name: "WebKit",
|
||||||
// {
|
use: { browserName: "webkit" },
|
||||||
// name: "WebKit",
|
},
|
||||||
// use: { browserName: "webkit" },
|
|
||||||
// },
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user