Skip to content

Commit 422942f

Browse files
JulusianJulusian
committed
fix: target es2024 with meteor bundle
1 parent c9ea0fb commit 422942f

3 files changed

Lines changed: 85 additions & 53 deletions

File tree

‎meteor/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch‎

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/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
}

‎meteor/yarn.lock‎

Lines changed: 69 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,6 +1592,22 @@ __metadata:
15921592
languageName: node
15931593
linkType: hard
15941594

1595+
"@meteorjs/rspack@patch:@meteorjs/rspack@npm%3A2.0.1#~/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch":
1596+
version: 2.0.1
1597+
resolution: "@meteorjs/rspack@patch:@meteorjs/rspack@npm%3A2.0.1#~/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch::version=2.0.1&hash=660a4f"
1598+
dependencies:
1599+
fast-deep-equal: "npm:^3.1.3"
1600+
ignore-loader: "npm:^0.1.2"
1601+
node-polyfill-webpack-plugin: "npm:^4.1.0"
1602+
webpack-merge: "npm:^6.0.1"
1603+
peerDependencies:
1604+
"@rspack/cli": ">=1.3.0"
1605+
"@rspack/core": ">=1.3.0"
1606+
"@swc/core": ">=1.3.0"
1607+
checksum: 10/731954011d435b7c6378fad258661cd6bae5801761cc40d8dd3f6fdfa24d9497760f2705e5e9473ed9f5c1b7ba6842446964c3467454aad16a3a8807951a25f7
1608+
languageName: node
1609+
linkType: hard
1610+
15951611
"@module-federation/error-codes@npm:0.22.0":
15961612
version: 0.22.0
15971613
resolution: "@module-federation/error-codes@npm:0.22.0"
@@ -2427,106 +2443,106 @@ __metadata:
24272443
languageName: node
24282444
linkType: soft
24292445

2430-
"@swc/core-darwin-arm64@npm:1.15.32":
2431-
version: 1.15.32
2432-
resolution: "@swc/core-darwin-arm64@npm:1.15.32"
2446+
"@swc/core-darwin-arm64@npm:1.15.41":
2447+
version: 1.15.41
2448+
resolution: "@swc/core-darwin-arm64@npm:1.15.41"
24332449
conditions: os=darwin & cpu=arm64
24342450
languageName: node
24352451
linkType: hard
24362452

2437-
"@swc/core-darwin-x64@npm:1.15.32":
2438-
version: 1.15.32
2439-
resolution: "@swc/core-darwin-x64@npm:1.15.32"
2453+
"@swc/core-darwin-x64@npm:1.15.41":
2454+
version: 1.15.41
2455+
resolution: "@swc/core-darwin-x64@npm:1.15.41"
24402456
conditions: os=darwin & cpu=x64
24412457
languageName: node
24422458
linkType: hard
24432459

2444-
"@swc/core-linux-arm-gnueabihf@npm:1.15.32":
2445-
version: 1.15.32
2446-
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.32"
2460+
"@swc/core-linux-arm-gnueabihf@npm:1.15.41":
2461+
version: 1.15.41
2462+
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.41"
24472463
conditions: os=linux & cpu=arm
24482464
languageName: node
24492465
linkType: hard
24502466

2451-
"@swc/core-linux-arm64-gnu@npm:1.15.32":
2452-
version: 1.15.32
2453-
resolution: "@swc/core-linux-arm64-gnu@npm:1.15.32"
2467+
"@swc/core-linux-arm64-gnu@npm:1.15.41":
2468+
version: 1.15.41
2469+
resolution: "@swc/core-linux-arm64-gnu@npm:1.15.41"
24542470
conditions: os=linux & cpu=arm64 & libc=glibc
24552471
languageName: node
24562472
linkType: hard
24572473

