Merge branch 'release53' into feat/kairos-connection

Author: Julusian

.github/workflows/node.yaml

@@ -25,7 +25,7 @@ jobs:
           - quick-tsr
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -54,7 +54,7 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -90,7 +90,7 @@ jobs:
           # - timeline-state-resolver-api
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js ${{ matrix.node-version }}
@@ -136,7 +136,7 @@ jobs:
       # - validate-dependencies
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -212,7 +212,7 @@ jobs:
           - timeline-state-resolver-api
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -252,7 +252,7 @@ jobs:
           - timeline-state-resolver-api
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js

.github/workflows/prune-tags.yml

@@ -21,7 +21,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - name: Checkout repo with all tags
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/publish.yaml

@@ -61,7 +61,7 @@ jobs:
           # - timeline-state-resolver-api
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Use Node.js ${{ matrix.node-version }}
@@ -92,7 +92,7 @@ jobs:
     if: ${{ needs.check-publish.outputs.can-publish == '1' }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/sonar.yaml

@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.repository_owner == 'Sofie-Automation' }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0

README.md

@@ -46,6 +46,18 @@ Contrary to what your editor might say, the typings-only library cannot use depe
 
 Check the main [timeline-state-resolver](/packages/timeline-state-resolver) package for instructions on using the library and more information
 
+If you are using a TSR plugin in your own project, you can easily extend the TSR types to include your own device by adding a file into your project like `tsr-extend.d.ts`:
+
+```ts
+import type { FakeDeviceType, TimelineContentFakeAny } from './test-types.js'
+
+declare module 'timeline-state-resolver-types' {
+	interface TimelineContentMap {
+		[FakeDeviceType]: TimelineContentFakeAny
+	}
+}
+```
+
 ## Development
 
 When creating features that span the timeline-state-resolver and timeline-state-resolver-types packages - such as when creating a PR for supporting a new device - you will need to link the two packages together. To do that, after checking out a branch run:

package.json

@@ -37,24 +37,21 @@
   "devDependencies": {
     "@sofie-automation/code-standard-preset": "~2.5.2",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.19.10",
-    "@types/semver": "^7",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^20.19.25",
+    "@types/semver": "^7.7.1",
     "@types/sprintf-js": "^1.1.4",
-    "@types/underscore": "^1.11.15",
-    "@types/ws": "^8.5.12",
-    "conventional-changelog-conventionalcommits": "^4.6.3",
-    "jest": "^29.7.0",
-    "lerna": "^9.0.0",
-    "open-cli": "^7.2.0",
-    "rimraf": "^5.0.10",
+    "@types/underscore": "^1.13.0",
+    "@types/ws": "^8.18.1",
+    "jest": "^30.2.0",
+    "lerna": "^9.0.1",
+    "open-cli": "^8.0.0",
+    "rimraf": "^6.1.2",
     "semver": "^7.7.3",
-    "symlink-dir": "^5.2.1",
-    "ts-jest": "^29.2.4",
-    "ts-node": "^8.10.2",
-    "typedoc": "^0.23.28",
+    "ts-jest": "^29.4.5",
+    "typedoc": "^0.26.11",
     "typescript": "~5.1"
   },
   "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
-  "packageManager": "yarn@4.10.3"
+  "packageManager": "yarn@4.12.0"
 }

packages/quick-tsr/package.json

@@ -29,7 +29,7 @@
 		"lint": "run lint:raw .",
 		"lint-fix": "run lint --fix",
 		"inspect": "node --inspect dist/index.js",
-		"start": "run -T ts-node src/index.ts",
+		"start": "tsx src/index.ts",
 		"validate:dependencies": "yarn npm audit --environment production && run license-validate",
 		"validate:dev-dependencies": "yarn npm audit --environment development",
 		"license-validate": "run -T sofie-licensecheck",
@@ -63,10 +63,13 @@
 	"dependencies": {
 		"chokidar": "^3.6.0",
 		"fast-clone": "^1.5.13",
-		"threadedclass": "^1.2.2",
+		"threadedclass": "^1.3.0",
 		"timeline-state-resolver": "10.0.0-release53",
 		"timeline-state-resolver-types": "10.0.0-release53",
-		"tslib": "^2.6.3",
+		"tslib": "^2.8.1",
 		"underscore": "^1.13.7"
+	},
+	"devDependencies": {
+		"tsx": "^4.20.6"
 	}
 }

packages/timeline-state-resolver-api/package.json

@@ -80,7 +80,7 @@
 		"production"
 	],
 	"dependencies": {
-		"tslib": "^2.6.3"
+		"tslib": "^2.8.1"
 	},
 	"peerDependencies": {
 		"timeline-state-resolver-types": "10.0.0-release53"

packages/timeline-state-resolver-tools/bin/schema-deref.mjs

@@ -2,7 +2,7 @@
 
 import * as fs from 'fs/promises'
 import * as path from 'path'
-import $RefParser from 'json-schema-ref-parser'
+import $RefParser from '@apidevtools/json-schema-ref-parser'
 import meow from 'meow'
 
 /** ********************************************************

packages/timeline-state-resolver-tools/package.json

@@ -79,12 +79,12 @@
 		"production"
 	],
 	"dependencies": {
-		"i18next-conv": "^13.1.1",
-		"i18next-parser": "^6.6.0",
-		"json-schema-ref-parser": "^9.0.9",
-		"json-schema-to-typescript": "^10.1.5",
-		"meow": "^11.0.0",
-		"vinyl-fs": "^3.0.3"
+		"@apidevtools/json-schema-ref-parser": "^15.1.2",
+		"i18next-conv": "^16.0.0",
+		"i18next-parser": "^9.3.0",
+		"json-schema-to-typescript": "^15.0.4",
+		"meow": "^14.0.0",
+		"vinyl-fs": "^4.0.2"
 	},
 	"publishConfig": {
 		"access": "public"