Skip to content

Commit c88241f

Browse files
committed
Merge branch 'main' into fix-memory-leaks
2 parents 6a4693c + 97a4d0d commit c88241f

77 files changed

Lines changed: 2622 additions & 345 deletions

File tree

Some content is hidden

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

.github/workflows/audit.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
continue-on-error: true
1515
timeout-minutes: 15
1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@v7
1818
with:
1919
persist-credentials: false
2020
- name: Use Node.js
@@ -44,7 +44,7 @@ jobs:
4444
continue-on-error: true
4545
timeout-minutes: 15
4646
steps:
47-
- uses: actions/checkout@v6
47+
- uses: actions/checkout@v7
4848
with:
4949
persist-credentials: false
5050
- name: Use Node.js
@@ -87,7 +87,7 @@ jobs:
8787
- live-status-gateway
8888

8989
steps:
90-
- uses: actions/checkout@v6
90+
- uses: actions/checkout@v7
9191
with:
9292
persist-credentials: false
9393
- name: Use Node.js
@@ -120,7 +120,7 @@ jobs:
120120
timeout-minutes: 15
121121

122122
steps:
123-
- uses: actions/checkout@v6
123+
- uses: actions/checkout@v7
124124
with:
125125
persist-credentials: false
126126
- name: Use Node.js

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Build Docusaurus
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0

.github/workflows/node.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 15
2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v7
2222
with:
2323
persist-credentials: false
2424
- name: Use Node.js
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ubuntu-latest
6060
timeout-minutes: 30
6161
steps:
62-
- uses: actions/checkout@v6
62+
- uses: actions/checkout@v7
6363
with:
6464
persist-credentials: false
6565
- name: Use Node.js
@@ -111,7 +111,7 @@ jobs:
111111
packages: write
112112

113113
steps:
114-
- uses: actions/checkout@v6
114+
- uses: actions/checkout@v7
115115
with:
116116
persist-credentials: false
117117
- name: Use Node.js
@@ -281,7 +281,7 @@ jobs:
281281
packages: write
282282

283283
steps:
284-
- uses: actions/checkout@v6
284+
- uses: actions/checkout@v7
285285
with:
286286
persist-credentials: false
287287

@@ -414,7 +414,7 @@ jobs:
414414
timeout-minutes: 15
415415

416416
steps:
417-
- uses: actions/checkout@v6
417+
- uses: actions/checkout@v7
418418
with:
419419
persist-credentials: false
420420
- name: Use Node.js
@@ -494,7 +494,7 @@ jobs:
494494
send-coverage: true
495495

496496
steps:
497-
- uses: actions/checkout@v6
497+
- uses: actions/checkout@v7
498498
with:
499499
persist-credentials: false
500500
- name: Use Node.js ${{ matrix.node-version }}
@@ -539,7 +539,7 @@ jobs:
539539
runs-on: ubuntu-latest
540540
timeout-minutes: 15
541541
steps:
542-
- uses: actions/checkout@v6
542+
- uses: actions/checkout@v7
543543
with:
544544
persist-credentials: false
545545
- name: Use Node.js
@@ -569,7 +569,7 @@ jobs:
569569
runs-on: ubuntu-latest
570570
timeout-minutes: 15
571571
steps:
572-
- uses: actions/checkout@v6
572+
- uses: actions/checkout@v7
573573
with:
574574
persist-credentials: false
575575
- name: Use Node.js
@@ -605,7 +605,7 @@ jobs:
605605

606606
# This is just to ensure the docs build, another job performs the build & publish
607607
steps:
608-
- uses: actions/checkout@v6
608+
- uses: actions/checkout@v7
609609
with:
610610
persist-credentials: false
611611
- name: Use Node.js
@@ -652,7 +652,7 @@ jobs:
652652
runs-on: ubuntu-latest
653653
timeout-minutes: 15
654654
steps:
655-
- uses: actions/checkout@v6
655+
- uses: actions/checkout@v7
656656
with:
657657
persist-credentials: false
658658
- name: Use Node.js

