Skip to content

Commit aefc95d

Browse files
JulusianJulusian
committed
Merge branch 'upstream/release52' into upstream/process-ingest-data2
2 parents 9be51e4 + 799ab71 commit aefc95d

File tree

91 files changed

+1879
-747
lines changed

Some content is hidden

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

91 files changed

+1879
-747
lines changed

‎meteor/.meteor/packages‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,14 @@
99
# but you can also edit it by hand.
1010

1111
[email protected] # Packages every Meteor app needs to have
12-
[email protected] # Packages for a great mobile UX
1312
[email protected] # The database Meteor supports right now
1413
[email protected] # Reactive variable for tracker
1514

16-
[email protected] # CSS minifier run for production mode
17-
[email protected] # JS minifier run for production mode
18-
[email protected] # ECMAScript 5 compatibility for older browsers
1915
[email protected] # Enable ECMAScript2015+ syntax in app code
2016
[email protected] # Enable TypeScript syntax in .ts and .tsx modules
2117
[email protected] # Server-side component of the `meteor shell` command
22-
[email protected] # Select when to allow use of the "modern" bundle
23-
24-
[email protected] # Define static page content in .html files
25-
react-meteor-data # React higher-order component for reactively tracking Meteor data
2618

2719
[email protected] # Meteor's client-side reactive programming library
28-
[email protected]
29-
fourseven:scss
3020

3121
[email protected]
3222
ostrio:meteor-root

‎meteor/.meteor/versions‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ [email protected]
66
[email protected]
77
[email protected]
88
[email protected]
9-
[email protected]
109
[email protected]
11-
[email protected]
12-
[email protected]
1310
[email protected]
1411
[email protected]
1512
[email protected]
@@ -27,25 +24,17 @@ [email protected]
2724
[email protected]
2825
[email protected]
2926
[email protected]
30-
fourseven:[email protected]
3127
[email protected]
3228
[email protected]
33-
[email protected]
34-
[email protected]
3529
[email protected]
3630
[email protected]
3731
julusian:[email protected]
3832
kschingiz:[email protected]
39-
[email protected]
4033
[email protected]
4134
[email protected]
4235
[email protected]
4336
[email protected]
44-
[email protected]
45-
[email protected]
4637
[email protected]
47-
[email protected]
48-
[email protected]
4938
[email protected]
5039
[email protected]
5140
[email protected]
@@ -60,21 +49,13 @@ [email protected]
6049
[email protected]
6150
[email protected]
6251
[email protected]
63-
[email protected]
64-
[email protected]
6552
[email protected]
6653
[email protected]
6754
[email protected]
6855
[email protected]
69-
[email protected]
7056
[email protected]
7157
[email protected]
7258
[email protected]
73-
[email protected]
74-
[email protected]
75-
[email protected]
76-
[email protected]
77-
[email protected]
7859
[email protected]
7960
[email protected]
8061
[email protected]

‎meteor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"object-path": "^0.11.8",
6868
"p-lazy": "^3.1.0",
6969
"semver": "^7.5.4",
70-
"superfly-timeline": "9.0.1",
70+
"superfly-timeline": "9.0.2",
7171
"threadedclass": "^1.2.2",
7272
"timecode": "0.0.4",
7373
"type-fest": "^3.13.1",

‎meteor/server/main.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,11 @@
33
*/
44

55
import { Meteor } from 'meteor/meteor'
6-
import { setMinimumBrowserVersions } from 'meteor/modern-browsers'
76

87
Meteor.startup(() => {
98
console.log('startup')
109
})
1110

12-
setMinimumBrowserVersions(
13-
{
14-
chrome: 80,
15-
firefox: 74,
16-
edge: 80,
17-
ie: Infinity,
18-
mobile_safari: [13, 4],
19-
opera: 67,
20-
safari: [13, 1],
21-
electron: 6,
22-
},
23-
'optional chaining'
24-
)
25-
2611
// Import all files that register Meteor methods:
2712
import './api/blueprints/api'
2813
import './api/blueprints/http'

‎meteor/server/publications/lib/quickLoop.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { MarkerPosition, compareMarkerPositions } from '@sofie-automation/coreli
99
import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
1010
import { DEFAULT_FALLBACK_PART_DURATION } from '@sofie-automation/shared-lib/dist/core/constants'
1111
import { getCurrentTime } from '../../lib/lib'
12-
import { generateTranslation } from '@sofie-automation/meteor-lib/dist/lib'
12+
import { generateTranslation } from '@sofie-automation/corelib/dist/lib'
1313
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
1414
import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
1515
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'

