Skip to content

Commit 494802a

Browse files
Merge pull request #1841 from ral-facilities/renovate/node-24.x
Update dependency node to v24
2 parents aa90fb6 + a4410dc commit 494802a

File tree

9 files changed

+27
-46
lines changed

9 files changed

+27
-46
lines changed

.github/workflows/ci-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Node.js
1919
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2020
with:
21-
node-version: 20
21+
node-version: 24
2222
cache: 'yarn'
2323

2424
- name: Install dependencies
@@ -204,7 +204,7 @@ jobs:
204204
- name: Setup Node.js
205205
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
206206
with:
207-
node-version: 20
207+
node-version: 24
208208
cache: 'yarn'
209209

210210
- name: Install dependencies
@@ -374,7 +374,7 @@ jobs:
374374
- name: Setup Node.js
375375
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
376376
with:
377-
node-version: 20
377+
node-version: 24
378378
cache: 'yarn'
379379

380380
- name: Install dependencies
@@ -509,7 +509,7 @@ jobs:
509509
- name: Setup Node.js
510510
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
511511
with:
512-
node-version: 20
512+
node-version: 24
513513
cache: 'yarn'
514514

515515
- name: Install dependencies

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Node.js
2020
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2121
with:
22-
node-version: 20
22+
node-version: 24
2323
cache: 'yarn'
2424

2525
- name: Install dependencies

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Dockerfile to build and serve datagateway
22

33
# Build stage
4-
FROM node:20.18.1-alpine3.19@sha256:1cc9088b0fbcb2009a8fc2cb57916cd129cd5e32b3c75fb12bb24bac76917a96 AS builder
4+
FROM node:24.13.1-alpine3.23@sha256:4f696fbf39f383c1e486030ba6b289a5d9af541642fc78ab197e584a113b9c03 AS builder
55

66
WORKDIR /datagateway-build
77

@@ -30,7 +30,7 @@ RUN set -eux; \
3030
yarn build;
3131

3232
# Run stage
33-
FROM httpd:2.4.58-alpine3.19@sha256:92535cf7f151901ba91b04186292c3bd5bf82aa6ffa6eb7bc405fefbffedd480
33+
FROM httpd:2.4.66-alpine3.23@sha256:8f26f33a7002658050e9ab2cd6b77502619dfc89d0a6ba2e9e4a202e0ef04596
3434

3535
WORKDIR /usr/local/apache2/htdocs
3636

packages/datagateway-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@testing-library/jest-dom": "6.9.1",
5353
"@testing-library/react": "14.3.1",
5454
"@testing-library/user-event": "14.6.1",
55-
"@types/node": "20.19.0",
55+
"@types/node": "24.10.13",
5656
"@types/react": "18.0.33",
5757
"@types/react-router-dom": "5.3.3",
5858
"@types/react-virtualized": "9.22.2",

packages/datagateway-dataview/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@types/jsrsasign": "10.5.2",
1515
"@types/lodash.debounce": "4.0.6",
1616
"@types/lodash.memoize": "4.1.6",
17-
"@types/node": "20.19.0",
17+
"@types/node": "24.10.13",
1818
"@types/react": "18.0.33",
1919
"@types/react-dom": "18.0.11",
2020
"@types/react-router-dom": "5.3.3",

packages/datagateway-download/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@tanstack/react-query-devtools": "4.40.0",
1313
"@types/jsrsasign": "10.5.2",
1414
"@types/lodash.chunk": "4.2.6",
15-
"@types/node": "20.19.0",
15+
"@types/node": "24.10.13",
1616
"@types/react": "18.0.33",
1717
"@types/react-dom": "18.0.11",
1818
"@types/react-router-dom": "5.3.3",

packages/datagateway-download/src/DOIGenerationForm/DOIGenerationForm.component.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ describe('DOI generation form component', () => {
563563
);
564564

565565
expect(publishDraftDOI).toHaveBeenCalledWith('1', expect.anything());
566-
}, 40_000);
566+
}, 60_000);
567567