2458-
"@swc/core-linux-arm64-musl@npm:1.15.32":
2459-
version: 1.15.32
2460-
resolution: "@swc/core-linux-arm64-musl@npm:1.15.32"
2474+
"@swc/core-linux-arm64-musl@npm:1.15.41":
2475+
version: 1.15.41
2476+
resolution: "@swc/core-linux-arm64-musl@npm:1.15.41"
24612477
conditions: os=linux & cpu=arm64 & libc=musl
24622478
languageName: node
24632479
linkType: hard
24642480

2465-
"@swc/core-linux-ppc64-gnu@npm:1.15.32":
2466-
version: 1.15.32
2467-
resolution: "@swc/core-linux-ppc64-gnu@npm:1.15.32"
2481+
"@swc/core-linux-ppc64-gnu@npm:1.15.41":
2482+
version: 1.15.41
2483+
resolution: "@swc/core-linux-ppc64-gnu@npm:1.15.41"
24682484
conditions: os=linux & cpu=ppc64 & libc=glibc
24692485
languageName: node
24702486
linkType: hard
24712487

2472-
"@swc/core-linux-s390x-gnu@npm:1.15.32":
2473-
version: 1.15.32
2474-
resolution: "@swc/core-linux-s390x-gnu@npm:1.15.32"
2488+
"@swc/core-linux-s390x-gnu@npm:1.15.41":
2489+
version: 1.15.41
2490+
resolution: "@swc/core-linux-s390x-gnu@npm:1.15.41"
24752491
conditions: os=linux & cpu=s390x & libc=glibc
24762492
languageName: node
24772493
linkType: hard
24782494

2479-
"@swc/core-linux-x64-gnu@npm:1.15.32":
2480-
version: 1.15.32
2481-
resolution: "@swc/core-linux-x64-gnu@npm:1.15.32"
2495+
"@swc/core-linux-x64-gnu@npm:1.15.41":
2496+
version: 1.15.41
2497+
resolution: "@swc/core-linux-x64-gnu@npm:1.15.41"
24822498
conditions: os=linux & cpu=x64 & libc=glibc
24832499
languageName: node
24842500
linkType: hard
24852501

2486-
"@swc/core-linux-x64-musl@npm:1.15.32":
2487-
version: 1.15.32
2488-
resolution: "@swc/core-linux-x64-musl@npm:1.15.32"
2502+
"@swc/core-linux-x64-musl@npm:1.15.41":
2503+
version: 1.15.41
2504+
resolution: "@swc/core-linux-x64-musl@npm:1.15.41"
24892505
conditions: os=linux & cpu=x64 & libc=musl
24902506
languageName: node
24912507
linkType: hard
24922508

2493-
"@swc/core-win32-arm64-msvc@npm:1.15.32":
2494-
version: 1.15.32
2495-
resolution: "@swc/core-win32-arm64-msvc@npm:1.15.32"
2509+
"@swc/core-win32-arm64-msvc@npm:1.15.41":
2510+
version: 1.15.41
2511+
resolution: "@swc/core-win32-arm64-msvc@npm:1.15.41"
24962512
conditions: os=win32 & cpu=arm64
24972513
languageName: node
24982514
linkType: hard
24992515

2500-
"@swc/core-win32-ia32-msvc@npm:1.15.32":
2501-
version: 1.15.32
2502-
resolution: "@swc/core-win32-ia32-msvc@npm:1.15.32"
2516+
"@swc/core-win32-ia32-msvc@npm:1.15.41":
2517+
version: 1.15.41
2518+
resolution: "@swc/core-win32-ia32-msvc@npm:1.15.41"
25032519
conditions: os=win32 & cpu=ia32
25042520
languageName: node
25052521
linkType: hard
25062522

2507-
"@swc/core-win32-x64-msvc@npm:1.15.32":
2508-
version: 1.15.32
2509-
resolution: "@swc/core-win32-x64-msvc@npm:1.15.32"
2523+
"@swc/core-win32-x64-msvc@npm:1.15.41":
2524+
version: 1.15.41
2525+
resolution: "@swc/core-win32-x64-msvc@npm:1.15.41"
25102526
conditions: os=win32 & cpu=x64
25112527
languageName: node
25122528
linkType: hard
25132529

