Skip to content

Commit

Permalink
Merge pull request #180 from tv2/SOF-1281/bumpToVersion46.1
Browse files Browse the repository at this point in the history
chore: SOF-1281 Bump version to 46.1
  • Loading branch information
LindvedKrvang authored Dec 12, 2022
2 parents 2fe5947 + ac51e10 commit 2637115
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = env => {
// versionIntegration = versionIntegration.replace(/[^\d.]/g, '') || '0.0.0'

versionTSRTypes = '1.3.0'
versionIntegration = '46.0.0'
versionIntegration = '46.1.0'

const entrypoints = env.bundle ? GetEntrypointsForBundle(env.bundle) : BlueprintEntrypoints

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"webpack-cli": "^3.1.2"
},
"dependencies": {
"@sofie-automation/blueprints-integration": "npm:@tv2media/blueprints-integration@46.0.2",
"@sofie-automation/blueprints-integration": "npm:@tv2media/blueprints-integration@46.1.0",
"underscore": "^1.12.1"
},
"resolutions": {
Expand Down
8 changes: 4 additions & 4 deletions src/tv2-common/helpers/__tests__/serverResume.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('Server Resume', () => {
partInstanceId: 'mock_1',
resolvedStart: 1000,
resolvedDuration: 10000,
dynamicallyInserted: 1,
dynamicallyInserted: { time: 1 },
piece: {
_id: '',
enable: { start: 'now' },
Expand Down Expand Up @@ -69,7 +69,7 @@ describe('Server Resume', () => {
partInstanceId: 'mock_1',
startedPlayback: 1000,
resolvedStart: 2000,
dynamicallyInserted: 1,
dynamicallyInserted: { time: 1 },
piece: {
_id: '',
enable: { start: 'now' },
Expand Down Expand Up @@ -109,7 +109,7 @@ describe('Server Resume', () => {
_id: '',
partInstanceId: 'mock_1',
resolvedStart: 1000,
dynamicallyInserted: 1,
dynamicallyInserted: { time: 1 },
piece: {
_id: '',
enable: { start: 'now' },
Expand Down Expand Up @@ -155,7 +155,7 @@ describe('Server Resume', () => {
_id: '',
partInstanceId: 'mock_1',
resolvedStart: 1000,
dynamicallyInserted: 1,
dynamicallyInserted: { time: 1 },
piece: {
_id: '',
enable: { start: 'now' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ describe('Sync Ingest Changes To Part Instances', () => {
makeSoundBed('someId4', 'SN_Intro', {
infinite: { infinitePieceId: 'someInfinite', fromPreviousPart: false, fromHold: true }
}),
makeSoundBed('someId5', 'SN_Intro', { dynamicallyInserted: 1649158767173 })
makeSoundBed('someId5', 'SN_Intro', { dynamicallyInserted: { time: 1649158767173 } })
]
})
const newPart: BlueprintSyncIngestNewData = literal<BlueprintSyncIngestNewData>({
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -560,20 +560,20 @@
dependencies:
"@sinonjs/commons" "^1.7.0"

"@sofie-automation/blueprints-integration@npm:@tv2media/blueprints-integration@46.0.2":
version "46.0.1"
resolved "https://registry.yarnpkg.com/@tv2media/blueprints-integration/-/blueprints-integration-46.0.1.tgz#e344f31e3fcc48d582914ebc33378a626cebd0e6"
integrity sha512-y0ITMUH0JrDligG9X+mWsvVnnGYmZJTrx5iE2XVsHiQ1xQTeBrqDyoxOag2lpbUIF8HI7mXCQkGfk7AYvQLopQ==
"@sofie-automation/blueprints-integration@npm:@tv2media/blueprints-integration@46.1.0":
version "46.1.0"
resolved "https://registry.yarnpkg.com/@tv2media/blueprints-integration/-/blueprints-integration-46.1.0.tgz#9b2b6f776ecdcd1d0009853bc300452a771a36d5"
integrity sha512-y02lVzd0rNpxyRVUF3FJcnW0uF56Zjc2rsKugZzimd7+XjWSZfFx0Ic35n1Vm2S1+rvb4oSVEh9pvPbpWrCiFg==
dependencies:
"@sofie-automation/shared-lib" "npm:@tv2media/shared-lib@46.0.0"
timeline-state-resolver-types "npm:@tv2media/timeline-state-resolver-types@2.2.3"
"@sofie-automation/shared-lib" "npm:@tv2media/shared-lib@46.1.0"
timeline-state-resolver-types "npm:@tv2media/timeline-state-resolver-types@2.3.1"
tslib "^2.4.0"
type-fest "^2.19.0"

"@sofie-automation/shared-lib@npm:@tv2media/shared-lib@46.0.0":
version "46.0.0"
resolved "https://registry.yarnpkg.com/@tv2media/shared-lib/-/shared-lib-46.0.0.tgz#27ce22985d205b99dd5c06321dd68e0cd80536e4"
integrity sha512-TYWB37qMCScqm8a12b2Uq3h4ZewUtLnIMEnThymkXMViMywGgzRTk44j7gAulFr1u8aPuIE6cJchbw9KeRZcYg==
"@sofie-automation/shared-lib@npm:@tv2media/shared-lib@46.1.0":
version "46.1.0"
resolved "https://registry.yarnpkg.com/@tv2media/shared-lib/-/shared-lib-46.1.0.tgz#ea13b33b0be2feb5cc3d821a6fe992c865f73c5f"
integrity sha512-87h3/w/9vuP6fafH3If8S5j6PlLDSwZGJ1vghpXHHSMtqMV5pm5KZPuT80hGITxXO5GNF1JizaX52Lvb3L6iWw==
dependencies:
tslib "^2.4.0"
type-fest "^2.19.0"
Expand Down Expand Up @@ -5956,10 +5956,10 @@ through@2, "through@>=2.2.7 <3":
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=

"timeline-state-resolver-types@npm:@tv2media/timeline-state-resolver-types@2.2.3":
version "2.2.3"
resolved "https://registry.yarnpkg.com/@tv2media/timeline-state-resolver-types/-/timeline-state-resolver-types-2.2.3.tgz#4b40293b564d1c774e98dab193e719ba0cf3854c"
integrity sha512-Dj+hXIYrl6OCozBfK5ZkRQkyXPwmZKjRY+wwLw04+sJdnCqTT2W+42ZvH+pVu3MKd/GFGeF9N+7aWa02ITaDRg==
"timeline-state-resolver-types@npm:@tv2media/timeline-state-resolver-types@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@tv2media/timeline-state-resolver-types/-/timeline-state-resolver-types-2.3.1.tgz#8c29069c84ea086d9eb9e48e5f2f244cc5f1e823"
integrity sha512-T78ObNn8pd4we4fCdX4VcUDeSRV+X0L//tdmLFEaHqrAMY3TBAS36oTsLHvU+az5m1wqns7EBXFbu9FystVQFQ==
dependencies:
tslib "^2.3.1"

Expand Down

0 comments on commit 2637115

Please sign in to comment.