Merge branch 'main' into chore/replace-nrk-coreicons

Author: Julusian

.github/workflows/deploy-docs.yml

@@ -28,6 +28,7 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version-file: ".node-version"
+      - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v5
         with:
@@ -38,9 +39,13 @@ jobs:
         run: |
           corepack enable
 
-          cd packages
           yarn config set cacheFolder /home/runner/publish-docs-cache
           yarn install
+
+          # setup zodern:types. No linters are setup, so this simply installs the packages
+          yarn meteor lint
+
+          cd packages
           yarn build:all
         env:
           CI: true
@@ -81,4 +86,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4

.github/workflows/node.yaml

@@ -120,7 +120,7 @@ jobs:
           node-version-file: ".node-version"
       - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             node_modules
@@ -274,7 +274,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -319,7 +319,7 @@ jobs:
         with:
           node-version-file: ".node-version"
       - name: restore node_modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             packages/node_modules
@@ -446,7 +446,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:

.github/workflows/trivy.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Run Trivy vulnerability scanner (json)
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -30,7 +30,7 @@ jobs:
           output: "${{ matrix.image }}-trivy-scan-results.json"
 
       - name: Run Trivy vulnerability scanner (table)
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -48,7 +48,7 @@ jobs:
           echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
 
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:

.node-version

@@ -1 +1 @@
-22.20.0
+22.22.0

