Merge branch 'main' into PIMS-2083-Remove-Keycloak-Roles-Code

bcgov · Sep 18, 2024 · b5cb759 · b5cb759
2 parents cdd8702 + 0464a7b
commit b5cb759
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/express-api/Dockerfile b/express-api/Dockerfile
@@ -2,7 +2,7 @@
 #                 Base                #
 #############################################
 # Use an official Node.js runtime as a base image
-FROM node:21.6-bullseye-slim as base
+FROM node:22.9-bullseye-slim as base
 
 # Set the working directory in the container
 WORKDIR /express-api
@@ -22,7 +22,7 @@ RUN npm run build
 #############################################
 #                 Prod Build                #
 #############################################
-FROM node:21.6-bullseye-slim as Prod
+FROM node:22.9-bullseye-slim as Prod
 
 # Set the working directory to /express-api
 WORKDIR /express-api

diff --git a/react-app/Dockerfile b/react-app/Dockerfile
@@ -1,7 +1,7 @@
 #############################################
 #                Base Build                 #
 #############################################
-FROM node:18.17.1-bullseye-slim as base
+FROM node:22.9-bullseye-slim as base
 
 # Set the working directory to /app
 WORKDIR /app

diff --git a/react-app/package.json b/react-app/package.json
@@ -36,7 +36,7 @@
     "react-plugin": "3.0.0-alpha.4",
     "react-router-dom": "6.26.0",
     "supercluster": "8.0.1",
-    "typescript-eslint": "8.4.0",
+    "typescript-eslint": "8.6.0",
     "use-supercluster": "1.2.0"
   },
   "devDependencies": {
@@ -50,17 +50,17 @@
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.0",
     "@vitejs/plugin-react": "4.3.0",
-    "eslint": "9.9.0",
+    "eslint": "9.10.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-react": "7.35.0",
+    "eslint-plugin-react": "7.36.1",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "prettier": "3.3.0",
     "react-test-renderer": "18.3.1",
     "ts-jest": "29.2.0",
     "ts-node": "10.9.2",
-    "typescript": "5.5.3",
+    "typescript": "5.6.2",
     "vite": "5.4.6",
     "vite-tsconfig-paths": "5.0.1"
   }