568568
it('should let the user go back from the confirmation page', async () => {
569569
renderComponent();

packages/datagateway-search/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@types/history": "4.7.11",
1616
"@types/jsrsasign": "10.5.2",
1717
"@types/lodash.isequal": "4.5.8",
18-
"@types/node": "20.19.0",
18+
"@types/node": "24.10.13",
1919
"@types/react": "18.0.33",
2020
"@types/react-dom": "18.0.11",
2121
"@types/react-router-dom": "5.3.3",

yarn.lock

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3118,12 +3118,12 @@ __metadata:
31183118
languageName: node
31193119
linkType: hard
31203120

3121-
"@types/node@npm:*, @types/node@npm:20.19.0":
3122-
version: 20.19.0
3123-
resolution: "@types/node@npm:20.19.0"
3121+
"@types/node@npm:*, @types/node@npm:24.10.13":
3122+
version: 24.10.13
3123+
resolution: "@types/node@npm:24.10.13"
31243124
dependencies:
3125-
undici-types: ~6.21.0
3126-
checksum: 21468a6fd9b56618af881bdd02466736149c8096699256350e27ec47442c6be4942a5b849a21da71653d4d5b819988303c24b19848761887cf73dcff1a408b68
3125+
undici-types: ~7.16.0
3126+
checksum: 254559915b60e204c855d3ea1b94cce187106c49c815a7b8edee1517f8a35301850545a52965e3dd2b5be3b26108e355108bcdb917445e855255a53dbcab3818
31273127
languageName: node
31283128
linkType: hard
31293129

@@ -4776,7 +4776,7 @@ __metadata:
47764776
"@testing-library/react": 14.3.1
47774777
"@testing-library/user-event": 14.6.1
47784778
"@types/lodash.debounce": 4.0.6
4779-
"@types/node": 20.19.0
4779+
"@types/node": 24.10.13
47804780
"@types/react": 18.0.33
47814781
"@types/react-router-dom": 5.3.3
47824782
"@types/react-virtualized": 9.22.2
@@ -4846,7 +4846,7 @@ __metadata:
48464846
"@types/jsrsasign": 10.5.2
48474847
"@types/lodash.debounce": 4.0.6
48484848
"@types/lodash.memoize": 4.1.6
4849-
"@types/node": 20.19.0
4849+
"@types/node": 24.10.13
48504850
"@types/react": 18.0.33
48514851
"@types/react-dom": 18.0.11
48524852
"@types/react-redux": 7.1.22
@@ -4920,7 +4920,7 @@ __metadata:
49204920
"@testing-library/user-event": 14.6.1
49214921
"@types/jsrsasign": 10.5.2
49224922
"@types/lodash.chunk": 4.2.6
4923-
"@types/node": 20.19.0
4923+
"@types/node": 24.10.13
49244924
"@types/react": 18.0.33
49254925
"@types/react-dom": 18.0.11
49264926
"@types/react-router-dom": 5.3.3
@@ -4992,7 +4992,7 @@ __metadata:
49924992
"@types/history": 4.7.11
49934993
"@types/jsrsasign": 10.5.2
49944994
"@types/lodash.isequal": 4.5.8
4995-
"@types/node": 20.19.0
4995+
"@types/node": 24.10.13
49964996
"@types/react": 18.0.33
49974997
"@types/react-dom": 18.0.11
49984998
"@types/react-redux": 7.1.22
@@ -6362,7 +6362,7 @@ __metadata:
63626362
languageName: node
63636363
linkType: hard
63646364

6365-
"fdir@npm:^6.2.0":
6365+
"fdir@npm:^6.2.0, fdir@npm:^6.4.4, fdir@npm:^6.4.6":
63666366
version: 6.5.0
63676367
resolution: "fdir@npm:6.5.0"
63686368
peerDependencies:
@@ -6374,18 +6374,6 @@ __metadata:
63746374
languageName: node
63756375
linkType: hard
63766376

6377-
"fdir@npm:^6.4.4, fdir@npm:^6.4.6":
6378-
version: 6.4.6
6379-
resolution: "fdir@npm:6.4.6"
6380-
peerDependencies:
6381-
picomatch: ^3 || ^4
6382-
peerDependenciesMeta:
6383-
picomatch:
6384-
optional: true
6385-
checksum: fe9f3014901d023cf631831dcb9eae5447f4d7f69218001dd01ecf007eccc40f6c129a04411b5cc273a5f93c14e02e971e17270afc9022041c80be924091eb6f
6386-
languageName: node
6387-
linkType: hard
6388-
63896377
"figures@npm:^3.2.0":
63906378
version: 3.2.0
63916379
resolution: "figures@npm:3.2.0"
@@ -7119,14 +7107,7 @@ __metadata:
71197107
languageName: node
71207108
linkType: hard
71217109

7122-
"ignore@npm:^5.2.0":
7123-
version: 5.2.4
7124-
resolution: "ignore@npm:5.2.4"
7125-
checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
7126-
languageName: node
7127-
linkType: hard
7128-
7129-
"ignore@npm:^5.3.0":
7110+
"ignore@npm:^5.2.0, ignore@npm:^5.3.0":
71307111
version: 5.3.2
71317112
resolution: "ignore@npm:5.3.2"
71327113
checksum: 2acfd32a573260ea522ea0bfeff880af426d68f6831f973129e2ba7363f422923cf53aab62f8369cbf4667c7b25b6f8a3761b34ecdb284ea18e87a5262a865be
@@ -10563,10 +10544,10 @@ __metadata:
1056310544
languageName: node
1056410545
linkType: hard
1056510546

10566-
"undici-types@npm:~6.21.0":
10567-
version: 6.21.0
10568-
resolution: "undici-types@npm:6.21.0"
10569-
checksum: 46331c7d6016bf85b3e8f20c159d62f5ae471aba1eb3dc52fff35a0259d58dcc7d592d4cc4f00c5f9243fa738a11cfa48bd20203040d4a9e6bc25e807fab7ab3
10547+
"undici-types@npm:~7.16.0":
10548+
version: 7.16.0
10549+
resolution: "undici-types@npm:7.16.0"
10550+
checksum: 1ef68fc6c5bad200c8b6f17de8e5bc5cfdcadc164ba8d7208cd087cfa8583d922d8316a7fd76c9a658c22b4123d3ff847429185094484fbc65377d695c905857
1057010551
languageName: node
1057110552
linkType: hard
1057210553

0 commit comments

Comments
 (0)