From 99af71a70a7ca7cab53e29a4b12a4e01ebc8023c Mon Sep 17 00:00:00 2001 From: Alec M Date: Fri, 7 Feb 2025 11:03:35 -0500 Subject: [PATCH 1/3] Upgrade Node to `v22.X.X` --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/typescript.yml | 2 +- .npmrc | 1 + package-lock.json | 4 ++++ package.json | 4 ++++ 6 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .npmrc diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b19535f45..a50cf9a36 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: "20.x" + node-version: "22.x" cache: "npm" - name: Cache node modules diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ff258ee0..5e47a7f79 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: "20.x" + node-version: "22.x" cache: "npm" - name: Cache node modules diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index aa98d342e..df5a4d9eb 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: "20.x" + node-version: "22.x" cache: "npm" - name: Cache node modules diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..b6f27f135 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/package-lock.json b/package-lock.json index ab1b56548..b5d275321 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,10 @@ "jest-canvas-mock": "^2.5.2", "prettier": "^3.1.1", "typescript": "^5.4.3" + }, + "engines": { + "node": ">=22.0.0 <23.0.0", + "npm": ">=10.0.0" } }, "node_modules/@adobe/css-tools": { diff --git a/package.json b/package.json index 867614a8e..015162610 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "crdc-datahub-ui", "version": "3.2.0", + "engines": { + "node": ">=22.0.0 <23.0.0", + "npm": ">=10.0.0" + }, "dependencies": { "@apollo/client": "^3.9.8", "@axe-core/react": "^4.9.0", From a3b04bbe9fa68a2792a7dbda224f292abe9cff3d Mon Sep 17 00:00:00 2001 From: Alec M Date: Wed, 5 Mar 2025 10:53:24 -0500 Subject: [PATCH 2/3] Bump node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3fc67d8ee..f7f4253c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.11.1-alpine3.19 as build +FROM node:22.13.1-alpine3.21 AS build WORKDIR /usr/src/app From 36aace87a57ab734d86fdae1594bdbbdd7f172a9 Mon Sep 17 00:00:00 2001 From: Alec M Date: Fri, 7 Mar 2025 09:30:29 -0500 Subject: [PATCH 3/3] Remove versions from README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c6376a7d..4560d9ccd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Introduction -The CRDC Submission Portal is a React application that facilitates the data submission process for participating CRDC Data Commons projects. This project utilizes Node `20.11`, TypeScript, React `v18`, Material-UI `v5`, GraphQL, and Apollo Client, among other dependencies. +The CRDC Submission Portal is a React application that facilitates the data submission process for participating CRDC Data Commons projects. This project utilizes React.js, TypeScript, MUI, and Apollo Client, among other dependencies. [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![Coverage Status](https://coveralls.io/repos/github/CBIIT/crdc-datahub-ui/badge.svg?branch=main)](https://coveralls.io/github/CBIIT/crdc-datahub-ui?branch=main)