From 67e1c28edc151c85f95f4d2339689cfd673230c7 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Thu, 18 Jan 2024 15:10:25 +0000 Subject: [PATCH] fix: update core libs to handle publications correctly --- packages/apps/backend/package.json | 114 ++++++++++++++--------------- packages/shared/model/package.json | 70 +++++++++--------- yarn.lock | 69 ++++++----------- 3 files changed, 116 insertions(+), 137 deletions(-) diff --git a/packages/apps/backend/package.json b/packages/apps/backend/package.json index 7a2f43e..60992d4 100644 --- a/packages/apps/backend/package.json +++ b/packages/apps/backend/package.json @@ -1,59 +1,59 @@ { - "name": "@sofie-prompter-editor/apps-backend", - "version": "0.0.0", - "main": "dist/index.js", - "types": "dist/index.d.ts", - "license": "MIT", - "type": "module", - "scripts": { - "dev": "nodemon dist/index.js", - "unbuild": "run -T rimraf dist", - "build": "run build:main", - "watch": "run build:main -w --preserveWatchOutput", - "build:main": "tsc -p tsconfig.json", - "lint": "run -T eslint --ext .ts --ext .tsx --ext .js --ignore-pattern dist", - "__test": "jest" - }, - "engines": { - "node": ">=20.9.0" - }, - "devDependencies": { - "@types/lodash.isequal": "^4.5.8", - "@types/object-path": "^0.11.1", - "@types/yargs": "^17.0.24", - "nodemon": "^3.0.1" - }, - "dependencies": { - "@feathersjs/errors": "^5.0.11", - "@feathersjs/feathers": "^5.0.11", - "@feathersjs/koa": "^5.0.11", - "@feathersjs/socketio": "^5.0.11", - "@feathersjs/socketio-client": "^5.0.11", - "@koa/router": "^12.0.1", - "@sofie-automation/blueprints-integration": "1.50.0-nightly-release50-20230627-124025-83abcdc.0", - "@sofie-automation/server-core-integration": "1.50.0-nightly-release50-20230627-124025-83abcdc.0", - "@sofie-automation/shared-lib": "1.50.0-nightly-release50-20230627-124025-83abcdc.0", - "@sofie-prompter-editor/shared-lib": "0.0.0", - "@sofie-prompter-editor/shared-model": "0.0.0", - "eventemitter3": "^5.0.1", - "fast-clone": "^1.5.13", - "koa": "^2.14.2", - "koa-bodyparser": "^4.4.1", - "lodash.isequal": "^4.5.0", - "mobx": "^6.11.0", - "mobx-utils": "^6.0.8", - "object-path": "^0.11.8", - "type-fest": "^4.9.0", - "winston": "^3.11.0", - "yargs": "^17.7.2" - }, - "lint-staged": { - "*.{js,css,json,md,scss}": [ - "prettier" - ], - "*.{ts,tsx}": [ - "eslint" - ] - }, - "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json" + "name": "@sofie-prompter-editor/apps-backend", + "version": "0.0.0", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "license": "MIT", + "type": "module", + "scripts": { + "dev": "nodemon dist/index.js", + "unbuild": "run -T rimraf dist", + "build": "run build:main", + "watch": "run build:main -w --preserveWatchOutput", + "build:main": "tsc -p tsconfig.json", + "lint": "run -T eslint --ext .ts --ext .tsx --ext .js --ignore-pattern dist", + "__test": "jest" + }, + "engines": { + "node": ">=20.9.0" + }, + "devDependencies": { + "@types/lodash.isequal": "^4.5.8", + "@types/object-path": "^0.11.1", + "@types/yargs": "^17.0.24", + "nodemon": "^3.0.1" + }, + "dependencies": { + "@feathersjs/errors": "^5.0.11", + "@feathersjs/feathers": "^5.0.11", + "@feathersjs/koa": "^5.0.11", + "@feathersjs/socketio": "^5.0.11", + "@feathersjs/socketio-client": "^5.0.11", + "@koa/router": "^12.0.1", + "@sofie-automation/blueprints-integration": "1.50.0-nightly-release50-20240118-095438-6aada67.0", + "@sofie-automation/server-core-integration": "1.50.0-nightly-release50-20240118-095438-6aada67.0", + "@sofie-automation/shared-lib": "1.50.0-nightly-release50-20240118-095438-6aada67.0", + "@sofie-prompter-editor/shared-lib": "0.0.0", + "@sofie-prompter-editor/shared-model": "0.0.0", + "eventemitter3": "^5.0.1", + "fast-clone": "^1.5.13", + "koa": "^2.14.2", + "koa-bodyparser": "^4.4.1", + "lodash.isequal": "^4.5.0", + "mobx": "^6.11.0", + "mobx-utils": "^6.0.8", + "object-path": "^0.11.8", + "type-fest": "^4.9.0", + "winston": "^3.11.0", + "yargs": "^17.7.2" + }, + "lint-staged": { + "*.{js,css,json,md,scss}": [ + "prettier" + ], + "*.{ts,tsx}": [ + "eslint" + ] + }, + "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json" } diff --git a/packages/shared/model/package.json b/packages/shared/model/package.json index d891012..fd1f087 100644 --- a/packages/shared/model/package.json +++ b/packages/shared/model/package.json @@ -1,37 +1,37 @@ { - "name": "@sofie-prompter-editor/shared-model", - "version": "0.0.0", - "main": "dist/index.js", - "types": "dist/index.d.ts", - "type": "module", - "license": "MIT", - "scripts": { - "unbuild": "run -T rimraf dist", - "build": "run build:main", - "watch": "run build:main -w --preserveWatchOutput", - "build:main": "tsc -p tsconfig.json", - "lint": "run -T eslint --ext .ts --ext .tsx --ext .js --ignore-pattern dist", - "test": "jest" - }, - "engines": { - "node": ">=20.9.0" - }, - "devDependencies": { - "@feathersjs/feathers": "^5.0.11", - "eventemitter3": "^5.0.1" - }, - "dependencies": { - "@sofie-automation/shared-lib": "^1.49.1", - "@sofie-prompter-editor/shared-lib": "0.0.0", - "zod": "^3.22.4" - }, - "lint-staged": { - "*.{js,css,json,md,scss}": [ - "prettier" - ], - "*.{ts,tsx}": [ - "eslint" - ] - }, - "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json" + "name": "@sofie-prompter-editor/shared-model", + "version": "0.0.0", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "type": "module", + "license": "MIT", + "scripts": { + "unbuild": "run -T rimraf dist", + "build": "run build:main", + "watch": "run build:main -w --preserveWatchOutput", + "build:main": "tsc -p tsconfig.json", + "lint": "run -T eslint --ext .ts --ext .tsx --ext .js --ignore-pattern dist", + "test": "jest" + }, + "engines": { + "node": ">=20.9.0" + }, + "devDependencies": { + "@feathersjs/feathers": "^5.0.11", + "eventemitter3": "^5.0.1" + }, + "dependencies": { + "@sofie-automation/shared-lib": "^1.50.0-nightly-release50-20240118-095438-6aada67.0", + "@sofie-prompter-editor/shared-lib": "0.0.0", + "zod": "^3.22.4" + }, + "lint-staged": { + "*.{js,css,json,md,scss}": [ + "prettier" + ], + "*.{ts,tsx}": [ + "eslint" + ] + }, + "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json" } diff --git a/yarn.lock b/yarn.lock index 2906af5..43a17b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1808,14 +1808,14 @@ __metadata: languageName: node linkType: hard -"@sofie-automation/blueprints-integration@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0": - version: 1.50.0-nightly-release50-20230627-124025-83abcdc.0 - resolution: "@sofie-automation/blueprints-integration@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" +"@sofie-automation/blueprints-integration@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0": + version: 1.50.0-nightly-release50-20240118-095438-6aada67.0 + resolution: "@sofie-automation/blueprints-integration@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" dependencies: - "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" + "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" tslib: "npm:^2.4.0" type-fest: "npm:^2.19.0" - checksum: 7d027969692f9cc7386050b326641d1b9f5f3f745cd76bcbddac830497b7a12f274089a4cd6b35cae1acbbc17507b290303ec9b33ca516c3017778ee1678fc0a + checksum: fc5b5c3b699bc37083ad7649dbcf173483ffb40a20e92861037480e2a10da491133c63c8665247e93714f7bb7c8e6e11bf93c961c7792f4027088a20996295cf languageName: node linkType: hard @@ -1859,42 +1859,30 @@ __metadata: languageName: node linkType: hard -"@sofie-automation/server-core-integration@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0": - version: 1.50.0-nightly-release50-20230627-124025-83abcdc.0 - resolution: "@sofie-automation/server-core-integration@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" +"@sofie-automation/server-core-integration@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0": + version: 1.50.0-nightly-release50-20240118-095438-6aada67.0 + resolution: "@sofie-automation/server-core-integration@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" dependencies: - "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" + "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" ejson: "npm:^2.2.3" eventemitter3: "npm:^4.0.7" faye-websocket: "npm:^0.11.4" got: "npm:^11.8.6" tslib: "npm:^2.4.0" underscore: "npm:^1.13.4" - checksum: 5defd93edca4ad2a0ac77cf06289ae92a9773460ecb5303af2a606d56de0298be35549f0e50894e15b986523400a4c24413a96853c8882e840b7844f32d4809e + checksum: 9f4c743c2f5707a6a2c44882d096a7b3114c5f7c4d29854aba9e4415f6b32b42e45b6d9f62b5d0ae77542992d67bda9d2089d70b7b18c3e3c4e0e3a177fc2193 languageName: node linkType: hard -"@sofie-automation/shared-lib@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0": - version: 1.50.0-nightly-release50-20230627-124025-83abcdc.0 - resolution: "@sofie-automation/shared-lib@npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" +"@sofie-automation/shared-lib@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0, @sofie-automation/shared-lib@npm:^1.50.0-nightly-release50-20240118-095438-6aada67.0": + version: 1.50.0-nightly-release50-20240118-095438-6aada67.0 + resolution: "@sofie-automation/shared-lib@npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" dependencies: "@mos-connection/model": "npm:^3.0.4" - timeline-state-resolver-types: "npm:8.0.0-nightly-release50-20230615-051635-c51460271.0" + timeline-state-resolver-types: "npm:9.0.0-release50.7" tslib: "npm:^2.4.0" type-fest: "npm:^2.19.0" - checksum: 395d811c935c78240eca247dd80ad451df371c687b666591e4d1e84e9fe5e04e11b5c8c5009654bbfd12c86b5458a17074453e5ecac769f8a987951d1dee6da7 - languageName: node - linkType: hard - -"@sofie-automation/shared-lib@npm:^1.49.1": - version: 1.49.1 - resolution: "@sofie-automation/shared-lib@npm:1.49.1" - dependencies: - "@mos-connection/model": "npm:^3.0.4" - timeline-state-resolver-types: "npm:8.1.0" - tslib: "npm:^2.4.0" - type-fest: "npm:^2.19.0" - checksum: 5dc7d02353f899bfadd448af42b28dd5866e8faea823916eec38b6efb0625875d59ffaf830c391979bd3160efb18c80d310f86d640fcd5e2e58650918ae36a02 + checksum: 0ddca2fe2ff64d343516b51e82c83ec89838b17a3823b839c9b5f149c1473695ba04b24db086d1c02025f1b586ae11a7dab7621328e8a8a9f936f1c056ae6e88 languageName: node linkType: hard @@ -1916,9 +1904,9 @@ __metadata: "@feathersjs/socketio": "npm:^5.0.11" "@feathersjs/socketio-client": "npm:^5.0.11" "@koa/router": "npm:^12.0.1" - "@sofie-automation/blueprints-integration": "npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" - "@sofie-automation/server-core-integration": "npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" - "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20230627-124025-83abcdc.0" + "@sofie-automation/blueprints-integration": "npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" + "@sofie-automation/server-core-integration": "npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" + "@sofie-automation/shared-lib": "npm:1.50.0-nightly-release50-20240118-095438-6aada67.0" "@sofie-prompter-editor/shared-lib": "npm:0.0.0" "@sofie-prompter-editor/shared-model": "npm:0.0.0" "@types/lodash.isequal": "npm:^4.5.8" @@ -1993,7 +1981,7 @@ __metadata: resolution: "@sofie-prompter-editor/shared-model@workspace:packages/shared/model" dependencies: "@feathersjs/feathers": "npm:^5.0.11" - "@sofie-automation/shared-lib": "npm:^1.49.1" + "@sofie-automation/shared-lib": "npm:^1.50.0-nightly-release50-20240118-095438-6aada67.0" "@sofie-prompter-editor/shared-lib": "npm:0.0.0" eventemitter3: "npm:^5.0.1" zod: "npm:^3.22.4" @@ -11155,21 +11143,12 @@ __metadata: languageName: node linkType: hard -"timeline-state-resolver-types@npm:8.0.0-nightly-release50-20230615-051635-c51460271.0": - version: 8.0.0-nightly-release50-20230615-051635-c51460271.0 - resolution: "timeline-state-resolver-types@npm:8.0.0-nightly-release50-20230615-051635-c51460271.0" +"timeline-state-resolver-types@npm:9.0.0-release50.7": + version: 9.0.0-release50.7 + resolution: "timeline-state-resolver-types@npm:9.0.0-release50.7" dependencies: tslib: "npm:^2.5.1" - checksum: cff7db4c17d3c980b8b001016d42909d2a0b34621be6d08163271d99f888e6991dfed986a2a58f7f1f5b63a45eb9b565094bb42564c2150a749098e345cd6dbe - languageName: node - linkType: hard - -"timeline-state-resolver-types@npm:8.1.0": - version: 8.1.0 - resolution: "timeline-state-resolver-types@npm:8.1.0" - dependencies: - tslib: "npm:^2.4.1" - checksum: 5995092c5f246dea18719017d073a78a06375437ac35036070be67ed1336d9b1ac1e38500eb6ee5969c6257c0f5f25fd0100fb399959b1ef1221c97060cd2238 + checksum: ad7443debcf80137eb32b6bd94b712e22a5b6573a0682d46b88e9458dda213ee040cae9492ee877219215b9cedb945d34abbdd615ccee75cd9c4a04978a216b2 languageName: node linkType: hard @@ -11343,7 +11322,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.1": +"tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.1": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb