Skip to content

Commit

Permalink
Merge pull request #180 from SuperFlyTV/v0.12.0-alpha.4
Browse files Browse the repository at this point in the history
chore: merge v0.12.0 alpha.4 to develop
  • Loading branch information
ianshade authored Oct 31, 2023
2 parents d946c76 + cd769fa commit 776bafa
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
12 changes: 6 additions & 6 deletions apps/app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "superconductor",
"private": true,
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "A playout client for Windows, Linux or MacOS to control CasparCG, Atem, OBS and more!",
"main": "dist/main.js",
"engines": {
Expand Down Expand Up @@ -78,11 +78,11 @@
"@koa/router": "^12.0.0",
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14",
"@shared/api": "^0.12.0-alpha.3",
"@shared/lib": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/server-lib": "^0.12.0-alpha.3",
"@shared/tsr-bridge": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/lib": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"@shared/server-lib": "^0.12.0-alpha.4",
"@shared/tsr-bridge": "^0.12.0-alpha.4",
"@sofie-automation/sorensen": "^1.4.2",
"axios": "^1.1.3",
"bufferutil": "^4.0.7",
Expand Down
12 changes: 6 additions & 6 deletions apps/tsr-bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tsr-bridge",
"private": true,
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "A companion app to SuperConductor, to handle playout on another computer",
"main": "dist/main.js",
"engines": {
Expand Down Expand Up @@ -51,11 +51,11 @@
"dependencies": {
"@babel/core": "^7.22.1",
"@mui/material": "^5.10.14",
"@shared/api": "^0.12.0-alpha.3",
"@shared/lib": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/server-lib": "^0.12.0-alpha.3",
"@shared/tsr-bridge": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/lib": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"@shared/server-lib": "^0.12.0-alpha.4",
"@shared/tsr-bridge": "^0.12.0-alpha.4",
"classnames": "^2.3.2",
"electron-is-dev": "^2.0.0",
"electron-updater": "^5.3.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"apps/**",
"tests/**"
],
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"npmClient": "yarn",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions shared/packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/api",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down Expand Up @@ -41,7 +41,7 @@
]
},
"dependencies": {
"@shared/models": "^0.12.0-alpha.3"
"@shared/models": "^0.12.0-alpha.4"
},
"devDependencies": {
"@types/ws": "^8.2.2",
Expand Down
6 changes: 3 additions & 3 deletions shared/packages/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/lib",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down Expand Up @@ -41,8 +41,8 @@
]
},
"dependencies": {
"@shared/api": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"fast-copy": "^2.1.1",
"lodash": "^4.17.21",
"superfly-timeline": "^8.2.5"
Expand Down
2 changes: 1 addition & 1 deletion shared/packages/models/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/models",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down
8 changes: 4 additions & 4 deletions shared/packages/peripherals/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/peripherals",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down Expand Up @@ -48,9 +48,9 @@
"@elgato-stream-deck/node": "^5.7.2",
"@julusian/jpeg-turbo": "^2.1.0",
"@julusian/midi": "^3.0.0",
"@shared/api": "^0.12.0-alpha.3",
"@shared/lib": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/lib": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"lodash": "^4.17.21",
"p-queue": "^6.6.2",
"sharp": "^0.31.2",
Expand Down
6 changes: 3 additions & 3 deletions shared/packages/server-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/server-lib",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down Expand Up @@ -41,8 +41,8 @@
]
},
"dependencies": {
"@shared/api": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"ws": "^8.4.2"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions shared/packages/tsr-bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shared/tsr-bridge",
"version": "0.12.0-alpha.3",
"version": "0.12.0-alpha.4",
"description": "",
"author": {
"name": "SuperFlyTV AB",
Expand Down Expand Up @@ -41,10 +41,10 @@
]
},
"dependencies": {
"@shared/api": "^0.12.0-alpha.3",
"@shared/lib": "^0.12.0-alpha.3",
"@shared/models": "^0.12.0-alpha.3",
"@shared/peripherals": "^0.12.0-alpha.3",
"@shared/api": "^0.12.0-alpha.4",
"@shared/lib": "^0.12.0-alpha.4",
"@shared/models": "^0.12.0-alpha.4",
"@shared/peripherals": "^0.12.0-alpha.4",
"casparcg-connection": "6.1.0-nightly-feat-return-data-more-20231006-080324-f41399cf.0",
"cheerio": "^1.0.0-rc.12",
"got": "^11.8.5",
Expand Down

0 comments on commit 776bafa

Please sign in to comment.