Skip to content

Commit 49730ed

Browse files
committed
Merge branch 'upstream/meteor3' into release52
2 parents c4365ad + 2095210 commit 49730ed

File tree

151 files changed

+1506
-6482
lines changed

Some content is hidden

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

151 files changed

+1506
-6482
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
yarn
3131
cd meteor
32-
meteor npm run validate:prod-dependencies
32+
yarn validate:prod-dependencies
3333
env:
3434
CI: true
3535

@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
yarn
5959
cd meteor
60-
meteor npm run validate:all-dependencies
60+
yarn run validate:all-dependencies
6161
env:
6262
CI: true
6363

.github/workflows/node.yaml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# setup zodern:types. No linters are setup, so this simply installs the packages
4747
meteor lint
4848
49-
meteor npm run ci:lint
49+
yarn ci:lint
5050
env:
5151
CI: true
5252

@@ -85,7 +85,7 @@ jobs:
8585
# setup zodern:types. No linters are setup, so this simply installs the packages
8686
meteor lint
8787
88-
NODE_OPTIONS="--max-old-space-size=6144" meteor npm run unitci --force-exit
88+
NODE_OPTIONS="--max-old-space-size=6144" yarn unitci --force-exit
8989
env:
9090
CI: true
9191
- name: Send coverage
@@ -480,38 +480,30 @@ jobs:
480480
- blueprints-integration
481481
- server-core-integration
482482
- shared-lib
483-
node-version: [14.x, 18.x, 20.x, 22.x]
483+
- openapi
484+
node-version: [22.x]
484485
include:
485486
# include additional configs, to run certain packages only for a certain version of node
486-
- node-version: 14.x
487+
- node-version: 22.x
487488
package-name: corelib
488489
send-coverage: true
489-
- node-version: 14.x
490+
- node-version: 22.x
490491
package-name: job-worker
491492
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
499493
# No tests for the gateways yet
500-
# - node-version: 18.x
494+
# - node-version: 22.x
501495
# package-name: playout-gateway
502-
# - node-version: 18.x
496+
# - node-version: 22.x
503497
# package-name: mos-gateway
504-
- node-version: 18.x
498+
- node-version: 22.x
505499
package-name: live-status-gateway
506500
send-coverage: true
507-
- node-version: 18.x
501+
- node-version: 22.x
508502
package-name: webui
509503
# manual meteor-lib as it only needs a couple of versions
510-
- node-version: 18.x
504+
- node-version: 22.x
511505
package-name: meteor-lib
512506
send-coverage: true
513-
- node-version: 14.x
514-
package-name: meteor-lib
515507

516508
steps:
517509
- uses: actions/checkout@v4
@@ -531,7 +523,7 @@ jobs:
531523
run: |
532524
cd packages
533525
yarn config set cacheFolder /home/runner/test-packages-cache
534-
node is_node_14.js && yarn lerna run --ignore openapi install || yarn install
526+
yarn install
535527
yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
536528
env:
537529
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

.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 & 9 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
@@ -142,11 +140,6 @@ Then submit this as a PR.
142140
The ConfigManifests for Blueprints and Gateways was replaced with JSONSchema in R50.
143141
However, one usage by AdlibActions for their userDataManifest remains as this is not something we are actively using.
144142

145-
## Blueprint Migrations
146-
147-
In R49, a replacement flow was added consisting of `validateConfig` and `applyConfig`.
148-
It is no longer recommended to use the old migrations flow for showstyle and studio blueprints.
149-
150143
### ExpectedMediaItems
151144

152145
These are used for Media-manager which is no longer being developed.

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: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@
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-
accounts-password@2.4.0
20+
[email protected] # Meteor's client-side reactive programming library
21+
22+
accounts-password@3.0.2
2423

25-
2624
zodern:types

meteor/.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@2.16
1+
METEOR@3.1

0 commit comments

Comments
 (0)