‎meteor/yarn.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ __metadata:
12111211
node-fetch: ^2.7.0
12121212
p-lazy: ^3.1.0
12131213
p-timeout: ^4.1.0
1214-
superfly-timeline: 9.0.1
1214+
superfly-timeline: 9.0.2
12151215
threadedclass: ^1.2.2
12161216
tslib: ^2.6.2
12171217
type-fest: ^3.13.1
@@ -2349,7 +2349,7 @@ __metadata:
23492349
prettier: ^2.8.8
23502350
semver: ^7.5.4
23512351
standard-version: ^9.5.0
2352-
superfly-timeline: 9.0.1
2352+
superfly-timeline: 9.0.2
23532353
threadedclass: ^1.2.2
23542354
timecode: 0.0.4
23552355
ts-jest: ^29.1.2
@@ -10026,12 +10026,12 @@ __metadata:
1002610026
languageName: node
1002710027
linkType: hard
1002810028

10029-
"superfly-timeline@npm:9.0.1":
10030-
version: 9.0.1
10031-
resolution: "superfly-timeline@npm:9.0.1"
10029+
"superfly-timeline@npm:9.0.2":
10030+
version: 9.0.2
10031+
resolution: "superfly-timeline@npm:9.0.2"
1003210032
dependencies:
1003310033
tslib: ^2.6.0
10034-
checksum: 4267eed691fe9ce9f89bf17c8aed1a98206938dd6d850c64b083e4fd3a3dc5329801c76c757450c9520375bad100ce512cc6d6a3e4a997bdfa14a4e7d65f09f2
10034+
checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
1003510035
languageName: node
1003610036
linkType: hard
1003710037

‎packages/blueprints-integration/CHANGELOG.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
7+
8+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9+
10+
11+
12+
13+
14+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
15+
16+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
17+
18+
19+
20+
21+
22+
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
23+
24+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
25+
26+
27+
28+
29+
30+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
31+
32+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
33+
34+
35+
36+
37+
38+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
39+
40+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
41+
42+
43+
44+
45+
646
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
747

848
**Note:** Version bump only for package @sofie-automation/blueprints-integration

‎packages/blueprints-integration/src/context/adlibActionContext.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { IShowStyleUserContext } from './showStyleContext'
44
import { IPartAndPieceActionContext } from './partsAndPieceActionContext'
55
import { IExecuteTSRActionsContext } from './executeTsrActionContext'
66
import { IBlueprintPart, IBlueprintPartInstance, IBlueprintPiece } from '..'
7+
import { IRouteSetMethods } from './routeSetContext'
78

89
/** Actions */
910
export interface IDataStoreMethods {
@@ -24,7 +25,8 @@ export interface IActionExecutionContext
2425
IEventContext,
2526
IDataStoreMethods,
2627
IPartAndPieceActionContext,
27-
IExecuteTSRActionsContext {
28+
IExecuteTSRActionsContext,
29+
IRouteSetMethods {
2830
/** Fetch the showstyle config for the specified part */
2931
// getNextShowStyleConfig(): Readonly<{ [key: string]: ConfigItemValue }>
3032

@@ -38,8 +40,6 @@ export interface IActionExecutionContext
3840
/** Insert a queued part to follow the current part */
3941
queuePart(part: IBlueprintPart, pieces: IBlueprintPiece[]): Promise<IBlueprintPartInstance>
4042

41-
/** Switch RouteSet State*/
42-
switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
4343
/** Misc actions */
4444
// updateAction(newManifest: Pick<IBlueprintAdLibActionManifest, 'description' | 'payload'>): void // only updates itself. to allow for the next one to do something different
4545
// executePeripheralDeviceAction(deviceId: string, functionName: string, args: any[]): Promise<any>

‎packages/blueprints-integration/src/context/routeSetContext.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { StudioRouteSet } from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
2+
3+
export interface IRouteSetMethods {
4+
/** Returns a list of the Routesets */
5+
listRouteSets(): Promise<Record<string, StudioRouteSet>>
6+
7+
/** Switch RouteSet State */
8+
switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
9+
}

‎packages/blueprints-integration/src/documents/part.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ export interface IBlueprintMutatablePart<TPrivateData = unknown, TPublicData = u
5555
/** Expected duration of the line, in milliseconds */
5656
expectedDuration?: number
5757

58-
/** Budget duration of this part, in milliseconds */
59-
budgetDuration?: number
60-
6158
/** Whether this segment line supports being used in HOLD */
6259
holdMode?: PartHoldMode
6360

0 commit comments

Comments
 (0)