Skip to content

Commit a4ff96b

Browse files
GLSP-1563: Update to node 20 (#1564)
* GLSP-1563: Update to node 20 Update minimum node version requirement to node 20 Update ci docker images Update Jenkinsfile Also clean up scripts in root package.json (Remove no longer needed publish scripts and all script) Part of: #1563 * Update docker/ci/README.md Co-authored-by: Haydar Metin <dev@haydar.metin.at> --------- Co-authored-by: Haydar Metin <dev@haydar.metin.at>
1 parent c29a688 commit a4ff96b

File tree

9 files changed

+32
-30
lines changed

9 files changed

+32
-30
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Pod
44
spec:
55
containers:
66
- name: node
7-
image: eclipseglsp/ci:alpine-v5.0
7+
image: eclipseglsp/ci:alpine-v6.0
88
tty: true
99
resources:
1010
limits:

dev-packages/ts-config/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"downlevelIteration": true,
2121
"resolveJsonModule": true,
2222
"module": "CommonJS",
23-
"moduleResolution": "Node",
23+
"moduleResolution": "node16",
2424
"target": "ES2019",
2525
"jsx": "react",
2626
"lib": ["ES2019", "dom"],

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ They are mainly used for CI jobs that require the possibility to build client an
1515
Currently each image variant has at least the following components installed:
1616

1717
- Git >=2.17.1
18-
- Node 18, yarn 1.22.4 and lerna
18+
- Node 20, yarn 1.22.4 and lerna
1919
- OpenJDK 17 and Maven >=3.6.0
2020
- Python and GCC libraries to enable [Theia](https://theia-ide.org/) builds
2121

docker/ci/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
## Supported tags and respective `Dockerfile` links
1515

16-
- [`latest`, `ubuntu`, `ubuntu-v5.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/ubuntu/Dockerfile)
17-
- [`uitest`,`uitest-v5.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/uitest/Dockerfile)
16+
- [`latest`, `ubuntu`, `ubuntu-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/ubuntu/Dockerfile)
17+
- [`uitest`,`uitest-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/uitest/Dockerfile)
1818

19-
- [`alpine`, `alpine-v5.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/alpine/Dockerfile)
19+
- [`alpine`, `alpine-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/alpine/Dockerfile)
2020

2121
Note that these tags are fluent and not bound to a fixed image version.
2222
If you want to use a fixed version you can use the base tag with a version suffix e.g. `ubuntu-v1.0`.
@@ -34,7 +34,7 @@ They are mainly used for CI jobs that require the possibility to build client an
3434
Currently each image variant has at least the following components installed:
3535

3636
- Git >=2.17.1
37-
- Node 18, yarn 1.22.19 and lerna
37+
- Node 20, yarn 1.22.19 and lerna
3838
- OpenJDK 17 and Maven >=3.6.0
3939
- Python and GCC libraries to enable [Theia](https://theia-ide.org/) builds
4040

@@ -82,6 +82,7 @@ In addition, Google Chrome is installed which enables browser-based UI testing o
8282
- [v3.1](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v3.1): Pre-install latest lerna version
8383
- [v4.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v4.0): Update to node 16
8484
- [v5.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v5.0): Update to node 18, Java 17 and Alpine 3.17/Ubuntu 22.04
85+
- [v6.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v6.0): Update to node 20
8586

8687
## License
8788

docker/ci/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# eclipseglsp/ci:alpine
2-
# 5.0
3-
FROM node:18-alpine3.17
2+
# 6.0
3+
FROM node:20-alpine3.22
44

55
# Install Java, Maven, Git and dependecies for Theia
66
ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"

docker/ci/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# eclipseglsp/ci:ubuntu
2-
# 5.0
2+
# 6.0
33
FROM ubuntu:22.04
44
# Install node & other Theia related dependencies
55
RUN apt-get update && \
@@ -10,6 +10,6 @@ RUN apt-get update && \
1010
libsecret-1-dev \
1111
build-essential libssl-dev rsync -y && \
1212
#Install node
13-
curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
13+
curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
1414
apt-get install nodejs -y && \
1515
npm install -g yarn lerna

docker/ci/uitest/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# eclipseglsp/ci:uitest
2-
# 5.0
2+
# 6.0
33
FROM ubuntu:22.04
44
# Install node & other Theia related dependencies
55
RUN apt-get update && \
@@ -10,7 +10,7 @@ RUN apt-get update && \
1010
libsecret-1-dev \
1111
build-essential libssl-dev rsync -y && \
1212
#Install node
13-
curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
13+
curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
1414
apt-get install nodejs -y && \
1515
npm install -g yarn lerna &&\
1616
apt-get install lsof xvfb -y

package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
{
22
"name": "parent",
3-
"version": "2.5.0-next",
43
"private": true,
54
"workspaces": [
65
"dev-packages/*"
76
],
87
"scripts": {
9-
"all": "yarn install && yarn lint",
108
"build": "yarn compile",
119
"check:headers": "yarn start:cli checkHeaders . -t lastCommit",
12-
"check:pr": "yarn all && yarn check:headers",
10+
"check:pr": "yarn install && yarn lint && yarn check:headers",
1311
"clean": "lerna run clean",
1412
"compile": "tsc -b",
1513
"lint": "eslint --ext .ts,.tsx .",
1614
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
1715
"lint:fix": "yarn lint --fix",
1816
"prepare": "yarn build",
19-
"publish:latest": "lerna publish from-git --no-verify-access --no-push",
2017
"publish:next": "lerna publish preminor --exact --canary --preid next --dist-tag next --no-git-tag-version --no-push --ignore-scripts --yes",
21-
"publish:prepare": "lerna version --ignore-scripts --yes --no-push --exact",
2218
"start:cli": " yarn --cwd dev-packages/cli start",
2319
"watch": "tsc -b -w --preserveWatchOutput"
2420
},
2521
"devDependencies": {
2622
"@istanbuljs/nyc-config-typescript": "^1.0.2",
2723
"@types/chai": "^4.3.5",
2824
"@types/mocha": "^10.0.1",
29-
"@types/node": "18.x",
25+
"@types/node": "20.x",
3026
"@types/sinon": "^10.0.13",
3127
"@typescript-eslint/eslint-plugin": "^5.59.7",
3228
"@typescript-eslint/parser": "^5.59.7",
@@ -48,10 +44,10 @@
4844
"rimraf": "^5.0.1",
4945
"sinon": "^15.1.0",
5046
"ts-node": "^10.9.1",
51-
"typescript": "^5.0.4"
47+
"typescript": "^5.9.2"
5248
},
5349
"engines": {
54-
"node": ">=18",
50+
"node": ">=20",
5551
"yarn": ">=1.7.0 <2"
5652
}
5753
}

yarn.lock

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,12 +1061,12 @@
10611061
dependencies:
10621062
undici-types "~5.26.4"
10631063

1064-
"@types/node@18.x":
1065-
version "18.19.68"
1066-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.68.tgz#f4f10d9927a7eaf3568c46a6d739cc0967ccb701"
1067-
integrity sha512-QGtpFH1vB99ZmTa63K4/FU8twThj4fuVSBkGddTp7uIL/cuoLWIUSL2RcOaigBhfR+hg5pgGkBnkoOxrTVBMKw==
1064+
"@types/node@20.x":
1065+
version "20.19.11"
1066+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.11.tgz#728cab53092bd5f143beed7fbba7ba99de3c16c4"
1067+
integrity sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==
10681068
dependencies:
1069-
undici-types "~5.26.4"
1069+
undici-types "~6.21.0"
10701070

10711071
"@types/normalize-package-data@^2.4.0":
10721072
version "2.4.4"
@@ -7329,10 +7329,10 @@ typedarray@^0.0.6:
73297329
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
73307330
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
73317331

7332-
typescript@^5.0.4:
7333-
version "5.4.5"
7334-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
7335-
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
7332+
typescript@^5.9.2:
7333+
version "5.9.2"
7334+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
7335+
integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
73367336

73377337
uglify-js@^3.1.4:
73387338
version "3.17.4"
@@ -7362,6 +7362,11 @@ undici-types@~5.26.4:
73627362
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
73637363
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
73647364

7365+
undici-types@~6.21.0:
7366+
version "6.21.0"
7367+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
7368+
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
7369+
73657370
unique-filename@^2.0.0:
73667371
version "2.0.1"
73677372
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"

0 commit comments

Comments
 (0)