Skip to content

Commit 0998a93

Browse files
committed
Merge remote-tracking branch 'bbc/feat/vt-in-out-words-2' into release52-local
# Conflicts: # .github/workflows/audit.yaml # .github/workflows/node.yaml # meteor/package.json # meteor/server/api/snapshot.ts # meteor/server/publications/partInstancesUI/publication.ts # meteor/server/publications/partsUI/publication.ts # package.json # packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx # scripts/run.mjs
2 parents 099d569 + 1bf7f42 commit 0998a93

File tree

554 files changed

+26076
-15346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+26076
-15346
lines changed

.github/actions/setup-meteor/action.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ description: "Setup Meteor"
33
runs:
44
using: "composite"
55
steps:
6-
- run: curl "https://install.meteor.com/?release=2.13.3" | sh
7-
shell: bash
8-
- run: meteor npm install -g yarn
6+
- run: curl "https://install.meteor.com/?release=3.1" | sh
97
shell: bash

.github/workflows/audit.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ jobs:
2929
run: |
3030
yarn
3131
cd meteor
32+
<<<<<<< HEAD
3233
meteor npm run validate:prod-dependencies
34+
=======
35+
yarn validate:prod-dependencies
36+
>>>>>>> bbc/feat/vt-in-out-words-2
3337
env:
3438
CI: true
3539

@@ -57,7 +61,11 @@ jobs:
5761
run: |
5862
yarn
5963
cd meteor
64+
<<<<<<< HEAD
6065
meteor npm run validate:all-dependencies
66+
=======
67+
yarn run validate:all-dependencies
68+
>>>>>>> bbc/feat/vt-in-out-words-2
6169
env:
6270
CI: true
6371

.github/workflows/node.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ jobs:
4646
# setup zodern:types. No linters are setup, so this simply installs the packages
4747
meteor lint
4848
49+
<<<<<<< HEAD
4950
meteor npm run ci:lint
51+
=======
52+
yarn ci:lint
53+
>>>>>>> bbc/feat/vt-in-out-words-2
5054
env:
5155
CI: true
5256

@@ -85,7 +89,11 @@ jobs:
8589
# setup zodern:types. No linters are setup, so this simply installs the packages
8690
meteor lint
8791
92+
<<<<<<< HEAD
8893
NODE_OPTIONS="--max-old-space-size=6144" meteor npm run unitci --force-exit
94+
=======
95+
NODE_OPTIONS="--max-old-space-size=6144" yarn unitci --force-exit
96+
>>>>>>> bbc/feat/vt-in-out-words-2
8997
env:
9098
CI: true
9199
- name: Send coverage
@@ -480,38 +488,30 @@ jobs:
480488
- blueprints-integration
481489
- server-core-integration
482490
- shared-lib
483-
node-version: [14.x, 18.x, 20.x, 22.x]
491+
- openapi
492+
node-version: [22.x]
484493
include:
485494
# include additional configs, to run certain packages only for a certain version of node
486-
- node-version: 14.x
495+
- node-version: 22.x
487496
package-name: corelib
488497
send-coverage: true
489-
- node-version: 14.x
498+
- node-version: 22.x
490499
package-name: job-worker
491500
send-coverage: true
492-
# manual openapi to avoid testing for 14.x
493-
- node-version: 18.x
494-
package-name: openapi
495-
- node-version: 20.x
496-
package-name: openapi
497-
- node-version: 22.x
498-
package-name: openapi
499501
# No tests for the gateways yet
500-
# - node-version: 18.x
502+
# - node-version: 22.x
501503
# package-name: playout-gateway
502-
# - node-version: 18.x
504+
# - node-version: 22.x
503505
# package-name: mos-gateway
504-
- node-version: 18.x
506+
- node-version: 22.x
505507
package-name: live-status-gateway
506508
send-coverage: true
507-
- node-version: 18.x
509+
- node-version: 22.x
508510
package-name: webui
509511
# manual meteor-lib as it only needs a couple of versions
510-
- node-version: 18.x
512+
- node-version: 22.x
511513
package-name: meteor-lib
512514
send-coverage: true
513-
- node-version: 14.x
514-
package-name: meteor-lib
515515

516516
steps:
517517
- uses: actions/checkout@v4
@@ -531,7 +531,7 @@ jobs:
531531
run: |
532532
cd packages
533533
yarn config set cacheFolder /home/runner/test-packages-cache
534-
node is_node_14.js && yarn lerna run --ignore openapi install || yarn install
534+
yarn install
535535
yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
536536
env:
537537
CI: true

.github/workflows/prerelease-libs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- blueprints-integration
5454
- server-core-integration
5555
- shared-lib
56-
node-version: [14.x, 18.x, 20.x, 22.x]
56+
node-version: [22.x]
5757

5858
steps:
5959
- uses: actions/checkout@v4

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ meteor/.coverage/
44
node_modules
55
**/yarn-error.log
66
scratch/
7+
meteor-settings.json
78

89
# Exclude JetBrains IDE specific files
910
.idea

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16
1+
22.11

DEVELOPER.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ Follow these instructions to start up Sofie Core in development mode. (For produ
1818

1919
### Prerequisites
2020

21-
- Install [Node.js](https://nodejs.org) 14 (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
22-
- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor@2`)
23-
- Install [Node.js](https://nodejs.org) 18 (using the same method you used above, you can uninstall node 14 if needed)
24-
- Install an older version of corepack (`npm install --global [email protected]`)
21+
- Install [Node.js](https://nodejs.org) 20 (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
22+
- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor`)
2523
- Enable [corepack](https://nodejs.org/api/corepack.html#corepack) (`corepack enable`) as administrator/root. If `corepack` is not found, you may need to install it first with `npm install --global corepack`
2624

2725
- If on Windows, you may need to `npm install --global windows-build-tools` but this is not always necessary

meteor/.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.meteor
22
public
3-
eslint-rules
43
scripts
54
server/_force_restart.js
65
/packages/

meteor/.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const tmpRules = {
2020
}
2121

2222
const tsBase = {
23-
extends: [...tsExtends, 'plugin:custom-rules/all'],
23+
extends: [...tsExtends],
2424
plugins: tsPlugins,
2525
...tsParser,
2626
settings: {
@@ -50,7 +50,6 @@ const tsBase = {
5050
allowModules: ['meteor', 'mongodb'],
5151
},
5252
],
53-
'jest/no-standalone-expect': 'off', // testInFiber confuses the rule
5453
...tmpRules,
5554
},
5655
}

meteor/.meteor/packages

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88

99
# but you can also edit it by hand.
1010

11-
meteor[email protected] # Packages every Meteor app needs to have
12-
[email protected] # The database Meteor supports right now
13-
reactive-var@1.0.12 # Reactive variable for tracker
11+
meteor@2.0.1
12+
13+
ddp@1.4.2
1414

15-
[email protected] # Enable ECMAScript2015+ syntax in app code
16-
[email protected] # Enable TypeScript syntax in .ts and .tsx modules
17-
[email protected] # Server-side component of the `meteor shell` command
15+
[email protected] # The database Meteor supports right now
1816

19-
[email protected] # Meteor's client-side reactive programming library
17+
[email protected] # Enable ECMAScript2015+ syntax in app code
18+
[email protected] # Enable TypeScript syntax in .ts and .tsx modules
2019

21-
22-
ostrio:meteor-root
23-
20+
[email protected] # Meteor's client-side reactive programming library
2421

25-
2622
zodern:types

0 commit comments

Comments
 (0)