Skip to content

Commit adcb31f

Browse files
committed
Merge branch 'bbc-release53' into feat/react-bootstrap
2 parents 515c002 + 6ace25b commit adcb31f

File tree

250 files changed

+6364
-3205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+6364
-3205
lines changed

.github/workflows/audit.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
- blueprints-integration
7979
- server-core-integration
8080
- shared-lib
81+
- live-status-gateway-api
8182
- playout-gateway
8283
- mos-gateway
8384
- live-status-gateway

.github/workflows/node.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ jobs:
446446
- openapi
447447
- live-status-gateway
448448
- webui
449+
- live-status-gateway-api
449450

450451
steps:
451452
- uses: actions/checkout@v4
@@ -490,6 +491,7 @@ jobs:
490491
- blueprints-integration
491492
- server-core-integration
492493
- shared-lib
494+
# - live-status-gateway-api # no tests yet
493495
- openapi
494496
node-version: [22.x]
495497
include:
@@ -576,10 +578,12 @@ jobs:
576578
CI: true
577579
- name: Run generator
578580
run: |
579-
cd packages/live-status-gateway
581+
cd packages/live-status-gateway-api
580582
581583
yarn gendocs
582584
yarn genserver
585+
586+
yarn generate-schema-types
583587
env:
584588
CI: true
585589
openapi-generation:

.github/workflows/prerelease-libs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- blueprints-integration
1919
- server-core-integration
2020
- shared-lib
21+
- live-status-gateway-api
2122

2223
steps:
2324
- uses: actions/checkout@v4
@@ -55,6 +56,8 @@ jobs:
5556
- blueprints-integration
5657
- server-core-integration
5758
- shared-lib
59+
# - live-status-gateway-api # no tests yet
60+
- openapi
5861
node-version: [22.x]
5962

6063
steps:

.vscode/settings.json.default

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"packages/shared-lib",
1010
"packages/job-worker",
1111
"packages/openapi",
12+
"packages/live-status-gateway-api",
1213
"packages/live-status-gateway",
1314
"packages/webui"
1415
],

meteor/__mocks__/_setupMocks.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ afterEach(() => {
3939
// Expect all log messages that have been explicitly supressed, to have been handled:
4040
SupressLogMessages.expectAllMessagesToHaveBeenHandled()
4141
})
42+
43+
// @ts-expect-error mock meteor runtime config
44+
global.__meteor_runtime_config__ = {}

meteor/__mocks__/helpers/database.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ export async function setupMockShowStyleBlueprint(
468468
rundown,
469469
globalAdLibPieces: [],
470470
globalActions: [],
471+
globalPieces: [],
471472
baseline: { timelineObjects: [] },
472473
}
473474
},

meteor/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"indexof": "0.0.1",
5858
"koa": "^2.15.3",
5959
"koa-bodyparser": "^4.4.1",
60+
"koa-mount": "^4.0.0",
6061
"koa-static": "^5.0.0",
6162
"meteor-node-stubs": "^1.2.12",
6263
"moment": "^2.30.1",
@@ -85,6 +86,7 @@
8586
"@types/jest": "^29.5.14",
8687
"@types/koa": "^2.15.0",
8788
"@types/koa-bodyparser": "^4.3.12",
89+
"@types/koa-mount": "^4",
8890
"@types/koa-static": "^4.0.4",
8991
"@types/koa__cors": "^5.0.0",
9092
"@types/koa__router": "^12.0.4",

meteor/server/api/__tests__/cleanup.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ async function setDefaultDatatoDB(env: DefaultEnvironment, now: number) {
410410
generationVersions: {} as any,
411411
timelineBlob: '' as any,
412412
timelineHash: '' as any,
413+
regenerateTimelineToken: undefined,
413414
})
414415
await TimelineDatastore.mutableCollection.insertAsync({
415416
_id: getRandomId(),

meteor/server/api/buckets.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as _ from 'underscore'
22
import { Meteor } from 'meteor/meteor'
3-
import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
3+
import { Bucket } from '@sofie-automation/corelib/dist/dataModel/Bucket'
44
import { getRandomId, getRandomString, literal } from '../lib/tempLib'
55
import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
66
import { AdLibAction, AdLibActionCommon } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'

meteor/server/api/ingest/packageInfo.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: P
3535
case ExpectedPackageDBType.ADLIB_ACTION:
3636
case ExpectedPackageDBType.BASELINE_ADLIB_PIECE:
3737
case ExpectedPackageDBType.BASELINE_ADLIB_ACTION:
38+
case ExpectedPackageDBType.BASELINE_PIECE:
3839
case ExpectedPackageDBType.RUNDOWN_BASELINE_OBJECTS:
3940
onUpdatedPackageInfoForRundownDebounce(pkg)
4041
break

0 commit comments

Comments
 (0)