Skip to content

Commit c1fe769

Browse files
JulusianJulusian
committed
chore: fix merge
1 parent 8ff4e14 commit c1fe769

File tree

7 files changed

+34
-163
lines changed

7 files changed

+34
-163
lines changed

‎meteor/yarn.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -888,23 +888,23 @@ __metadata:
888888
languageName: node
889889
linkType: hard
890890

891-
"@mos-connection/helper@npm:^4.2.0":
892-
version: 4.2.0
893-
resolution: "@mos-connection/helper@npm:4.2.0"
891+
"@mos-connection/helper@npm:^4.2.2":
892+
version: 4.2.2
893+
resolution: "@mos-connection/helper@npm:4.2.2"
894894
dependencies:
895-
"@mos-connection/model": "npm:4.2.0"
895+
"@mos-connection/model": "npm:4.2.2"
896896
iconv-lite: "npm:^0.6.3"
897897
tslib: "npm:^2.5.3"
898898
xml-js: "npm:^1.6.11"
899899
xmlbuilder: "npm:^15.1.1"
900-
checksum: 10c0/3cbea09a34e23c5af66632467f4876f3b60d009896904584315d80585cefd265d928a262d7cbab35f7734f919ec2194865abed75a3be41ea8903cc3128638000
900+
checksum: 10c0/778fe6327be5c0a632f0844ad05f2c29174f1ceab19de9ce85591ddbf1250884381a215511e8e0cff35612a873135cabe588e921382382439cd3b7296ffdb255
901901
languageName: node
902902
linkType: hard
903903

904-
"@mos-connection/model@npm:4.2.0, @mos-connection/model@npm:^4.2.0":
905-
version: 4.2.0
906-
resolution: "@mos-connection/model@npm:4.2.0"
907-
checksum: 10c0/b965e0bb91744d35a0577c3ddb5269e8f42f32a9c9a4f6ec657fdb28c927fa7878440d960bb1886f8b7564f0194ed485fd390e51de449abe11034e0116b7565d
904+
"@mos-connection/model@npm:4.2.2, @mos-connection/model@npm:^4.2.2":
905+
version: 4.2.2
906+
resolution: "@mos-connection/model@npm:4.2.2"
907+
checksum: 10c0/3c6998417db60a59320a529f107c91b41e399f8ae6aa3107a1f0ae68370897baa3ef9580d33107cbf9c5924979e490a422b315e347392101f4c5fa03efe039fe
908908
languageName: node
909909
linkType: hard
910910

@@ -1172,7 +1172,7 @@ __metadata:
11721172
version: 0.0.0-use.local
11731173
resolution: "@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A."
11741174
dependencies:
1175-
"@mos-connection/helper": "npm:^4.2.0"
1175+
"@mos-connection/helper": "npm:^4.2.2"
11761176
"@sofie-automation/blueprints-integration": "npm:1.52.0-in-development"
11771177
"@sofie-automation/corelib": "npm:1.52.0-in-development"
11781178
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
@@ -1190,7 +1190,7 @@ __metadata:
11901190
version: 0.0.0-use.local
11911191
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
11921192
dependencies:
1193-
"@mos-connection/model": "npm:^4.2.0"
1193+
"@mos-connection/model": "npm:^4.2.2"
11941194
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
11951195
tslib: "npm:^2.8.1"
11961196
type-fest: "npm:^4.32.0"
@@ -2219,7 +2219,7 @@ __metadata:
22192219
"@babel/runtime": "npm:^7.26.0"
22202220
"@koa/cors": "npm:^5.0.0"
22212221
"@koa/router": "npm:^13.1.0"
2222-
"@mos-connection/helper": "npm:^4.2.0"
2222+
"@mos-connection/helper": "npm:^4.2.2"
22232223
"@shopify/jest-koa-mocks": "npm:^5.3.1"
22242224
"@slack/webhook": "npm:^7.0.4"
22252225
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration"

