Skip to content

Commit a41b456

Browse files
ZCU-DATA/Run the UI on Node 22 instead of end-of-life Node 18 (#1716)
* ZCU-DATA/Run the UI on Node 22 instead of end-of-life Node 18 (cherry picked from commit 835388c) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * ZCU-DATA/Use eslint-plugin-jsdoc 45 like dtq-dev so yarn install runs on Node 22 Version 39 allows only Node 14 to 19. dtq-dev has 45.0.0 since the 7.6.5 upgrade (commit 28fb578). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 291196c commit a41b456

5 files changed

Lines changed: 42 additions & 24 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
# Create a matrix of Node versions to test against (in parallel)
4848
matrix:
49-
node-version: [16.x, 18.x]
49+
node-version: [20.x, 22.x]
5050
# Do NOT exit immediately if one matrix job fails
5151
fail-fast: false
5252
# These are the actual CI steps to perform per job
@@ -94,7 +94,7 @@ jobs:
9494
# NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
9595
- name: Upload code coverage report to Artifact
9696
uses: actions/upload-artifact@v4
97-
if: matrix.node-version == '18.x'
97+
if: matrix.node-version == '22.x'
9898
with:
9999
name: coverage-report-${{ matrix.node-version }}
100100
path: 'coverage/dspace-angular/lcov.info'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This image will be published as dspace/dspace-angular
22
# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
33

4-
FROM node:18-alpine
4+
FROM docker.io/node:22-alpine
55

66
# Ensure Python and other build tools are available
77
# These are needed to install some node modules, especially on linux/arm64

‎Dockerfile.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Test build:
55
# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
66

7-
FROM node:18-alpine as build
7+
FROM docker.io/node:22-alpine AS build
88

99
# Ensure Python and other build tools are available
1010
# These are needed to install some node modules, especially on linux/arm64
@@ -17,7 +17,7 @@ RUN yarn install --network-timeout 300000
1717
ADD . /app/
1818
RUN yarn build:prod
1919

20-
FROM node:18-alpine
20+
FROM node:22-alpine
2121
RUN npm install --global pm2
2222

2323
COPY --chown=node:node --from=build /app/dist /app/dist

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"eslint": "^8.39.0",
175175
"eslint-plugin-deprecation": "^1.4.1",
176176
"eslint-plugin-import": "^2.27.5",
177-
"eslint-plugin-jsdoc": "^39.6.4",
177+
"eslint-plugin-jsdoc": "^45.0.0",
178178
"eslint-plugin-jsonc": "^2.6.0",
179179
"eslint-plugin-lodash": "^7.4.0",
180180
"eslint-plugin-unused-imports": "^2.0.0",

‎yarn.lock‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,14 +1697,14 @@
16971697
resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
16981698
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
16991699

1700-
"@es-joy/jsdoccomment@~0.36.1":
1701-
version "0.36.1"
1702-
resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz"
1703-
integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
1700+
"@es-joy/jsdoccomment@~0.39.4":
1701+
version "0.39.4"
1702+
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
1703+
integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
17041704
dependencies:
17051705
comment-parser "1.3.1"
1706-
esquery "^1.4.0"
1707-
jsdoc-type-pratt-parser "~3.1.0"
1706+
esquery "^1.5.0"
1707+
jsdoc-type-pratt-parser "~4.0.0"
17081708

17091709
"@esbuild/android-arm64@0.17.8":
17101710
version "0.17.8"
@@ -3286,6 +3286,11 @@ arch@^2.2.0:
32863286
resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
32873287
integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
32883288

3289+
are-docs-informative@^0.0.2:
3290+
version "0.0.2"
3291+
resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
3292+
integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
3293+
32893294
are-we-there-yet@^3.0.0:
32903295
version "3.0.1"
32913296
resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"
@@ -5383,17 +5388,18 @@ eslint-plugin-import@^2.27.5:
53835388
semver "^6.3.0"
53845389
tsconfig-paths "^3.14.1"
53855390

5386-
eslint-plugin-jsdoc@^39.6.4:
5387-
version "39.9.1"
5388-
resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz"
5389-
integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==
5391+
eslint-plugin-jsdoc@^45.0.0:
5392+
version "45.0.0"
5393+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
5394+
integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
53905395
dependencies:
5391-
"@es-joy/jsdoccomment" "~0.36.1"
5396+
"@es-joy/jsdoccomment" "~0.39.4"
5397+
are-docs-informative "^0.0.2"
53925398
comment-parser "1.3.1"
53935399
debug "^4.3.4"
53945400
escape-string-regexp "^4.0.0"
5395-
esquery "^1.4.0"
5396-
semver "^7.3.8"
5401+
esquery "^1.5.0"
5402+
semver "^7.5.1"
53975403
spdx-expression-parse "^3.0.1"
53985404

53995405
eslint-plugin-jsonc@^2.6.0:
@@ -5530,13 +5536,20 @@ esprima@^4.0.0, esprima@^4.0.1:
55305536
resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
55315537
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
55325538

5533-
esquery@^1.4.0, esquery@^1.4.2:
5539+
esquery@^1.4.2:
55345540
version "1.5.0"
55355541
resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
55365542
integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
55375543
dependencies:
55385544
estraverse "^5.1.0"
55395545

5546+
esquery@^1.5.0:
5547+
version "1.7.0"
5548+
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
5549+
integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
5550+
dependencies:
5551+
estraverse "^5.1.0"
5552+
55405553
esrecurse@^4.3.0:
55415554
version "4.3.0"
55425555
resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
@@ -7246,10 +7259,10 @@ jsbn@~0.1.0:
72467259
resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
72477260
integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
72487261

7249-
jsdoc-type-pratt-parser@~3.1.0:
7250-
version "3.1.0"
7251-
resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz"
7252-
integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
7262+
jsdoc-type-pratt-parser@~4.0.0:
7263+
version "4.0.0"
7264+
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
7265+
integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
72537266

72547267
jsdom@21.1.0:
72557268
version "21.1.0"
@@ -10411,6 +10424,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve
1041110424
dependencies:
1041210425
lru-cache "^6.0.0"
1041310426

10427+
semver@^7.5.1:
10428+
version "7.8.6"
10429+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.6.tgz#67c0cda133a3ceb6f70b803e67625bf969000424"
10430+
integrity sha512-9lpSSU4Mly3mrtruwLs1eLK6+gzbzqeBFwRNjIjE+9LuDpWdYctrQlQ3ej1Ilgi7gknpsTRnPoLP8DpCHqHIJw==
10431+
1041410432
semver@~7.0.0:
1041510433
version "7.0.0"
1041610434
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"

0 commit comments

Comments
 (0)