Skip to content

Commit

Permalink
Upgrade from node 20 to node 22 (#7968)
Browse files Browse the repository at this point in the history
* first pass

* missing frontend files

* nvmrc file

* update yarnfile frontend

* update dockerfile
  • Loading branch information
bobbywells52 committed Aug 12, 2024
1 parent 0fb33a4 commit 7886567
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checkGraphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- main

env:
NODE_VERSION: 20
NODE_VERSION: 22

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- "frontend/**"

env:
NODE_VERSION: 20
NODE_VERSION: 22

jobs:
chromatic-deployment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
env:
JAVA_VERSION: 17
JAVA_DISTRIBUTION: 'zulu'
NODE_VERSION: 20
NODE_VERSION: 22

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployDemo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
DEPLOY_ENV: demo
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: demo-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployDev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- pentest

env:
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: ${{ github.event.inputs.deploy_env }}-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployProd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
DEPLOY_ENV: prod
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: prod-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployStg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
DEPLOY_ENV: stg
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: stg-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
DEPLOY_ENV: test
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: test-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployTraining.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
DEPLOY_ENV: training
NODE_VERSION: 20
NODE_VERSION: 22

concurrency:
group: training-deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
default: "prod"

env:
NODE_VERSION: 20
NODE_VERSION: 22

jobs:
pushMaintenanceBlob:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
cancel-in-progress: true

env:
NODE_VERSION: 20
NODE_VERSION: 22
JAVA_VERSION: 17
JAVA_DISTRIBUTION: 'zulu'
PROJECT_ROOT: /home/runner/work/prime-simplereport/prime-simplereport # Hardcoding this here because env.WORKSPACE_ROOT gets overridden by one of the steps downstream. We only need this for Sonar.
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.*
22.*
2 changes: 1 addition & 1 deletion frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.*
22.*
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine as build
FROM node:22-alpine as build
LABEL org.opencontainers.image.source https://github.com/CDCgov/prime-simplereport

# Add bash and git
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN echo "REACT_APP_CONTENT_SECURITY_POLICY_SCRIPT_SRC=''" >> .env.production.lo
RUN yarn run build

# production environment
FROM node:20-alpine
FROM node:22-alpine
RUN npm install -g serve
WORKDIR /app/frontend
COPY --from=build /app/frontend/build /app/frontend/build
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"engines": {
"node": "20"
"node": "22"
},
"dependencies": {
"@apollo/client": "^3.8.3",
Expand Down Expand Up @@ -189,7 +189,7 @@
"@types/classnames": "^2.2.11",
"@types/jest": "^29.5.12",
"@types/jest-axe": "^3.5.9",
"@types/node": "^20.12.11",
"@types/node": "^22.0.0",
"@types/react": "^18.0.27",
"@types/react-csv": "^1.1.10",
"@types/react-dom": "^18.2.17",
Expand Down
14 changes: 13 additions & 1 deletion frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5371,7 +5371,7 @@
dependencies:
"@types/node" "*"

"@types/node@*", "@types/node@^20.12.11", "@types/node@^20.12.12":
"@types/node@*", "@types/node@^20.12.12":
version "20.12.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
Expand All @@ -5385,6 +5385,13 @@
dependencies:
undici-types "~5.26.4"

"@types/node@^22.0.0":
version "22.0.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30"
integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==
dependencies:
undici-types "~6.11.1"

"@types/normalize-package-data@^2.4.0":
version "2.4.2"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz#9b0e3e8533fe5024ad32d6637eb9589988b6fdca"
Expand Down Expand Up @@ -16881,6 +16888,11 @@ undici-types@~5.26.4:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

undici-types@~6.11.1:
version "6.11.1"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197"
integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==

[email protected]:
version "5.22.1"
resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
Expand Down

0 comments on commit 7886567

Please sign in to comment.