Merge pull request #300 from tv2/chore/update-dependencies

Chore/update dependencies
tv2 · Jan 29, 2024 · ed03e44 · ed03e44
2 parents 22b7aae + 47c25d5
commit ed03e44
Show file tree

Hide file tree

Showing 6 changed files with 1,177 additions and 900 deletions.
diff --git a/client/package.json b/client/package.json
@@ -10,33 +10,33 @@
     },
     "devDependencies": {
         "@types/node": "^18.16.0",
-        "@types/react-dom": "^18.2.4",
-        "@types/react-test-renderer": "^18.0.0",
-        "@babel/core": "^7.22.10",
-        "css-loader": "^6.7.3",
-        "html-webpack-plugin": "^5.5.1",
+        "@types/react-dom": "^18.2.18",
+        "@types/react-test-renderer": "^18.0.7",
+        "@babel/core": "^7.23.9",
+        "css-loader": "^6.9.1",
+        "html-webpack-plugin": "^5.6.0",
         "react-test-renderer": "^18.2.0",
-        "style-loader": "^3.3.2",
-        "ts-loader": "^9.4.2",
-        "typescript": "^5.0.4",
-        "webpack": "^5.82.1",
-        "webpack-cli": "^5.1.1",
-        "classnames": "^2.3.2",
+        "style-loader": "^3.3.4",
+        "ts-loader": "^9.5.1",
+        "typescript": "^5.3.3",
+        "webpack": "^5.90.0",
+        "webpack-cli": "^5.1.4",
+        "classnames": "^2.5.1",
         "i18next": "^20.6.1",
-        "i18next-browser-languagedetector": "^7.0.1",
-        "nouislider": "^15.7.0",
-        "nouislider-react": "^3.4.1",
+        "i18next-browser-languagedetector": "^7.2.0",
+        "nouislider": "^15.7.1",
+        "nouislider-react": "^3.4.2",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-draggable": "^4.4.5",
+        "react-draggable": "^4.4.6",
         "react-i18next": "^12.2.2",
-        "react-redux": "^8.0.5",
-        "react-select": "^5.7.3",
-        "react-slider": "^2.0.4",
-        "reactjs-popup": "^2.0.5",
-        "redux": "^4.2.1",
-        "socket.io-client": "^4.6.2",
+        "react-redux": "^9.1.0",
+        "react-select": "^5.8.0",
+        "react-slider": "^2.0.6",
+        "reactjs-popup": "^2.0.6",
+        "redux": "^5.0.1",
+        "socket.io-client": "^4.7.4",
         "webmidi": "^2.5.1"
     }
 }
diff --git a/package.json b/package.json
@@ -73,14 +73,15 @@
     "cross-env": "^7.0.3"
   },
   "devDependencies": {
-    "concurrently": "^8.0.1",
-    "lint-staged": "^13.2.2",
+    "concurrently": "^8.2.2",
+    "lint-staged": "^15.2.0",
     "node-license-validator": "^1.3.2",
-    "prettier": "^2.8.8",
-    "rimraf": "^5.0.0"
+    "prettier": "^3.2.4",
+    "rimraf": "^5.0.5"
   },
   "resolutions": {
     "xml2js": "^0.5.0",
-    "socket.io-parser": "^4.2.3"
+    "socket.io-parser": "^4.2.3",
+    "axios": "^1.6.0"
   }
 }
diff --git a/server/package.json b/server/package.json
@@ -9,28 +9,28 @@
         "test:watch": "jest --watch"
     },
     "devDependencies": {
-        "@types/express": "^4.17.17",
-        "@types/jest": "^29.5.1",
+        "@types/express": "^4.17.21",
+        "@types/jest": "^29.5.11",
         "@types/node": "^18.16.0",
-        "@types/webmidi": "^2.0.7",
-        "jest": "^29.5.0",
-        "ts-jest": "^29.1.0",
-        "typescript": "^5.0.4"
+        "@types/webmidi": "^2.0.10",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.1.2",
+        "typescript": "^5.3.3"
     },
     "dependencies": {
-        "@babel/core": "^7.22.10",
-        "@tv2media/logger": "^2.0.1",
-        "atem-connection": "^3.2.0",
+        "@babel/core": "^7.23.9",
+        "@tv2media/logger": "^2.0.2",
+        "atem-connection": "^3.4.0",
         "casparcg-connection": "^5.1.0",
         "emberplus-connection": "^0.2.1",
         "express": "^4.18.2",
         "node-emberplus": "^3.0.5",
         "node-vmix": "^1.6.1",
         "osc": "^2.4.4",
         "performance-now": "^2.1.0",
-        "redux": "^4.2.1",
-        "socket.io": "^4.6.2",
-        "tslib": "^2.5.0",
+        "redux": "^5.0.1",
+        "socket.io": "^4.7.4",
+        "tslib": "^2.6.2",
         "vmix-js-utils": "^4.0.16",
         "web-midi-api": "^2.2.5",
         "webmidi": "^2.5.1",

diff --git a/server/src/utils/labels.ts b/server/src/utils/labels.ts
@@ -1,15 +1,15 @@
-import { IStore } from '../../../shared/src/reducers/store'
+import { IchMixerConnection } from '../../../shared/src/reducers/channelsReducer'
 import { state } from '../reducers/store'
 
 export function getChannelLabel(
-    state: IStore,
+    chMixerConnection: IchMixerConnection[],
     faderIndex: number
 ): string | undefined {
-    return state.channels[0].chMixerConnection
+    return chMixerConnection
         .map((conn) =>
-            conn.channel.map((ch) => ({
-                assignedFader: ch.assignedFader,
-                label: ch.label,
+            conn?.channel.map((ch) => ({
+                assignedFader: ch?.assignedFader,
+                label: ch?.label,
             }))
         )
         .reduce((a, b) => [...a, ...b], []) // flatten
@@ -28,7 +28,7 @@ export function getFaderLabel(faderIndex: number, defaultName = 'CH'): string {
         state.faders[0].fader[faderIndex].userLabel !== ''
             ? state.faders[0].fader[faderIndex].userLabel
             : undefined
-    const channelLabel = getChannelLabel(state, faderIndex)
+    const channelLabel = getChannelLabel(state.channels[0].chMixerConnection, faderIndex)
 
     switch (state.settings[0].labelType) {
         case 'automation':

diff --git a/shared/package.json b/shared/package.json
@@ -7,6 +7,6 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "redux": "^4.2.1"
+    "redux": "^5.0.1"
   }
 }