Merge remote-tracking branch 'origin/upstream/set-next-from-here' into bbc-release52

Author: PeterC89

meteor/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "automation-core",
-	"version": "1.52.0-in-testing.0",
+	"version": "1.53.0-in-development",
 	"private": true,
 	"engines": {
 		"node": ">=22.11"
@@ -103,7 +103,7 @@
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-prettier": "^4.2.1",
 		"fast-clone": "^1.5.13",
-		"glob": "^8.1.0",
+		"glob": "^11.0.1",
 		"i18next-conv": "^10.2.0",
 		"i18next-scanner": "^4.6.0",
 		"jest": "^29.7.0",

meteor/scripts/extract-i18next-pot.mjs

@@ -27,12 +27,11 @@
  * SOFTWARE.
  */
 
-import { promisify } from 'util'
 import fs from 'fs'
 import yargs from 'yargs'
 import { Parser } from 'i18next-scanner'
 import converter from 'i18next-conv'
-import glob from 'glob'
+import { glob } from 'glob'
 
 const args = yargs(process.argv)
 	.option('files', {
@@ -66,8 +65,6 @@ const args = yargs(process.argv)
 	.help()
 	.alias('help', 'h').argv
 
-const pGlob = promisify(glob)
-
 const parserOptions = {
 	// Include react helpers into parsing
 	attr: {
@@ -101,7 +98,7 @@ console.log('Extracting translatable strings...')
 console.log('This process may print out some error messages, but the translation template should work fine.')
 console.log('──────\n')
 
-const files = await pGlob(fileGlob)
+const files = await glob(fileGlob)
 
 // console.debug('Loading content of ' + files.length + ' files')
 

meteor/scripts/i18n-compile-json.mjs

@@ -1,9 +1,6 @@
-import { promisify } from 'util'
-import glob from 'glob'
+import { glob } from 'glob'
 import { spawn } from 'child_process'
 
-const pGlob = promisify(glob)
-
 /*************************************************
 
 This script goes through all of the languages (.po files)
@@ -14,7 +11,7 @@ and compiles the json-files (used in production).
 const errors = []
 const failedLanguages = []
 // List all po-files:
-const poFiles = await pGlob('./i18n/*.po')
+const poFiles = await glob('./i18n/*.po')
 
 const languages = []
 for (const poFile of poFiles) {

meteor/server/migration/currentSystemVersion.ts

@@ -51,7 +51,8 @@
  * 1.50.0: Release 50 (2024-02-23)
  * 1.51.0: Release 51 (TBD)
  * 1.52.0: Release 52 (TBD)
+ * 1.53.0: Release 53 (TBD)
  */
 
 // Note: Only set this to release versions, (ie X.Y.Z), not pre-releases (ie X.Y.Z-0-pre-release)
-export const CURRENT_SYSTEM_VERSION = '1.52.0'
+export const CURRENT_SYSTEM_VERSION = '1.53.0'

meteor/yarn.lock

@@ -1078,7 +1078,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/blueprints-integration@portal:../packages/blueprints-integration::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/shared-lib": "npm:1.52.0-in-testing.0"
+    "@sofie-automation/shared-lib": "npm:1.53.0-in-development"
     tslib: "npm:^2.8.1"
     type-fest: "npm:^4.33.0"
   languageName: node
@@ -1119,8 +1119,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/corelib@portal:../packages/corelib::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/blueprints-integration": "npm:1.52.0-in-testing.0"
-    "@sofie-automation/shared-lib": "npm:1.52.0-in-testing.0"
+    "@sofie-automation/blueprints-integration": "npm:1.53.0-in-development"
+    "@sofie-automation/shared-lib": "npm:1.53.0-in-development"
     fast-clone: "npm:^1.5.13"
     i18next: "npm:^21.10.0"
     influx: "npm:^5.9.7"
@@ -1151,9 +1151,9 @@ __metadata:
   resolution: "@sofie-automation/job-worker@portal:../packages/job-worker::locator=automation-core%40workspace%3A."
   dependencies:
     "@slack/webhook": "npm:^7.0.4"
-    "@sofie-automation/blueprints-integration": "npm:1.52.0-in-testing.0"
-    "@sofie-automation/corelib": "npm:1.52.0-in-testing.0"
-    "@sofie-automation/shared-lib": "npm:1.52.0-in-testing.0"
+    "@sofie-automation/blueprints-integration": "npm:1.53.0-in-development"
+    "@sofie-automation/corelib": "npm:1.53.0-in-development"
+    "@sofie-automation/shared-lib": "npm:1.53.0-in-development"
     amqplib: "npm:^0.10.5"
     deepmerge: "npm:^4.3.1"
     elastic-apm-node: "npm:^4.11.0"
@@ -1173,9 +1173,9 @@ __metadata:
   resolution: "@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A."
   dependencies:
     "@mos-connection/helper": "npm:^4.2.2"
-    "@sofie-automation/blueprints-integration": "npm:1.52.0-in-testing.0"
-    "@sofie-automation/corelib": "npm:1.52.0-in-testing.0"
-    "@sofie-automation/shared-lib": "npm:1.52.0-in-testing.0"
+    "@sofie-automation/blueprints-integration": "npm:1.53.0-in-development"
+    "@sofie-automation/corelib": "npm:1.53.0-in-development"
+    "@sofie-automation/shared-lib": "npm:1.53.0-in-development"
     deep-extend: "npm:0.6.0"
     semver: "npm:^7.6.3"
     type-fest: "npm:^4.33.0"
@@ -2259,7 +2259,7 @@ __metadata:
     eslint-plugin-node: "npm:^11.1.0"
     eslint-plugin-prettier: "npm:^4.2.1"
     fast-clone: "npm:^1.5.13"
-    glob: "npm:^8.1.0"
+    glob: "npm:^11.0.1"
     i18next: "npm:^21.10.0"
     i18next-conv: "npm:^10.2.0"
     i18next-scanner: "npm:^4.6.0"
@@ -5098,6 +5098,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^11.0.1":
+  version: 11.0.1
+  resolution: "glob@npm:11.0.1"
+  dependencies:
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^4.0.1"
+    minimatch: "npm:^10.0.0"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^2.0.0"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10/57b12a05cc25f1c38f3b24cf6ea7a8bacef11e782c4b9a8c5b0bef3e6c5bcb8c4548cb31eb4115592e0490a024c1bde7359c470565608dd061d3b21179740457
+  languageName: node
+  linkType: hard
+
 "glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
@@ -5112,7 +5128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1, glob@npm:^8.1.0":
+"glob@npm:^8.0.1":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
@@ -6174,6 +6190,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jackspeak@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "jackspeak@npm:4.0.2"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+  checksum: 10/d9722f0e55f6c322c57aedf094c405f4201b834204629817187953988075521cfddb23df83e2a7b845723ca7eb0555068c5ce1556732e9c275d32a531881efa8
+  languageName: node
+  linkType: hard
+
 "jake@npm:^10.8.5":
   version: 10.9.2
   resolution: "jake@npm:10.9.2"
@@ -7093,6 +7118,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^11.0.0":
+  version: 11.0.2
+  resolution: "lru-cache@npm:11.0.2"
+  checksum: 10/25fcb66e9d91eaf17227c6abfe526a7bed5903de74f93bfde380eb8a13410c5e8d3f14fe447293f3f322a7493adf6f9f015c6f1df7a235ff24ec30f366e1c058
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^5.1.1":
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
@@ -7462,6 +7494,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "minimatch@npm:10.0.1"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/082e7ccbc090d5f8c4e4e029255d5a1d1e3af37bda837da2b8b0085b1503a1210c91ac90d9ebfe741d8a5f286ece820a1abb4f61dc1f82ce602a055d461d93f3
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -7596,6 +7637,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 10/c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950
+  languageName: node
+  linkType: hard
+
 "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
@@ -8355,6 +8403,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"package-json-from-dist@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "package-json-from-dist@npm:1.0.1"
+  checksum: 10/58ee9538f2f762988433da00e26acc788036914d57c71c246bf0be1b60cdbd77dd60b6a3e1a30465f0b248aeb80079e0b34cb6050b1dfa18c06953bb1cbc7602
+  languageName: node
+  linkType: hard
+
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
@@ -8487,6 +8542,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-scurry@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "path-scurry@npm:2.0.0"
+  dependencies:
+    lru-cache: "npm:^11.0.0"
+    minipass: "npm:^7.1.2"
+  checksum: 10/285ae0c2d6c34ae91dc1d5378ede21981c9a2f6de1ea9ca5a88b5a270ce9763b83dbadc7a324d512211d8d36b0c540427d3d0817030849d97a60fa840a2c59ec
+  languageName: node
+  linkType: hard
+
 "path-to-regexp@npm:^6.3.0":
   version: 6.3.0
   resolution: "path-to-regexp@npm:6.3.0"

packages/blueprints-integration/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/blueprints-integration",
-	"version": "1.52.0-in-testing.0",
+	"version": "1.53.0-in-development",
 	"description": "Library to define the interaction between core and the blueprints.",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -38,7 +38,7 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/shared-lib": "1.52.0-in-testing.0",
+		"@sofie-automation/shared-lib": "1.53.0-in-development",
 		"tslib": "^2.8.1",
 		"type-fest": "^4.33.0"
 	},

packages/corelib/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/corelib",
-	"version": "1.52.0-in-testing.0",
+	"version": "1.53.0-in-development",
 	"private": true,
 	"description": "Internal library for some types shared by core and workers",
 	"main": "dist/index.js",
@@ -39,8 +39,8 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.52.0-in-testing.0",
-		"@sofie-automation/shared-lib": "1.52.0-in-testing.0",
+		"@sofie-automation/blueprints-integration": "1.53.0-in-development",
+		"@sofie-automation/shared-lib": "1.53.0-in-development",
 		"fast-clone": "^1.5.13",
 		"i18next": "^21.10.0",
 		"influx": "^5.9.7",

packages/documentation/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sofie-documentation",
-	"version": "1.52.0-in-testing.0",
+	"version": "1.53.0-in-development",
 	"private": true,
 	"scripts": {
 		"docusaurus": "docusaurus",

packages/job-worker/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/job-worker",
-	"version": "1.52.0-in-testing.0",
+	"version": "1.53.0-in-development",
 	"description": "Worker for things",
 	"main": "dist/index.js",
 	"license": "MIT",
@@ -41,9 +41,9 @@
 	],
 	"dependencies": {
 		"@slack/webhook": "^7.0.4",
-		"@sofie-automation/blueprints-integration": "1.52.0-in-testing.0",
-		"@sofie-automation/corelib": "1.52.0-in-testing.0",
-		"@sofie-automation/shared-lib": "1.52.0-in-testing.0",
+		"@sofie-automation/blueprints-integration": "1.53.0-in-development",
+		"@sofie-automation/corelib": "1.53.0-in-development",
+		"@sofie-automation/shared-lib": "1.53.0-in-development",
 		"amqplib": "^0.10.5",
 		"deepmerge": "^4.3.1",
 		"elastic-apm-node": "^4.11.0",

packages/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.52.0-in-testing.0",
-  "npmClient": "yarn",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+	"version": "1.53.0-in-development",
+	"npmClient": "yarn",
+	"$schema": "node_modules/lerna/schemas/lerna-schema.json"
+}