.github/workflows/prune-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 15
2727
steps:
2828
- name: Checkout repo with all tags
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v7
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/publish-libs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
if: ${{ needs.check-publish.outputs.can-publish == '1' }}
5454

5555
steps:
56-
- uses: actions/checkout@v6
56+
- uses: actions/checkout@v7
5757
with:
5858
persist-credentials: false
5959
- name: Use Node.js
@@ -103,7 +103,7 @@ jobs:
103103
node-version: [22.x]
104104

105105
steps:
106-
- uses: actions/checkout@v6
106+
- uses: actions/checkout@v7
107107
with:
108108
persist-credentials: false
109109
- name: Use Node.js ${{ matrix.node-version }}
@@ -141,7 +141,7 @@ jobs:
141141
if: ${{ needs.check-publish.outputs.can-publish == '1' }}
142142

143143
steps:
144-
- uses: actions/checkout@v6
144+
- uses: actions/checkout@v7
145145
with:
146146
persist-credentials: false
147147
- name: Use Node.js
@@ -221,7 +221,7 @@ jobs:
221221
id-token: write # scoped for as short as possible, as this gives write access to npm
222222

223223
steps:
224-
- uses: actions/checkout@v6
224+
- uses: actions/checkout@v7
225225
with:
226226
fetch-depth: 0
227227
persist-credentials: false

.github/workflows/sonar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 15
2222

2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v7
2525
with:
2626
# Disabling shallow clone is recommended for improving relevancy of reporting
2727
fetch-depth: 0
@@ -54,6 +54,6 @@ jobs:
5454
env:
5555
CI: true
5656
- name: SonarQube Scan
57-
uses: SonarSource/sonarqube-scan-action@v7
57+
uses: SonarSource/sonarqube-scan-action@v8
5858
env:
5959
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/rspack.config.js b/rspack.config.js
2+
index 76ad29ad8a9b5bf31309a09c88e1c00c53193a2a..1df53de9ff941bca8291547443ad99860b131dff 100644
3+
--- a/rspack.config.js
4+
+++ b/rspack.config.js
5+
@@ -135,7 +135,7 @@ function createSwcConfig({
6+
...(isJsxEnabled && { jsx: true }),
7+
...(isAngularEnabled && { decorators: true }),
8+
},
9+
- target: 'es2015',
10+
+ target: 'es2024', // We don't care about browsers, so can target current nodejs and avoid issues with transpiling
11+
...(isReactEnabled && {
12+
transform: {
13+
react: {

meteor/eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const tmpRules = {
1414

1515
const extendedRules = await generateEslintConfig({
1616
// tsconfigName: 'tsconfig.eslint.json',
17-
ignores: ['.meteor', 'public', 'scripts', 'server/_force_restart.js', '/packages/'],
17+
ignores: ['.meteor', 'public', 'scripts', 'server/_force_restart.js', '/packages/', '_build'],
1818

1919
// disableNodeRules: true,
2020
})

meteor/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"@sofie-automation/job-worker": "portal:../packages/job-worker",
4646
"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib",
4747
"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
48+
"@swc/core": "^1.15.41",
4849
"@swc/helpers": "0.5.17",
4950
"bcrypt": "^6.0.0",
5051
"deep-extend": "0.6.0",
@@ -129,7 +130,8 @@
129130
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
130131
"@sofie-automation/corelib": "portal:../packages/corelib",
131132
"@sofie-automation/job-worker": "portal:../packages/job-worker",
132-
"@sofie-automation/shared-lib": "portal:../packages/shared-lib"
133+
"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
134+
"@meteorjs/rspack": "patch:@meteorjs/rspack@npm%3A2.0.1#~/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch"
133135
},
134136
"packageManager": "yarn@4.14.1"
135137
}

0 commit comments

Comments
 (0)