Merge pull request #222 from TorMap/dev

chore: update node version to 20
TorMap · Jan 2, 2024 · 41bf19a · 41bf19a
2 parents a34a352 + 48d230c
commit 41bf19a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,5 +8,8 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{*.json,.github/**.yml}]
+[*.json]
+indent_size = 2
+
+[.github/**.yml]
 indent_size = 2
diff --git a/backend/production.yml b/backend/production.yml
@@ -3,7 +3,7 @@ version: '3.8'
 name: tormap
 services:
     backend:
-        image: tormap/backend:${TORMAP_VERSION:-1}
+        image: tormap/backend:${TORMAP_VERSION:-2}
         volumes:
             - ./tormap-data:/tormap-data
         depends_on:
@@ -24,6 +24,6 @@ services:
             - "5432:5432"
 
     frontend:
-        image: tormap/frontend:${TORMAP_VERSION:-1}
+        image: tormap/frontend:${TORMAP_VERSION:-2}
         ports:
             - "80:80"
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,5 +1,5 @@
 # Build app
-FROM node:16-alpine as builder
+FROM node:20-alpine as builder
 WORKDIR /app
 COPY . .
 RUN yarn install --immutable

diff --git a/frontend/README.md b/frontend/README.md
@@ -6,8 +6,8 @@ visualize markers on a world map we use [Leaflet](https://leafletjs.com/).
 
 ## Requirements
 
-- [NodeJS](https://nodejs.org/en/)  (12.0.0 >= version < 17.0.0)
-- [yarn](https://yarnpkg.com/en/docs/install) (3.0.0 >= version)
+- [NodeJS](https://nodejs.org/en/)  (v20)
+- [yarn](https://yarnpkg.com/en/docs/install)
 
 ## Run Development Server
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -8,6 +8,9 @@
     "preview": "vite preview --port 3000",
     "lint": "eslint ./src --ext .jsx,.js,.ts,.tsx --fix --ignore-path ./.gitignore"
   },
+  "engines": {
+    "node": "^20"
+  },
   "dependencies": {
     "@emotion/react": "11.11.3",
     "@emotion/styled": "11.11.0",
@@ -31,7 +34,7 @@
     "@types/geojson": "7946.0.13",
     "@types/leaflet": "1.9.0",
     "@types/leaflet.heat": "0.2.4",
-    "@types/node": "16.18.69",
+    "@types/node": "20.10.6",
     "@types/react": "18.2.15",
     "@types/react-dom": "18.2.7",
     "@types/react-infinite-scroller": "1.2.5",

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -1130,10 +1130,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:16.18.69":
-  version: 16.18.69
-  resolution: "@types/node@npm:16.18.69"
-  checksum: d8a573b2e623868f5b3ff905eca53ac3ca02555100c3bfc6f347923eaf999965c2f0298e65743567ad7b9b8a3f4b1dc66f0cbb29a87d39c3de2fe2d5a01a0a22
+"@types/node@npm:20.10.6":
+  version: 20.10.6
+  resolution: "@types/node@npm:20.10.6"
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: 08471220d3cbbb6669835c4b78541edf5eface8f2c2e36c550cfa4ff73da73071c90e200a06359fac25d6564127597c23e178128058fb676824ec23d5178a017
   languageName: node
   linkType: hard
 
@@ -5074,7 +5076,7 @@ __metadata:
     "@types/geojson": "npm:7946.0.13"
     "@types/leaflet": "npm:1.9.0"
     "@types/leaflet.heat": "npm:0.2.4"
-    "@types/node": "npm:16.18.69"
+    "@types/node": "npm:20.10.6"
     "@types/react": "npm:18.2.15"
     "@types/react-dom": "npm:18.2.7"
     "@types/react-infinite-scroller": "npm:1.2.5"
@@ -5212,6 +5214,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~5.26.4":
+  version: 5.26.5
+  resolution: "undici-types@npm:5.26.5"
+  checksum: 0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^1.1.1":
   version: 1.1.1
   resolution: "unique-filename@npm:1.1.1"