meteor/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [26.3.0-1](https://github.com/Sofie-Automation/sofie-core/compare/v26.3.0-0...v26.3.0-1) (2026-02-11)
+
 ## [26.3.0-0](https://github.com/Sofie-Automation/sofie-core/compare/v1.52.0...v26.3.0-0) (2026-02-04)
 
 

meteor/__mocks__/defaultCollectionObjects.ts

@@ -116,8 +116,10 @@ export function defaultStudio(_id: StudioId): DBStudio {
 		routeSetsWithOverrides: wrapDefaultObject({}),
 		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
 		packageContainersWithOverrides: wrapDefaultObject({}),
-		previewContainerIds: [],
-		thumbnailContainerIds: [],
+		packageContainerSettingsWithOverrides: wrapDefaultObject({
+			previewContainerIds: [],
+			thumbnailContainerIds: [],
+		}),
 		peripheralDeviceSettings: {
 			deviceSettings: wrapDefaultObject({}),
 			playoutDevices: wrapDefaultObject({}),

meteor/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "automation-core",
-	"version": "26.3.0-0",
+	"version": "26.3.0-1",
 	"private": true,
 	"engines": {
 		"node": ">=22.20.0"
@@ -28,82 +28,78 @@
 		"i18n-extract-pot": "node ./scripts/extract-i18next-pot.mjs -f \"{./lib/**/*.+(ts|tsx),./server/**/*.+(ts|tsx),../packages/job-worker/src/**/*.+(ts|tsx),../packages/corelib/src/**/*.+(ts|tsx),../packages/webui/src/**/*.+(ts|tsx)}\" -o i18n/template.pot",
 		"i18n-compile-json": "node ./scripts/i18n-compile-json.mjs",
 		"visualize": "meteor --production --extra-packages bundle-visualizer",
-		"release": "standard-version --commit-all",
+		"release": "commit-and-tag-version --commit-all",
 		"prepareChangelog": "run release --prerelease --release-as patch",
 		"validate:all-dependencies": "run validate:prod-dependencies && run validate:dev-dependencies && run license-validate",
 		"validate:prod-dependencies": "yarn npm audit --environment production",
 		"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate"
 	},
 	"dependencies": {
-		"@babel/runtime": "^7.26.7",
+		"@babel/runtime": "^7.28.6",
 		"@koa/cors": "^5.0.0",
-		"@koa/router": "^13.1.0",
+		"@koa/router": "^15.3.0",
 		"@mos-connection/helper": "^5.0.0-alpha.0",
-		"@slack/webhook": "^7.0.4",
+		"@slack/webhook": "^7.0.6",
 		"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
 		"@sofie-automation/corelib": "portal:../packages/corelib",
 		"@sofie-automation/job-worker": "portal:../packages/job-worker",
 		"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib",
 		"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
-		"app-root-path": "^3.1.0",
-		"bcrypt": "^5.1.1",
-		"body-parser": "^1.20.3",
+		"bcrypt": "^6.0.0",
+		"body-parser": "^1.20.4",
 		"deep-extend": "0.6.0",
 		"deepmerge": "^4.3.1",
-		"elastic-apm-node": "^4.11.0",
+		"elastic-apm-node": "^4.15.0",
 		"i18next": "^21.10.0",
 		"indexof": "0.0.1",
-		"koa": "^2.15.3",
+		"koa": "^3.1.1",
 		"koa-bodyparser": "^4.4.1",
-		"koa-mount": "^4.0.0",
+		"koa-mount": "^4.2.0",
 		"koa-static": "^5.0.0",
-		"meteor-node-stubs": "^1.2.12",
+		"meteor-node-stubs": "^1.2.25",
 		"moment": "^2.30.1",
-		"nanoid": "^3.3.8",
-		"node-gyp": "^9.4.1",
+		"nanoid": "^3.3.11",
 		"ntp-client": "^0.5.3",
 		"object-path": "^0.11.8",
 		"p-lazy": "^3.1.0",
-		"semver": "^7.6.3",
+		"semver": "^7.7.3",
 		"superfly-timeline": "9.2.0",
-		"threadedclass": "^1.2.2",
+		"threadedclass": "^1.3.0",
 		"timecode": "0.0.4",
-		"type-fest": "^4.33.0",
+		"type-fest": "^4.41.0",
 		"underscore": "^1.13.7",
-		"winston": "^3.17.0"
+		"winston": "^3.19.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.26.7",
-		"@babel/plugin-transform-modules-commonjs": "^7.26.3",
+		"@babel/core": "^7.29.0",
+		"@babel/plugin-transform-modules-commonjs": "^7.28.6",
 		"@shopify/jest-koa-mocks": "^5.3.1",
 		"@sofie-automation/code-standard-preset": "^3.0.0",
-		"@types/app-root-path": "^1.2.8",
-		"@types/body-parser": "^1.19.5",
+		"@types/body-parser": "^1.19.6",
 		"@types/deep-extend": "^0.6.2",
-		"@types/jest": "^29.5.14",
-		"@types/koa": "^2.15.0",
-		"@types/koa-bodyparser": "^4.3.12",
-		"@types/koa-mount": "^4",
+		"@types/jest": "^30.0.0",
+		"@types/koa": "^3.0.1",
+		"@types/koa-bodyparser": "^4.3.13",
+		"@types/koa-mount": "^4.0.5",
 		"@types/koa-static": "^4.0.4",
-		"@types/koa__cors": "^5.0.0",
-		"@types/koa__router": "^12.0.4",
-		"@types/node": "^22.10.10",
-		"@types/request": "^2.48.12",
-		"@types/semver": "^7.5.8",
+		"@types/koa__cors": "^5.0.1",
+		"@types/node": "^22.19.8",
+		"@types/semver": "^7.7.1",
 		"@types/underscore": "^1.13.0",
-		"babel-jest": "^29.7.0",
+		"babel-jest": "^30.2.0",
+		"commit-and-tag-version": "^12.6.1",
 		"ejson": "^2.2.3",
-		"eslint": "^9.18.0",
+		"eslint": "^9.39.2",
 		"fast-clone": "^1.5.13",
-		"glob": "^11.0.1",
+		"glob": "^13.0.1",
 		"i18next-conv": "^10.2.0",
 		"i18next-scanner": "^4.6.0",
-		"jest": "^29.7.0",
+		"jest": "^30.2.0",
+		"jest-util": "^30.2.0",
 		"legally": "^3.5.10",
 		"open-cli": "^8.0.0",
-		"prettier": "^3.4.2",
-		"standard-version": "^9.5.0",
-		"ts-jest": "^29.2.5",
+		"prettier": "^3.8.1",
+		"ts-jest": "^29.4.6",
 		"typescript": "~5.7.3",
 		"yargs": "^17.7.2"
 	},
@@ -122,7 +118,7 @@
 			"server": "server/main.ts"
 		}
 	},
-	"standard-version": {
+	"commit-and-tag-version": {
 		"scripts": {
 			"postbump": "yarn libs:syncVersionsAndChangelogs && yarn install && git add yarn.lock"
 		}

meteor/scripts/babel-jest.js

@@ -1,6 +1,6 @@
 const babelJest = require('babel-jest')
 
-module.exports = babelJest.createTransformer({
+module.exports = babelJest.default.createTransformer({
 	plugins: ['@babel/plugin-transform-modules-commonjs'],
 	babelrc: false,
 	configFile: false,

meteor/server/__tests__/cronjobs.test.ts

@@ -592,8 +592,10 @@ describe('cronjobs', () => {
 				routeSetsWithOverrides: newObjectWithOverrides({}),
 				routeSetExclusivityGroupsWithOverrides: newObjectWithOverrides({}),
 				packageContainersWithOverrides: newObjectWithOverrides({}),
-				previewContainerIds: [],
-				thumbnailContainerIds: [],
+				packageContainerSettingsWithOverrides: newObjectWithOverrides({
+					previewContainerIds: [],
+					thumbnailContainerIds: [],
+				}),
 				peripheralDeviceSettings: {
 					deviceSettings: newObjectWithOverrides({}),
 					ingestDevices: newObjectWithOverrides({}),

meteor/server/api/blueprints/http.ts

@@ -179,7 +179,7 @@ blueprintsRouter.post(
 	}
 )
 
-blueprintsRouter.get('/assets/(.*)', async (ctx) => {
+blueprintsRouter.get('/assets/*splat', async (ctx) => {
 	logger.debug(`Blueprint Asset: ${ctx.socket.remoteAddress} GET "${ctx.url}"`)
 	// TODO - some sort of user verification
 	// for now just check it's a png to prevent snapshots being downloaded