Skip to content

Commit

Permalink
chore: fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@Julusian
Julusian committed Jan 27, 2025
1 parent 8ff4e14 commit c1fe769
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 163 deletions.
24 changes: 12 additions & 12 deletions meteor/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,23 +888,23 @@ __metadata:
languageName: node
linkType: hard

"@mos-connection/helper@npm:^4.2.0":
version: 4.2.0
resolution: "@mos-connection/helper@npm:4.2.0"
"@mos-connection/helper@npm:^4.2.2":
version: 4.2.2
resolution: "@mos-connection/helper@npm:4.2.2"
dependencies:
"@mos-connection/model": "npm:4.2.0"
"@mos-connection/model": "npm:4.2.2"
iconv-lite: "npm:^0.6.3"
tslib: "npm:^2.5.3"
xml-js: "npm:^1.6.11"
xmlbuilder: "npm:^15.1.1"
checksum: 10c0/3cbea09a34e23c5af66632467f4876f3b60d009896904584315d80585cefd265d928a262d7cbab35f7734f919ec2194865abed75a3be41ea8903cc3128638000
checksum: 10c0/778fe6327be5c0a632f0844ad05f2c29174f1ceab19de9ce85591ddbf1250884381a215511e8e0cff35612a873135cabe588e921382382439cd3b7296ffdb255
languageName: node
linkType: hard

"@mos-connection/model@npm:4.2.0, @mos-connection/model@npm:^4.2.0":
version: 4.2.0
resolution: "@mos-connection/model@npm:4.2.0"
checksum: 10c0/b965e0bb91744d35a0577c3ddb5269e8f42f32a9c9a4f6ec657fdb28c927fa7878440d960bb1886f8b7564f0194ed485fd390e51de449abe11034e0116b7565d
"@mos-connection/model@npm:4.2.2, @mos-connection/model@npm:^4.2.2":
version: 4.2.2
resolution: "@mos-connection/model@npm:4.2.2"
checksum: 10c0/3c6998417db60a59320a529f107c91b41e399f8ae6aa3107a1f0ae68370897baa3ef9580d33107cbf9c5924979e490a422b315e347392101f4c5fa03efe039fe
languageName: node
linkType: hard

