From b6135fcd24a7a04231247c22948df728f98ff72a Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Fri, 2 Aug 2024 16:31:28 +0200 Subject: [PATCH 1/5] upgrade node --- .github/workflows/test.yml | 2 +- .npmrc | 1 + .nvmrc | 2 +- Dockerfile | 2 +- package-lock.json | 4 ++-- package.json | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 .npmrc diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e52199b5f..7166fea886 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ permissions: contents: read env: - node: 18 + node: 20 jobs: unit: runs-on: ubuntu-latest diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..b6f27f1359 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/.nvmrc b/.nvmrc index 3c032078a4..209e3ef4b6 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +20 diff --git a/Dockerfile b/Dockerfile index 04c4059b17..847ddcdb41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM docker.io/node:18-bullseye AS build-stage +FROM docker.io/node:20 AS build-stage ## add libraries needed for installing canvas npm package RUN apt update && apt install -y g++ libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev; diff --git a/package-lock.json b/package-lock.json index 2b5eed20b7..e5a360ab3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,8 +77,8 @@ "webpack-plugin-vuetify": "^2.0.1" }, "engines": { - "node": "18", - "npm": ">=9" + "node": "20", + "npm": ">=10" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 70baf2bbd3..a2a58333f0 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "webpack-plugin-vuetify": "^2.0.1" }, "engines": { - "node": "18", - "npm": ">=9" + "node": "20", + "npm": ">=10" } } From 95efb5ea0534d582e09f388be0d8ecbc77278ebd Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Thu, 8 Aug 2024 10:51:03 +0200 Subject: [PATCH 2/5] update ckeditor --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2a58333f0..e1a0e1ab3f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "dependencies": { "@braintree/sanitize-url": "^6.0.4", "@ckeditor/ckeditor5-vue": "^5.1.0", - "@hpi-schul-cloud/ckeditor": "^1.0.0", + "@hpi-schul-cloud/ckeditor": "^1.1.0", "@lumieducation/h5p-webcomponents": "^9.2.2", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", From d83b99f128a939c3ce5df93486ba6eaec3a1f960 Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Thu, 8 Aug 2024 17:31:16 +0200 Subject: [PATCH 3/5] fix ckeditor in lock --- package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5a360ab3b..1c1c6041f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "dependencies": { "@braintree/sanitize-url": "^6.0.4", "@ckeditor/ckeditor5-vue": "^5.1.0", - "@hpi-schul-cloud/ckeditor": "^1.0.0", + "@hpi-schul-cloud/ckeditor": "^1.1.0", "@lumieducation/h5p-webcomponents": "^9.2.2", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", @@ -1923,10 +1923,13 @@ } }, "node_modules/@hpi-schul-cloud/ckeditor": { - "version": "1.0.0", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@hpi-schul-cloud/ckeditor/-/ckeditor-1.1.0.tgz", + "integrity": "sha512-pcmF/JtrCB9K4uXQdKiFaziPEKYbv1E9M4HJJANBXem+FFLMHWbBkmdJQxR1LRizLc4FqAvlzmKQq5pHdlng8A==", "license": "AGPL-3.0", "engines": { - "node": "18" + "node": "20", + "npm": ">=10" } }, "node_modules/@humanwhocodes/config-array": { From 33cd317ffd45006c19789198be392f9e6adf5f10 Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Thu, 8 Aug 2024 17:35:49 +0200 Subject: [PATCH 4/5] fix ci linter --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7166fea886..0989349ac2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,6 +49,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.node }} - name: npm ci run: npm ci --prefer-offline --no-audit - name: npm run lint From d0df3e8b50337dd78a1244c916f91c5749e822cd Mon Sep 17 00:00:00 2001 From: virgilchiriac Date: Wed, 14 Aug 2024 14:06:18 +0200 Subject: [PATCH 5/5] BC-7345 - downgrade npm BC-7842 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a9b149b4b..c7ec13954a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,7 +88,7 @@ }, "engines": { "node": "20", - "npm": ">=10" + "npm": ">=9" } }, "node_modules/@ampproject/remapping": { diff --git a/package.json b/package.json index db6746ffa3..85b7a2729d 100644 --- a/package.json +++ b/package.json @@ -97,6 +97,6 @@ }, "engines": { "node": "20", - "npm": ">=10" + "npm": ">=9" } }