‎packages/meteor-lib/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"/LICENSE"
4040
],
4141
"dependencies": {
42-
"@mos-connection/helper": "v4.2.2",
42+
"@mos-connection/helper": "^4.2.2",
4343
"@sofie-automation/blueprints-integration": "1.52.0-in-development",
4444
"@sofie-automation/corelib": "1.52.0-in-development",
4545
"@sofie-automation/shared-lib": "1.52.0-in-development",

‎packages/mos-gateway/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"production"
6666
],
6767
"dependencies": {
68-
"@mos-connection/connector": "v4.2.2",
68+
"@mos-connection/connector": "^4.2.2",
6969
"@sofie-automation/server-core-integration": "1.52.0-in-development",
7070
"@sofie-automation/shared-lib": "1.52.0-in-development",
7171
"tslib": "^2.8.1",

‎packages/shared-lib/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"/LICENSE"
3939
],
4040
"dependencies": {
41-
"@mos-connection/model": "^4.2.0",
41+
"@mos-connection/model": "^4.2.2",
4242
"timeline-state-resolver-types": "9.2.0-nightly-release52-20241219-123204-90290cef1.0",
4343
"tslib": "^2.8.1",
4444
"type-fest": "^4.32.0"

‎packages/shared-lib/src/core/model/StudioSettings.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ export interface IStudioSettings {
8282
*/
8383
enableBuckets: boolean
8484

85-
/**
86-
* Doubleclick changes behaviour as selector for userediting
87-
*/
88-
enableUserEdits?: boolean
8985
/**
9086
* Enable evaluation form - the default behavior is to have evaluation forms.
9187
*/

‎packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
1212
import { RundownUtils } from '../../lib/rundown'
1313
import { IContextMenuContext } from '../RundownView'
1414
import { PartUi, SegmentUi } from './SegmentTimelineContainer'
15-
import { PartId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
15+
import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
1616
import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
1717
import { UserEditOperationMenuItems } from '../UserEditOperations/RenderUserEditOperations'
1818
import * as RundownResolver from '../../lib/RundownResolver'

‎packages/yarn.lock‎

Lines changed: 18 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -4167,38 +4167,38 @@ __metadata:
41674167
languageName: node
41684168
linkType: hard
41694169

4170-
"@mos-connection/connector@npm:^4.2.0":
4171-
version: 4.2.0
4172-
resolution: "@mos-connection/connector@npm:4.2.0"
4170+
"@mos-connection/connector@npm:^4.2.2":
4171+
version: 4.2.2
4172+
resolution: "@mos-connection/connector@npm:4.2.2"
41734173
dependencies:
4174-
"@mos-connection/helper": "npm:4.2.0"
4175-
"@mos-connection/model": "npm:4.2.0"
4174+
"@mos-connection/helper": "npm:4.2.2"
4175+
"@mos-connection/model": "npm:4.2.2"
41764176
eventemitter3: "npm:^5.0.1"
41774177
iconv-lite: "npm:^0.6.3"
41784178
tslib: "npm:^2.5.3"
41794179
xml-js: "npm:^1.6.11"
41804180
xmlbuilder: "npm:^15.1.1"
4181-
checksum: 10c0/19b71c6804508e35c236aa0c5de0f0a02e965ecd34f055ae6438aa4461c4ed69a7f1d71712e8c9c71d3e6e5286dc81326858c9dbeee7d21252de42c6d685f38b
4181+
checksum: 10c0/97bd832709396fa4a09836e5fec5d55bc7f6997d9b4b5bc2051f60b3c621071fda502c3604a7053c0c4766451c24ce40fe5de77916e65f6b96c9fe2b397d7b13
41824182
languageName: node
41834183
linkType: hard
41844184

4185-
"@mos-connection/helper@npm:4.2.0, @mos-connection/helper@npm:^4.2.0":
4186-
version: 4.2.0
4187-
resolution: "@mos-connection/helper@npm:4.2.0"
4185+
"@mos-connection/helper@npm:4.2.2, @mos-connection/helper@npm:^4.2.2":
4186+
version: 4.2.2
4187+
resolution: "@mos-connection/helper@npm:4.2.2"
41884188
dependencies:
4189-
"@mos-connection/model": "npm:4.2.0"
4189+
"@mos-connection/model": "npm:4.2.2"
41904190
iconv-lite: "npm:^0.6.3"
41914191
tslib: "npm:^2.5.3"
41924192
xml-js: "npm:^1.6.11"
41934193
xmlbuilder: "npm:^15.1.1"
4194-
checksum: 10c0/3cbea09a34e23c5af66632467f4876f3b60d009896904584315d80585cefd265d928a262d7cbab35f7734f919ec2194865abed75a3be41ea8903cc3128638000
4194+
checksum: 10c0/778fe6327be5c0a632f0844ad05f2c29174f1ceab19de9ce85591ddbf1250884381a215511e8e0cff35612a873135cabe588e921382382439cd3b7296ffdb255
41954195
languageName: node
41964196
linkType: hard
41974197

4198-
"@mos-connection/model@npm:4.2.0, @mos-connection/model@npm:^4.2.0":
4199-
version: 4.2.0
4200-
resolution: "@mos-connection/model@npm:4.2.0"
4201-
checksum: 10c0/b965e0bb91744d35a0577c3ddb5269e8f42f32a9c9a4f6ec657fdb28c927fa7878440d960bb1886f8b7564f0194ed485fd390e51de449abe11034e0116b7565d
4198+
"@mos-connection/model@npm:4.2.2, @mos-connection/model@npm:^4.2.2":
4199+
version: 4.2.2
4200+
resolution: "@mos-connection/model@npm:4.2.2"
4201+
checksum: 10c0/3c6998417db60a59320a529f107c91b41e399f8ae6aa3107a1f0ae68370897baa3ef9580d33107cbf9c5924979e490a422b315e347392101f4c5fa03efe039fe
42024202
languageName: node
42034203
linkType: hard
42044204

@@ -6020,7 +6020,7 @@ __metadata:
60206020
version: 0.0.0-use.local
60216021
resolution: "@sofie-automation/meteor-lib@workspace:meteor-lib"
60226022
dependencies:
6023-
"@mos-connection/helper": "npm:^4.2.0"
6023+
"@mos-connection/helper": "npm:^4.2.2"
60246024
"@sofie-automation/blueprints-integration": "npm:1.52.0-in-development"
60256025
"@sofie-automation/corelib": "npm:1.52.0-in-development"
60266026
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
@@ -6066,7 +6066,7 @@ __metadata:
60666066
version: 0.0.0-use.local
60676067
resolution: "@sofie-automation/shared-lib@workspace:shared-lib"
60686068
dependencies:
6069-
"@mos-connection/model": "npm:^4.2.0"
6069+
"@mos-connection/model": "npm:^4.2.2"
60706070
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
60716071
tslib: "npm:^2.8.1"
60726072
type-fest: "npm:^4.32.0"
@@ -6745,66 +6745,6 @@ __metadata:
67456745
languageName: node
67466746
linkType: hard
67476747

6748-
"@testing-library/dom@npm:^10.4.0":
6749-
version: 10.4.0
6750-
resolution: "@testing-library/dom@npm:10.4.0"
6751-
dependencies:
6752-
"@babel/code-frame": ^7.10.4
6753-
"@babel/runtime": ^7.12.5
6754-
"@types/aria-query": ^5.0.1
6755-
aria-query: 5.3.0
6756-
chalk: ^4.1.0
6757-
dom-accessibility-api: ^0.5.9
6758-
lz-string: ^1.5.0
6759-
pretty-format: ^27.0.2
6760-
checksum: bb128b90be0c8cd78c5f5e67aa45f53de614cc048a2b50b230e736ec710805ac6c73375af354b83c74d710b3928d52b83a273a4cb89de4eb3efe49e91e706837
6761-
languageName: node
6762-
linkType: hard
6763-
6764-
"@testing-library/jest-dom@npm:^6.6.3":
6765-
version: 6.6.3
6766-
resolution: "@testing-library/jest-dom@npm:6.6.3"
6767-
dependencies:
6768-
"@adobe/css-tools": ^4.4.0
6769-
aria-query: ^5.0.0
6770-
chalk: ^3.0.0
6771-
css.escape: ^1.5.1
6772-
dom-accessibility-api: ^0.6.3
6773-
lodash: ^4.17.21
6774-
redent: ^3.0.0
6775-
checksum: c1dc4260b05309a0084416639006cd105849acc5b102bef682a3b19bd6fce07ff6762085fc7f2599546c995a2fc66fdb1d70e50e22a634a0098524056cc9e511
6776-
languageName: node
6777-
linkType: hard
6778-
6779-
"@testing-library/react@npm:^16.0.1":
6780-
version: 16.0.1
6781-
resolution: "@testing-library/react@npm:16.0.1"
6782-
dependencies:
6783-
"@babel/runtime": ^7.12.5
6784-
peerDependencies:
6785-
"@testing-library/dom": ^10.0.0
6786-
"@types/react": ^18.0.0
6787-
"@types/react-dom": ^18.0.0
6788-
react: ^18.0.0
6789-
react-dom: ^18.0.0
6790-
peerDependenciesMeta:
6791-
"@types/react":
6792-
optional: true
6793-
"@types/react-dom":
6794-
optional: true
6795-
checksum: 1837db473ea018cf2b5d0cbfffb7a30d0d759e5a7f23aad431441c77bcc3d2533250cd003a61878fd908267df47404cedcb5914f12d79e413002c659652b37fd
6796-
languageName: node
6797-
linkType: hard
6798-
6799-
"@testing-library/user-event@npm:^14.5.2":
6800-
version: 14.5.2
6801-
resolution: "@testing-library/user-event@npm:14.5.2"
6802-
peerDependencies:
6803-
"@testing-library/dom": ">=7.21.4"
6804-
checksum: d76937dffcf0082fbf3bb89eb2b81a31bf5448048dd61c33928c5f10e33a58e035321d39145cefd469bb5a499c68a5b4086b22f1a44e3e7c7e817dc5f6782867
6805-
languageName: node
6806-
linkType: hard
6807-
68086748
"@tokenizer/token@npm:^0.3.0":
68096749
version: 0.3.0
68106750
resolution: "@tokenizer/token@npm:0.3.0"
@@ -6931,13 +6871,6 @@ __metadata:
69316871
languageName: node
69326872
linkType: hard
69336873

6934-
"@types/aria-query@npm:^5.0.1":
6935-
version: 5.0.4
6936-
resolution: "@types/aria-query@npm:5.0.4"
6937-
checksum: ad8b87e4ad64255db5f0a73bc2b4da9b146c38a3a8ab4d9306154334e0fc67ae64e76bfa298eebd1e71830591fb15987e5de7111bdb36a2221bdc379e3415fb0
6938-
languageName: node
6939-
linkType: hard
6940-
69416874
"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.5":
69426875
version: 7.20.5
69436876
resolution: "@types/babel__core@npm:7.20.5"
@@ -10273,16 +10206,6 @@ asn1@evs-broadcast/node-asn1:
1027310206
languageName: node
1027410207
linkType: hard
1027510208

10276-
"chalk@npm:^3.0.0":
10277-
version: 3.0.0
10278-
resolution: "chalk@npm:3.0.0"
10279-
dependencies:
10280-
ansi-styles: ^4.1.0
10281-
supports-color: ^7.1.0
10282-
checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505
10283-
languageName: node
10284-
linkType: hard
10285-
1028610209
"char-regex@npm:^1.0.2":
1028710210
version: 1.0.2
1028810211
resolution: "char-regex@npm:1.0.2"
@@ -11639,13 +11562,6 @@ asn1@evs-broadcast/node-asn1:
1163911562
languageName: node
1164011563
linkType: hard
1164111564

11642-
"css.escape@npm:^1.5.1":
11643-
version: 1.5.1
11644-
resolution: "css.escape@npm:1.5.1"
11645-
checksum: f6d38088d870a961794a2580b2b2af1027731bb43261cfdce14f19238a88664b351cc8978abc20f06cc6bbde725699dec8deb6fe9816b139fc3f2af28719e774
11646-
languageName: node
11647-
linkType: hard
11648-
1164911565
"cssesc@npm:^3.0.0":
1165011566
version: 3.0.0
1165111567
resolution: "cssesc@npm:3.0.0"
@@ -12810,20 +12726,6 @@ asn1@evs-broadcast/node-asn1:
1281012726
languageName: node
1281112727
linkType: hard
1281212728

12813-
"dom-accessibility-api@npm:^0.5.9":
12814-
version: 0.5.16
12815-
resolution: "dom-accessibility-api@npm:0.5.16"
12816-
checksum: 005eb283caef57fc1adec4d5df4dd49189b628f2f575af45decb210e04d634459e3f1ee64f18b41e2dcf200c844bc1d9279d80807e686a30d69a4756151ad248
12817-
languageName: node
12818-
linkType: hard
12819-
12820-
"dom-accessibility-api@npm:^0.6.3":
12821-
version: 0.6.3
12822-
resolution: "dom-accessibility-api@npm:0.6.3"
12823-
checksum: c325b5144bb406df23f4affecffc117dbaec9af03daad9ee6b510c5be647b14d28ef0a4ea5ca06d696d8ab40bb777e5fed98b985976fdef9d8790178fa1d573f
12824-
languageName: node
12825-
linkType: hard
12826-
1282712729
"dom-converter@npm:^0.2.0":
1282812730
version: 0.2.0
1282912731
resolution: "dom-converter@npm:0.2.0"
@@ -19098,15 +19000,6 @@ asn1@evs-broadcast/node-asn1:
1909819000
languageName: node
1909919001
linkType: hard
1910019002

19101-
"lz-string@npm:^1.5.0":
19102-
version: 1.5.0
19103-
resolution: "lz-string@npm:1.5.0"
19104-
bin:
19105-
lz-string: bin/bin.js
19106-
checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
19107-
languageName: node
19108-
linkType: hard
19109-
1911019003
"magic-string@npm:^0.30.3":
1911119004
version: 0.30.10
1911219005
resolution: "magic-string@npm:0.30.10"
@@ -20777,7 +20670,7 @@ asn1@evs-broadcast/node-asn1:
2077720670
version: 0.0.0-use.local
2077820671
resolution: "mos-gateway@workspace:mos-gateway"
2077920672
dependencies:
20780-
"@mos-connection/connector": "npm:^4.2.0"
20673+
"@mos-connection/connector": "npm:^4.2.2"
2078120674
"@sofie-automation/server-core-integration": "npm:1.52.0-in-development"
2078220675
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
2078320676
tslib: "npm:^2.8.1"
@@ -23904,17 +23797,6 @@ asn1@evs-broadcast/node-asn1:
2390423797
languageName: node
2390523798
linkType: hard
2390623799

23907-
"pretty-format@npm:^27.0.2":
23908-
version: 27.5.1
23909-
resolution: "pretty-format@npm:27.5.1"
23910-
dependencies:
23911-
ansi-regex: ^5.0.1
23912-
ansi-styles: ^5.0.0
23913-
react-is: ^17.0.1
23914-
checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088
23915-
languageName: node
23916-
linkType: hard
23917-
2391823800
"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
2391923801
version: 29.7.0
2392023802
resolution: "pretty-format@npm:29.7.0"
@@ -24700,13 +24582,6 @@ asn1@evs-broadcast/node-asn1:
2470024582
languageName: node
2470124583
linkType: hard
2470224584

24703-
"react-is@npm:^17.0.1":
24704-
version: 17.0.2
24705-
resolution: "react-is@npm:17.0.2"
24706-
checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
24707-
languageName: node
24708-
linkType: hard
24709-
2471024585
"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
2471124586
version: 18.3.1
2471224587
resolution: "react-is@npm:18.3.1"

0 commit comments

Comments
 (0)