Skip to content

Commit f87b82e

Browse files
committed
Update Code to 1.90.0
- Update Node to 20.11.1 - Update documentation
1 parent fc47b4f commit f87b82e

20 files changed

+54
-55
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.18.2
1+
20.11.1

ci/build/npm-postinstall.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ main() {
7676
echo "USE AT YOUR OWN RISK!"
7777
fi
7878

79-
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-18}" ]; then
80-
echo "ERROR: code-server currently requires node v18."
79+
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then
80+
echo "ERROR: code-server currently requires node v20."
8181
if [ -n "$FORCE_NODE_VERSION" ]; then
8282
echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
8383
fi

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ for [VS
3737
Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
3838
Here is what is needed:
3939

40-
- `node` v18.x
40+
- `node` v20.x
4141
- `git` v2.x or greater
4242
- [`git-lfs`](https://git-lfs.github.com)
4343
- [`yarn`](https://classic.yarnpkg.com/en/)

docs/android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
1111
```
1212

1313
6. Exit the terminal using `exit` and then reopen the terminal
14-
7. Install and use Node.js 18:
14+
7. Install and use Node.js 20:
1515

1616
```shell
1717
nvm install 18

docs/npm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ includes installing instructions based on your operating system.
3030
## Node.js version
3131

3232
We use the same major version of Node.js shipped with Code's remote, which is
33-
currently `18.x`. VS Code also [lists Node.js
33+
currently `20.x`. VS Code also [lists Node.js
3434
requirements](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites).
3535

3636
Using other versions of Node.js [may lead to unexpected
@@ -79,7 +79,7 @@ Proceed to [installing](#installing)
7979
## FreeBSD
8080

8181
```sh
82-
pkg install -y git python npm-node18 pkgconf
82+
pkg install -y git python npm-node20 pkgconf
8383
pkg install -y libinotify
8484
```
8585

docs/termux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ npm config set python python3
5757
node -v
5858
```
5959

60-
you will get Node version `v18`
60+
you will get Node version `v20`
6161

6262
5. Now install code-server following our guide on [installing with npm](./npm.md)
6363

lib/vscode

Submodule vscode updated 1130 files

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@types/express": "^4.17.17",
4545
"@types/http-proxy": "1.17.7",
4646
"@types/js-yaml": "^4.0.6",
47-
"@types/node": "^18.0.0",
47+
"@types/node": "20.x",
4848
"@types/pem": "^1.14.1",
4949
"@types/proxy-from-env": "^1.0.1",
5050
"@types/safe-compare": "^1.1.0",
@@ -88,7 +88,7 @@
8888
"xdg-basedir": "^4.0.0"
8989
},
9090
"resolutions": {
91-
"@types/node": "^18.0.0"
91+
"@types/node": "20.x"
9292
},
9393
"bin": {
9494
"code-server": "out/node/entry.js"
@@ -103,7 +103,7 @@
103103
"remote-development"
104104
],
105105
"engines": {
106-
"node": "18"
106+
"node": "20"
107107
},
108108
"jest": {
109109
"transform": {

patches/base-path.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -205,7 +205,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -212,7 +212,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -140,11 +140,11 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
140140
+ const base = relativeRoot(getOriginalUrl(req))
141141
+ const vscodeBase = relativePath(getOriginalUrl(req))
142142
+
143-
const productConfiguration = <Partial<IProductConfiguration>>{
143+
const productConfiguration = {
144144
codeServerVersion: this._productService.codeServerVersion,
145145
+ rootEndpoint: base,
146146
embedderIdentifier: 'server-distro',
147-
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
147+
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
148148
...this._productService.extensionsGallery,
149149
@@ -343,8 +346,10 @@ export class WebClientServer {
150150
const values: { [key: string]: string } = {

patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
99
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
10-
@@ -284,6 +284,10 @@ export class Extension implements IExten
10+
@@ -285,6 +285,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

0 commit comments

Comments
 (0)