2514-
"@swc/core@npm:^1.15.18, @swc/core@npm:^1.15.26":
2515-
version: 1.15.32
2516-
resolution: "@swc/core@npm:1.15.32"
2530+
"@swc/core@npm:^1.15.18, @swc/core@npm:^1.15.26, @swc/core@npm:^1.15.41":
2531+
version: 1.15.41
2532+
resolution: "@swc/core@npm:1.15.41"
25172533
dependencies:
2518-
"@swc/core-darwin-arm64": "npm:1.15.32"
2519-
"@swc/core-darwin-x64": "npm:1.15.32"
2520-
"@swc/core-linux-arm-gnueabihf": "npm:1.15.32"
2521-
"@swc/core-linux-arm64-gnu": "npm:1.15.32"
2522-
"@swc/core-linux-arm64-musl": "npm:1.15.32"
2523-
"@swc/core-linux-ppc64-gnu": "npm:1.15.32"
2524-
"@swc/core-linux-s390x-gnu": "npm:1.15.32"
2525-
"@swc/core-linux-x64-gnu": "npm:1.15.32"
2526-
"@swc/core-linux-x64-musl": "npm:1.15.32"
2527-
"@swc/core-win32-arm64-msvc": "npm:1.15.32"
2528-
"@swc/core-win32-ia32-msvc": "npm:1.15.32"
2529-
"@swc/core-win32-x64-msvc": "npm:1.15.32"
2534+
"@swc/core-darwin-arm64": "npm:1.15.41"
2535+
"@swc/core-darwin-x64": "npm:1.15.41"
2536+
"@swc/core-linux-arm-gnueabihf": "npm:1.15.41"
2537+
"@swc/core-linux-arm64-gnu": "npm:1.15.41"
2538+
"@swc/core-linux-arm64-musl": "npm:1.15.41"
2539+
"@swc/core-linux-ppc64-gnu": "npm:1.15.41"
2540+
"@swc/core-linux-s390x-gnu": "npm:1.15.41"
2541+
"@swc/core-linux-x64-gnu": "npm:1.15.41"
2542+
"@swc/core-linux-x64-musl": "npm:1.15.41"
2543+
"@swc/core-win32-arm64-msvc": "npm:1.15.41"
2544+
"@swc/core-win32-ia32-msvc": "npm:1.15.41"
2545+
"@swc/core-win32-x64-msvc": "npm:1.15.41"
25302546
"@swc/counter": "npm:^0.1.3"
25312547
"@swc/types": "npm:^0.1.26"
25322548
peerDependencies:
@@ -2559,7 +2575,7 @@ __metadata:
25592575
peerDependenciesMeta:
25602576
"@swc/helpers":
25612577
optional: true
2562-
checksum: 10/917e1448ca7c37655ce693f7c75b8393bb7fd6cc202ab1a8b9dd5e2344ee4274b2a3dffad514eee2c5b7a37f2b4b08dd8478fea30b7dad375a03deedc2387d03
2578+
checksum: 10/4d4b47885468bb6635a06040afa566e5568b55c7a43facceadca39ebd093a96e5d11701d8a92872321ae527f873701de10a9be2b3d96c1a7188e3e862c4072c4
25632579
languageName: node
25642580
linkType: hard
25652581

@@ -3840,6 +3856,7 @@ __metadata:
38403856
"@sofie-automation/job-worker": "portal:../packages/job-worker"
38413857
"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib"
38423858
"@sofie-automation/shared-lib": "portal:../packages/shared-lib"
3859+
"@swc/core": "npm:^1.15.41"
38433860
"@swc/helpers": "npm:0.5.17"
38443861
"@types/deep-extend": "npm:^0.6.2"
38453862
"@types/jest": "npm:^30.0.0"

0 commit comments

Comments
 (0)