Expand Down Expand Up @@ -1172,7 +1172,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A."
dependencies:
"@mos-connection/helper": "npm:^4.2.0"
"@mos-connection/helper": "npm:^4.2.2"
"@sofie-automation/blueprints-integration": "npm:1.52.0-in-development"
"@sofie-automation/corelib": "npm:1.52.0-in-development"
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
Expand All @@ -1190,7 +1190,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
dependencies:
"@mos-connection/model": "npm:^4.2.0"
"@mos-connection/model": "npm:^4.2.2"
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
tslib: "npm:^2.8.1"
type-fest: "npm:^4.32.0"
Expand Down Expand Up @@ -2219,7 +2219,7 @@ __metadata:
"@babel/runtime": "npm:^7.26.0"
"@koa/cors": "npm:^5.0.0"
"@koa/router": "npm:^13.1.0"
"@mos-connection/helper": "npm:^4.2.0"
"@mos-connection/helper": "npm:^4.2.2"
"@shopify/jest-koa-mocks": "npm:^5.3.1"
"@slack/webhook": "npm:^7.0.4"
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration"
Expand Down
2 changes: 1 addition & 1 deletion packages/meteor-lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"/LICENSE"
],
"dependencies": {
"@mos-connection/helper": "v4.2.2",
"@mos-connection/helper": "^4.2.2",
"@sofie-automation/blueprints-integration": "1.52.0-in-development",
"@sofie-automation/corelib": "1.52.0-in-development",
"@sofie-automation/shared-lib": "1.52.0-in-development",
Expand Down
2 changes: 1 addition & 1 deletion packages/mos-gateway/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"production"
],
"dependencies": {
"@mos-connection/connector": "v4.2.2",
"@mos-connection/connector": "^4.2.2",
"@sofie-automation/server-core-integration": "1.52.0-in-development",
"@sofie-automation/shared-lib": "1.52.0-in-development",
"tslib": "^2.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"/LICENSE"
],
"dependencies": {
"@mos-connection/model": "^4.2.0",
"@mos-connection/model": "^4.2.2",
"timeline-state-resolver-types": "9.2.0-nightly-release52-20241219-123204-90290cef1.0",
"tslib": "^2.8.1",
"type-fest": "^4.32.0"
Expand Down
4 changes: 0 additions & 4 deletions packages/shared-lib/src/core/model/StudioSettings.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ export interface IStudioSettings {
*/
enableBuckets: boolean

/**
* Doubleclick changes behaviour as selector for userediting
*/
enableUserEdits?: boolean
/**
* Enable evaluation form - the default behavior is to have evaluation forms.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
import { RundownUtils } from '../../lib/rundown'
import { IContextMenuContext } from '../RundownView'
import { PartUi, SegmentUi } from './SegmentTimelineContainer'
import { PartId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
import { UserEditOperationMenuItems } from '../UserEditOperations/RenderUserEditOperations'
import * as RundownResolver from '../../lib/RundownResolver'
Expand Down
161 changes: 18 additions & 143 deletions packages/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4167,38 +4167,38 @@ __metadata:
languageName: node
linkType: hard

"@mos-connection/connector@npm:^4.2.0":
version: 4.2.0
resolution: "@mos-connection/connector@npm:4.2.0"
"@mos-connection/connector@npm:^4.2.2":
version: 4.2.2
resolution: "@mos-connection/connector@npm:4.2.2"
dependencies:
"@mos-connection/helper": "npm:4.2.0"
"@mos-connection/model": "npm:4.2.0"
"@mos-connection/helper": "npm:4.2.2"
"@mos-connection/model": "npm:4.2.2"
eventemitter3: "npm:^5.0.1"
iconv-lite: "npm:^0.6.3"
tslib: "npm:^2.5.3"
xml-js: "npm:^1.6.11"
xmlbuilder: "npm:^15.1.1"
checksum: 10c0/19b71c6804508e35c236aa0c5de0f0a02e965ecd34f055ae6438aa4461c4ed69a7f1d71712e8c9c71d3e6e5286dc81326858c9dbeee7d21252de42c6d685f38b
checksum: 10c0/97bd832709396fa4a09836e5fec5d55bc7f6997d9b4b5bc2051f60b3c621071fda502c3604a7053c0c4766451c24ce40fe5de77916e65f6b96c9fe2b397d7b13
languageName: node
linkType: hard

"@mos-connection/helper@npm:4.2.0, @mos-connection/helper@npm:^4.2.0":
version: 4.2.0
resolution: "@mos-connection/helper@npm:4.2.0"
"@mos-connection/helper@npm:4.2.2, @mos-connection/helper@npm:^4.2.2":
version: 4.2.2
resolution: "@mos-connection/helper@npm:4.2.2"
dependencies:
"@mos-connection/model": "npm:4.2.0"
"@mos-connection/model": "npm:4.2.2"
iconv-lite: "npm:^0.6.3"
tslib: "npm:^2.5.3"
xml-js: "npm:^1.6.11"
xmlbuilder: "npm:^15.1.1"
checksum: 10c0/3cbea09a34e23c5af66632467f4876f3b60d009896904584315d80585cefd265d928a262d7cbab35f7734f919ec2194865abed75a3be41ea8903cc3128638000
checksum: 10c0/778fe6327be5c0a632f0844ad05f2c29174f1ceab19de9ce85591ddbf1250884381a215511e8e0cff35612a873135cabe588e921382382439cd3b7296ffdb255
languageName: node
linkType: hard

"@mos-connection/model@npm:4.2.0, @mos-connection/model@npm:^4.2.0":
version: 4.2.0
resolution: "@mos-connection/model@npm:4.2.0"
checksum: 10c0/b965e0bb91744d35a0577c3ddb5269e8f42f32a9c9a4f6ec657fdb28c927fa7878440d960bb1886f8b7564f0194ed485fd390e51de449abe11034e0116b7565d
"@mos-connection/model@npm:4.2.2, @mos-connection/model@npm:^4.2.2":
version: 4.2.2
resolution: "@mos-connection/model@npm:4.2.2"
checksum: 10c0/3c6998417db60a59320a529f107c91b41e399f8ae6aa3107a1f0ae68370897baa3ef9580d33107cbf9c5924979e490a422b315e347392101f4c5fa03efe039fe
languageName: node
linkType: hard

Expand Down Expand Up @@ -6020,7 +6020,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sofie-automation/meteor-lib@workspace:meteor-lib"
dependencies:
"@mos-connection/helper": "npm:^4.2.0"
"@mos-connection/helper": "npm:^4.2.2"
"@sofie-automation/blueprints-integration": "npm:1.52.0-in-development"
"@sofie-automation/corelib": "npm:1.52.0-in-development"
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
Expand Down Expand Up @@ -6066,7 +6066,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sofie-automation/shared-lib@workspace:shared-lib"
dependencies:
"@mos-connection/model": "npm:^4.2.0"
"@mos-connection/model": "npm:^4.2.2"
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
tslib: "npm:^2.8.1"
type-fest: "npm:^4.32.0"
Expand Down Expand Up @@ -6745,66 +6745,6 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/dom@npm:^10.4.0":
version: 10.4.0
resolution: "@testing-library/dom@npm:10.4.0"
dependencies:
"@babel/code-frame": ^7.10.4
"@babel/runtime": ^7.12.5
"@types/aria-query": ^5.0.1
aria-query: 5.3.0
chalk: ^4.1.0
dom-accessibility-api: ^0.5.9
lz-string: ^1.5.0
pretty-format: ^27.0.2
checksum: bb128b90be0c8cd78c5f5e67aa45f53de614cc048a2b50b230e736ec710805ac6c73375af354b83c74d710b3928d52b83a273a4cb89de4eb3efe49e91e706837
languageName: node
linkType: hard

"@testing-library/jest-dom@npm:^6.6.3":
version: 6.6.3
resolution: "@testing-library/jest-dom@npm:6.6.3"
dependencies:
"@adobe/css-tools": ^4.4.0
aria-query: ^5.0.0
chalk: ^3.0.0
css.escape: ^1.5.1
dom-accessibility-api: ^0.6.3
lodash: ^4.17.21
redent: ^3.0.0
checksum: c1dc4260b05309a0084416639006cd105849acc5b102bef682a3b19bd6fce07ff6762085fc7f2599546c995a2fc66fdb1d70e50e22a634a0098524056cc9e511
languageName: node
linkType: hard

"@testing-library/react@npm:^16.0.1":
version: 16.0.1
resolution: "@testing-library/react@npm:16.0.1"
dependencies:
"@babel/runtime": ^7.12.5
peerDependencies:
"@testing-library/dom": ^10.0.0
"@types/react": ^18.0.0
"@types/react-dom": ^18.0.0
react: ^18.0.0
react-dom: ^18.0.0
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
checksum: 1837db473ea018cf2b5d0cbfffb7a30d0d759e5a7f23aad431441c77bcc3d2533250cd003a61878fd908267df47404cedcb5914f12d79e413002c659652b37fd
languageName: node
linkType: hard

"@testing-library/user-event@npm:^14.5.2":
version: 14.5.2
resolution: "@testing-library/user-event@npm:14.5.2"
peerDependencies:
"@testing-library/dom": ">=7.21.4"
checksum: d76937dffcf0082fbf3bb89eb2b81a31bf5448048dd61c33928c5f10e33a58e035321d39145cefd469bb5a499c68a5b4086b22f1a44e3e7c7e817dc5f6782867
languageName: node
linkType: hard

"@tokenizer/token@npm:^0.3.0":
version: 0.3.0
resolution: "@tokenizer/token@npm:0.3.0"
Expand Down Expand Up @@ -6931,13 +6871,6 @@ __metadata:
languageName: node
linkType: hard

"@types/aria-query@npm:^5.0.1":
version: 5.0.4
resolution: "@types/aria-query@npm:5.0.4"
checksum: ad8b87e4ad64255db5f0a73bc2b4da9b146c38a3a8ab4d9306154334e0fc67ae64e76bfa298eebd1e71830591fb15987e5de7111bdb36a2221bdc379e3415fb0
languageName: node
linkType: hard

"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.5":
version: 7.20.5
resolution: "@types/babel__core@npm:7.20.5"
Expand Down Expand Up @@ -10273,16 +10206,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"chalk@npm:^3.0.0":
version: 3.0.0
resolution: "chalk@npm:3.0.0"
dependencies:
ansi-styles: ^4.1.0
supports-color: ^7.1.0
checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505
languageName: node
linkType: hard

"char-regex@npm:^1.0.2":
version: 1.0.2
resolution: "char-regex@npm:1.0.2"
Expand Down Expand Up @@ -11639,13 +11562,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"css.escape@npm:^1.5.1":
version: 1.5.1
resolution: "css.escape@npm:1.5.1"
checksum: f6d38088d870a961794a2580b2b2af1027731bb43261cfdce14f19238a88664b351cc8978abc20f06cc6bbde725699dec8deb6fe9816b139fc3f2af28719e774
languageName: node
linkType: hard

"cssesc@npm:^3.0.0":
version: 3.0.0
resolution: "cssesc@npm:3.0.0"
Expand Down Expand Up @@ -12810,20 +12726,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"dom-accessibility-api@npm:^0.5.9":
version: 0.5.16
resolution: "dom-accessibility-api@npm:0.5.16"
checksum: 005eb283caef57fc1adec4d5df4dd49189b628f2f575af45decb210e04d634459e3f1ee64f18b41e2dcf200c844bc1d9279d80807e686a30d69a4756151ad248
languageName: node
linkType: hard

"dom-accessibility-api@npm:^0.6.3":
version: 0.6.3
resolution: "dom-accessibility-api@npm:0.6.3"
checksum: c325b5144bb406df23f4affecffc117dbaec9af03daad9ee6b510c5be647b14d28ef0a4ea5ca06d696d8ab40bb777e5fed98b985976fdef9d8790178fa1d573f
languageName: node
linkType: hard

"dom-converter@npm:^0.2.0":
version: 0.2.0
resolution: "dom-converter@npm:0.2.0"
Expand Down Expand Up @@ -19098,15 +19000,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"lz-string@npm:^1.5.0":
version: 1.5.0
resolution: "lz-string@npm:1.5.0"
bin:
lz-string: bin/bin.js
checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
languageName: node
linkType: hard

"magic-string@npm:^0.30.3":
version: 0.30.10
resolution: "magic-string@npm:0.30.10"
Expand Down Expand Up @@ -20777,7 +20670,7 @@ asn1@evs-broadcast/node-asn1:
version: 0.0.0-use.local
resolution: "mos-gateway@workspace:mos-gateway"
dependencies:
"@mos-connection/connector": "npm:^4.2.0"
"@mos-connection/connector": "npm:^4.2.2"
"@sofie-automation/server-core-integration": "npm:1.52.0-in-development"
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
tslib: "npm:^2.8.1"
Expand Down Expand Up @@ -23904,17 +23797,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"pretty-format@npm:^27.0.2":
version: 27.5.1
resolution: "pretty-format@npm:27.5.1"
dependencies:
ansi-regex: ^5.0.1
ansi-styles: ^5.0.0
react-is: ^17.0.1
checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088
languageName: node
linkType: hard

"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
version: 29.7.0
resolution: "pretty-format@npm:29.7.0"
Expand Down Expand Up @@ -24700,13 +24582,6 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"react-is@npm:^17.0.1":
version: 17.0.2
resolution: "react-is@npm:17.0.2"
checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
languageName: node
linkType: hard

"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
version: 18.3.1
resolution: "react-is@npm:18.3.1"
Expand Down

0 comments on commit c1fe769

Please sign in to comment.