fix merge conflicts

Author: mateo-ivc

.eslintignore

@@ -2,4 +2,5 @@ node_modules/**/*
 build/**/*
 server/**/*
 **/__tests__/*
-scripts/**/*
+scripts/**/*
+service-worker.js

.github/dependabot.yml

@@ -15,18 +15,6 @@ updates:
     commit-message:
       prefix: "yarn"
       include: "scope"
-    groups:
-      prod-dependencies:
-        applies-to: version-updates        
-        dependency-type: "production"
-        update-types:
-        - "patch"
-        - "minor"
-      dev-dependencies:
-        dependency-type: "development"
-        update-types:
-        - "patch"
-        - "minor"
 
   # Server
   - package-ecosystem: "gomod"

.gitignore

@@ -16,6 +16,7 @@ yarn-error.log*
 # builds
 build
 server/src/main
+server/src/server
 
 # misc
 .DS_Store

nginx.conf

@@ -19,7 +19,8 @@ server {
 
     gzip on;
     gzip_vary on;
-    gzip_types text/plain text/css text/javascript application/javascript application/json;
+    gzip_comp_level 6;
+    gzip_types      text/plain text/css text/xml application/json application/javascript application/rss+xml application/atom+xml image/svg+xml;
     gzip_proxied no-cache no-store private expired auth;
     gzip_min_length 1024;
     gzip_disable "MSIE [1-6]\.";
@@ -43,9 +44,16 @@ server {
       expires 0;
     }
 
-    location ~* \.(js|jpg|jpeg|gif|png|svg|css|json)$ {
-      # Cache media files for 28 days
-      add_header Cache-Control "max-age=2419200, public";
+    location ~* \.(js|json)$ {
+        # Cache JS and JSON files for 3 days
+        expires 3d;
+        add_header Cache-Control "public, must-revalidate";
+    }
+
+    location ~* \.(jpg|jpeg|gif|png|svg|css)$ {
+        # Cache other media files for 14 days
+        expires 14d;
+        add_header Cache-Control "public";
     }
 
     location ~* \.(ico|mp3)$ {

package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/inovex/scrumlr.io/issues",
     "email": "[email protected]"
   },
-  "version": "3.6.0",
+  "version": "3.7.1",
   "private": true,
   "license": "MIT",
   "dependencies": {
@@ -22,7 +22,7 @@
     "classnames": "^2.5.1",
     "file-saver": "^2.0.5",
     "i18next": "^23.10.1",
-    "i18next-browser-languagedetector": "^7.2.0",
+    "i18next-browser-languagedetector": "^7.2.1",
     "js-cookie": "^3.0.5",
     "marked": "12.0.1",
     "plausible-tracker": "^0.3.8",
@@ -44,34 +44,28 @@
     "sockette": "^2.0.6",
     "underscore": "^1.13.6",
     "use-long-press": "^3.2.0",
-    "use-sound": "^4.0.1",
-    "workbox-core": "^7.0.0",
-    "workbox-precaching": "^7.0.0",
-    "workbox-routing": "^7.0.0"
+    "use-sound": "^4.0.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.3.4",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^14.2.1",
+    "@testing-library/react": "^14.2.2",
     "@testing-library/user-event": "^14.5.2",
     "@types/classnames": "^2.3.1",
     "@types/file-saver": "^2.0.7",
     "@types/history": "^5.0.0",
     "@types/i18next-fs-backend": "^1.1.5",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.11.27",
+    "@types/node": "^20.12.4",
     "@types/qrcode.react": "^1.0.5",
     "@types/react": "^18.2.65",
-    "@types/react-dom": "^18.2.22",
+    "@types/react-dom": "^18.2.24",
     "@types/react-helmet": "^6.1.11",
     "@types/redux-mock-store": "^1.0.6",
     "@types/smoothscroll-polyfill": "^0.3.4",
     "@types/underscore": "^1.11.15",
     "@types/uuid": "^9.0.8",
-    "@types/workbox-core": "^5.0.0",
-    "@types/workbox-precaching": "^5.0.0",
-    "@types/workbox-routing": "^5.0.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "cross-env": "^7.0.3",
@@ -86,7 +80,7 @@
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-only-warn": "^1.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "7.34.0",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "hash-files": "^1.1.1",
     "husky": "^9.0.11",
@@ -98,9 +92,9 @@
     "react-scripts": "^5.0.1",
     "redux-mock-store": "^1.5.4",
     "resize-observer-polyfill": "^1.5.1",
-    "sass": "^1.72.0",
+    "sass": "^1.74.1",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.4"
   },
   "scripts": {
     "start": "react-scripts start",