Skip to content

Commit

Permalink
Merge pull request #268 from tv2/master
Browse files Browse the repository at this point in the history 
Release 4.18.1 -> develop
  • Loading branch information
@KvelaGorrrrnio
KvelaGorrrrnio committed Jun 22, 2023
2 parents 4892cb2 + 663adcf commit 4471d05
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 86 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### [4.18.1](https://github.com/tv2/sisyfos-audio-controller/compare/v4.18.0...v4.18.1) (2023-06-22)


### Bug Fixes

* Corrected package version to 4.18.0. ([94a605c](https://github.com/tv2/sisyfos-audio-controller/commit/94a605cae9f49cfdcb29cf1dcdd7f6980b12b21f))


### [4.17.1](https://github.com/tv2/sisyfos-audio-controller/compare/v4.17.0...v4.17.1) (2022-03-11)


Expand Down
172 changes: 86 additions & 86 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
{
"name": "sisyfos-audio-controller",
"version": "4.17.1",
"description": "Audio mixer build with the logic from a video mixer",
"license": "MIT",
"author": {
"name": "Kasper Olsson Hans (TV2 Denmark)",
"email": "[email protected]"
},
"contributors": [
{
"name": "Balte de Wit",
"email": "[email protected]",
"url": "https://superfly.tv"
},
{
"name": "Jan Starzak",
"email": "[email protected]",
"url": "https://superfly.tv"
},
{
"name": "Anders Frederik Jørgensen",
"email": "[email protected]"
}
],
"keywords": [
"app",
"audio",
"open-source"
],
"engines": {
"node": ">=18.15.0",
"yarn": ">=1.22.0"
},
"private": true,
"workspaces": [
"client",
"server",
"shared",
"desktop"
],
"scripts": {
"start": "cross-env NODE_ENV=production node server/dist/server",
"start:dev": "cross-env NODE_ENV=development node --inspect server/dist/server",
"start:local": "cross-env NODE_ENV=local node --inspect server/dist/server",
"build": "yarn build:client && yarn build:server",
"build:client": "yarn --cwd ./client build",
"build:server": "yarn --cwd ./server build",
"build:desktop": "yarn --cwd ./desktop build",
"watch": "concurrently --kill-others \"yarn watch:server\" \"yarn watch:client\"",
"watch:client": "yarn --cwd ./client watch",
"watch:server": "yarn --cwd ./server watch",
"test": "yarn test:client && yarn test:server",
"test:client": "yarn --cwd ./client test",
"test:server": "yarn --cwd ./server test",
"test:watch": "concurrently --kill-others \"yarn --cwd ./client test:watch\" \"yarn --cwd ./server test:watch\"",
"lint": "prettier --write",
"validate": "yarn validate:dependencies && yarn validate:license",
"validate:dependencies": "yarn audit --groups dependencies",
"validate:license": "node-license-validator -p -d --allow-licenses MIT MIT/X11 BSD 0BSD BSD-3-Clause BSD-2-Clause ISC Apache Apache-2.0 WTFPL CC-BY-3.0 CC-BY-4.0 CC0-1.0 GPL Python-2.0 Unlicense --allow-packages cycle",
"clean": "rimraf **/dist **/release",
"reset": "yarn clean && rimraf **/node_modules node_modules"
},
"simple-git-hooks": {
"pre-commit": "yarn lint-staged"
},
"lint-staged": {
"*.{js,ts,css,json,md}": [
"prettier --write"
]
},
"dependencies": {
"cross-env": "^7.0.3"
},
"devDependencies": {
"concurrently": "^8.0.1",
"lint-staged": "^13.2.2",
"node-license-validator": "^1.3.2",
"prettier": "^2.8.8",
"rimraf": "^5.0.0"
},
"resolutions": {
"xml2js": "^0.5.0",
"socket.io-parser": "^4.2.3"
}
}
{
"name": "sisyfos-audio-controller",
"version": "4.18.1",
"description": "Audio mixer build with the logic from a video mixer",
"license": "MIT",
"author": {
"name": "Kasper Olsson Hans (TV2 Denmark)",
"email": "[email protected]"
},
"contributors": [
{
"name": "Balte de Wit",
"email": "[email protected]",
"url": "https://superfly.tv"
},
{
"name": "Jan Starzak",
"email": "[email protected]",
"url": "https://superfly.tv"
},
{
"name": "Anders Frederik Jørgensen",
"email": "[email protected]"
}
],
"keywords": [
"app",
"audio",
"open-source"
],
"engines": {
"node": ">=18.15.0",
"yarn": ">=1.22.0"
},
"private": true,
"workspaces": [
"client",
"server",
"shared",
"desktop"
],
"scripts": {
"start": "cross-env NODE_ENV=production node server/dist/server",
"start:dev": "cross-env NODE_ENV=development node --inspect server/dist/server",
"start:local": "cross-env NODE_ENV=local node --inspect server/dist/server",
"build": "yarn build:client && yarn build:server",
"build:client": "yarn --cwd ./client build",
"build:server": "yarn --cwd ./server build",
"build:desktop": "yarn --cwd ./desktop build",
"watch": "concurrently --kill-others \"yarn watch:server\" \"yarn watch:client\"",
"watch:client": "yarn --cwd ./client watch",
"watch:server": "yarn --cwd ./server watch",
"test": "yarn test:client && yarn test:server",
"test:client": "yarn --cwd ./client test",
"test:server": "yarn --cwd ./server test",
"test:watch": "concurrently --kill-others \"yarn --cwd ./client test:watch\" \"yarn --cwd ./server test:watch\"",
"lint": "prettier --write",
"validate": "yarn validate:dependencies && yarn validate:license",
"validate:dependencies": "yarn audit --groups dependencies",
"validate:license": "node-license-validator -p -d --allow-licenses MIT MIT/X11 BSD 0BSD BSD-3-Clause BSD-2-Clause ISC Apache Apache-2.0 WTFPL CC-BY-3.0 CC-BY-4.0 CC0-1.0 GPL Python-2.0 Unlicense --allow-packages cycle",
"clean": "rimraf **/dist **/release",
"reset": "yarn clean && rimraf **/node_modules node_modules"
},
"simple-git-hooks": {
"pre-commit": "yarn lint-staged"
},
"lint-staged": {
"*.{js,ts,css,json,md}": [
"prettier --write"
]
},
"dependencies": {
"cross-env": "^7.0.3"
},
"devDependencies": {
"concurrently": "^8.0.1",
"lint-staged": "^13.2.2",
"node-license-validator": "^1.3.2",
"prettier": "^2.8.8",
"rimraf": "^5.0.0"
},
"resolutions": {
"xml2js": "^0.5.0",
"socket.io-parser": "^4.2.3"
}
}

0 comments on commit 4471d05

Please sign in to comment.