Merge pull request #10 from phillipivan/main

Use node 22
bitfocus · Nov 30, 2024 · aff2149 · aff2149
2 parents c553e43 + 097a187
commit aff2149
Show file tree

Hide file tree

Showing 10 changed files with 2,566 additions and 2,220 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vscode/
+.yarn/
 node_modules/
 package-lock.json
 /pkg

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/companion/HELP.md b/companion/HELP.md
@@ -28,6 +28,10 @@ The Action Recorder will translate any recieved tally or connected messages into
 
 ## Version History
 
+### Version 1.2.3
+- Use Node 22
+- Update dependencies
+
 ### Version 1.2.2
 - Better logging of recieved tally/connected messages
 

diff --git a/companion/manifest.json b/companion/manifest.json
@@ -14,7 +14,7 @@
 		}
 	],
 	"runtime": {
-		"type": "node18",
+		"type": "node22",
 		"api": "nodejs-ipc",
 		"apiVersion": "0.0.0",
 		"entrypoint": "../src/main.js"

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,14 @@
+import { generateEslintConfig } from '@companion-module/tools/eslint/config.mjs'
+
+const baseConfig = await generateEslintConfig({})
+
+const customConfig = [
+	...baseConfig,
+	{
+		languageOptions: {
+			sourceType: 'module',
+		},
+	},
+]
+
+export default customConfig
diff --git a/package.json b/package.json
@@ -1,24 +1,31 @@
 {
 	"name": "generic-swp02",
-	"version": "1.2.2",
+	"version": "1.2.3",
 	"main": "src/main.js",
 	"type": "module",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"format": "prettier --write",
-		"lint:raw": "eslint --ext .ts --ext .js --ignore-pattern dist --ignore-pattern pkg",
-		"lint": "yarn lint:raw ."
+		"lint:raw": "eslint",
+		"lint": "yarn lint:raw .",
+		"package": "yarn companion-module-build"
 	},
 	"license": "MIT",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/bitfocus/companion-module-generic-swp02.git"
 	},
 	"dependencies": {
-		"@companion-module/base": "~1.8.0"
+		"@companion-module/base": "~1.11.2"
 	},
 	"devDependencies": {
-		"@companion-module/tools": "^1.5.1"
+		"@companion-module/tools": "^2.1.0",
+		"eslint": "^9.15.0",
+		"prettier": "^3.3.3"
 	},
-	"prettier": "@companion-module/tools/.prettierrc.json"
+	"prettier": "@companion-module/tools/.prettierrc.json",
+	"engines": {
+		"node": "^22.11"
+	},
+	"packageManager": "[email protected]"
 }
diff --git a/src/feedbacks.js b/src/feedbacks.js
@@ -35,7 +35,7 @@ export default async function (self) {
 				if (isNaN(dst) || dst < 0 || dst > self.config.dst) {
 					self.log(
 						'warn',
-						`feedback:checkCrosspoint:callback - invalid dest provided ${dst} from ${feedback.options.dst}`
+						`feedback:checkCrosspoint:callback - invalid dest provided ${dst} from ${feedback.options.dst}`,
 					)
 					return undefined
 				} else if (dst === 0) {

diff --git a/src/processcmd.js b/src/processcmd.js
@@ -23,7 +23,7 @@ export function processCmd(chunk) {
 			if (reply.length != msgLength.interrogate) {
 				this.log(
 					'warn',
-					` Interrogate. Unexpected Length. Expected: ${msgLength.interrogate} Recieved: ${reply.length}`
+					` Interrogate. Unexpected Length. Expected: ${msgLength.interrogate} Recieved: ${reply.length}`,
 				)
 				return undefined
 			}
@@ -58,7 +58,7 @@ export function processCmd(chunk) {
 						actionId: 'connect',
 						options: { dst: dstSrc[0], src: dstSrc[1] },
 					},
-					`connect ${dstSrc[0]}`
+					`connect ${dstSrc[0]}`,
 				)
 			}
 			break
@@ -196,7 +196,7 @@ export function processCmd(chunk) {
 			if (reply.length != msgLength.dualControllerStatusResponse) {
 				this.log(
 					'warn',
-					` dualControllerStatusResponse. Unexpected Length. Expected: ${msgLength.dualControllerStatusResponse} Recieved: ${reply.length}`
+					` dualControllerStatusResponse. Unexpected Length. Expected: ${msgLength.dualControllerStatusResponse} Recieved: ${reply.length}`,
 				)
 				return undefined
 			}
@@ -246,7 +246,7 @@ export function processCmd(chunk) {
 			}
 			this.log(
 				'warn',
-				'unit unexpectedly returned a extendedTally/extendedConnected. this module does not handle extended commands'
+				'unit unexpectedly returned a extendedTally/extendedConnected. this module does not handle extended commands',
 			)
 			break
 		case cmd.extendedConnectOnGo:
@@ -275,7 +275,7 @@ export function processCmd(chunk) {
 			if (reply.length != msgLength.routerConfigurationRequest) {
 				this.log(
 					'warn',
-					`Unexpected Length. Expected: ${msgLength.routerConfigurationRequest} Recieved: ${reply.length}`
+					`Unexpected Length. Expected: ${msgLength.routerConfigurationRequest} Recieved: ${reply.length}`,
 				)
 				return undefined
 			}
@@ -285,7 +285,7 @@ export function processCmd(chunk) {
 			if (reply.length != msgLength.routerConfigurationResponse1) {
 				this.log(
 					'warn',
-					`Unexpected Length. Expected: ${msgLength.routerConfigurationResponse1} Recieved: ${reply.length}`
+					`Unexpected Length. Expected: ${msgLength.routerConfigurationResponse1} Recieved: ${reply.length}`,
 				)
 				return undefined
 			}
@@ -295,7 +295,7 @@ export function processCmd(chunk) {
 			if (reply.length != msgLength.routerConfigurationResponse2) {
 				this.log(
 					'warn',
-					`Unexpected Length. Expected: ${msgLength.routerConfigurationResponse2} Recieved: ${reply.length}`
+					`Unexpected Length. Expected: ${msgLength.routerConfigurationResponse2} Recieved: ${reply.length}`,
 				)
 				return undefined
 			}