Merge branch 'main' into stepsecurity_remediation_1719436239

orcasound · Jul 31, 2024 · 0a7875e · 0a7875e
2 parents ee7ba9a + c629500
commit 0a7875e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Largely based on https://github.com/nicbet/docker-phoenix/blob/main/Dockerfile
 
-FROM node:20.12.2-alpine@sha256:7a91aa397f2e2dfbfcdad2e2d72599f374e0b0172be1d86eeb73f1d33f36a4b2 AS node
+FROM node:22.5.1-alpine@sha256:9fcc1a6da2b9eee38638df75c5f826e06e9c79f6a0f97f16ed98fe0ebb0725c0 AS node
 FROM elixir:1.16-otp-26-alpine@sha256:829bebfcdc6fc58c56effc0d77f660de7c902fcf74e785b3175ee3a8f739b3f5 AS setup
 
 

diff --git a/server/phoenix_static_buildpack.config b/server/phoenix_static_buildpack.config
@@ -1,3 +1,3 @@
 assets_path=ui
 clean_cache=true
-node_version=20.12.2
+node_version=22.5.1
diff --git a/ui/.node-version b/ui/.node-version
@@ -1 +1 @@
-20.12.2
+22.5.1
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -51,7 +51,7 @@
  "@next/bundle-analyzer": "^14.2.2",
  "@tanstack/react-query-devtools": "^5.32.0",
  "@types/leaflet": "^1.9.12",
- "@types/node": "20.12.8",
+ "@types/node": "22.0.2",
  "@types/phoenix": "^1.6.4",
  "@types/react": "18.3.1",
  "@types/react-dom": "18.3.0",