Skip to content

fix: target es2024 with meteor bundle #1775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Julusian merged 1 commit into from
Jun 22, 2026
Merged

fix: target es2024 with meteor bundle #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions meteor/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/rspack.config.js b/rspack.config.js
index 76ad29ad8a9b5bf31309a09c88e1c00c53193a2a..1df53de9ff941bca8291547443ad99860b131dff 100644
--- a/rspack.config.js
+++ b/rspack.config.js
@@ -135,7 +135,7 @@ function createSwcConfig({
...(isJsxEnabled && { jsx: true }),
...(isAngularEnabled && { decorators: true }),
},
- target: 'es2015',
+ target: 'es2024', // We don't care about browsers, so can target current nodejs and avoid issues with transpiling
...(isReactEnabled && {
transform: {
react: {
4 changes: 3 additions & 1 deletion meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@sofie-automation/job-worker": "portal:../packages/job-worker",
"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib",
"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
"@swc/core": "^1.15.41",
"@swc/helpers": "0.5.17",
"bcrypt": "^6.0.0",
"deep-extend": "0.6.0",
Expand Down Expand Up @@ -129,7 +130,8 @@
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
"@sofie-automation/corelib": "portal:../packages/corelib",
"@sofie-automation/job-worker": "portal:../packages/job-worker",
"@sofie-automation/shared-lib": "portal:../packages/shared-lib"
"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
"@meteorjs/rspack": "patch:@meteorjs/rspack@npm%3A2.0.1#~/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch"
},
"packageManager": "yarn@4.14.1"
}
121 changes: 69 additions & 52 deletions meteor/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,22 @@ __metadata:
languageName: node
linkType: hard

"@meteorjs/rspack@patch:@meteorjs/rspack@npm%3A2.0.1#~/.yarn/patches/@meteorjs-rspack-npm-2.0.1-d001eb481c.patch":
version: 2.0.1
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"
dependencies:
fast-deep-equal: "npm:^3.1.3"
ignore-loader: "npm:^0.1.2"
node-polyfill-webpack-plugin: "npm:^4.1.0"
webpack-merge: "npm:^6.0.1"
peerDependencies:
"@rspack/cli": ">=1.3.0"
"@rspack/core": ">=1.3.0"
"@swc/core": ">=1.3.0"
checksum: 10/731954011d435b7c6378fad258661cd6bae5801761cc40d8dd3f6fdfa24d9497760f2705e5e9473ed9f5c1b7ba6842446964c3467454aad16a3a8807951a25f7
languageName: node
linkType: hard

"@module-federation/error-codes@npm:0.22.0":
version: 0.22.0
resolution: "@module-federation/error-codes@npm:0.22.0"
Expand Down Expand Up @@ -2427,106 +2443,106 @@ __metadata:
languageName: node
linkType: soft

"@swc/core-darwin-arm64@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-darwin-arm64@npm:1.15.32"
"@swc/core-darwin-arm64@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-darwin-arm64@npm:1.15.41"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@swc/core-darwin-x64@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-darwin-x64@npm:1.15.32"
"@swc/core-darwin-x64@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-darwin-x64@npm:1.15.41"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@swc/core-linux-arm-gnueabihf@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.32"
"@swc/core-linux-arm-gnueabihf@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.41"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@swc/core-linux-arm64-gnu@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-arm64-gnu@npm:1.15.32"
"@swc/core-linux-arm64-gnu@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-arm64-gnu@npm:1.15.41"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@swc/core-linux-arm64-musl@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-arm64-musl@npm:1.15.32"
"@swc/core-linux-arm64-musl@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-arm64-musl@npm:1.15.41"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@swc/core-linux-ppc64-gnu@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-ppc64-gnu@npm:1.15.32"
"@swc/core-linux-ppc64-gnu@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-ppc64-gnu@npm:1.15.41"
conditions: os=linux & cpu=ppc64 & libc=glibc
languageName: node
linkType: hard

"@swc/core-linux-s390x-gnu@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-s390x-gnu@npm:1.15.32"
"@swc/core-linux-s390x-gnu@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-s390x-gnu@npm:1.15.41"
conditions: os=linux & cpu=s390x & libc=glibc
languageName: node
linkType: hard

"@swc/core-linux-x64-gnu@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-x64-gnu@npm:1.15.32"
"@swc/core-linux-x64-gnu@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-x64-gnu@npm:1.15.41"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@swc/core-linux-x64-musl@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-linux-x64-musl@npm:1.15.32"
"@swc/core-linux-x64-musl@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-linux-x64-musl@npm:1.15.41"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@swc/core-win32-arm64-msvc@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-win32-arm64-msvc@npm:1.15.32"
"@swc/core-win32-arm64-msvc@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-win32-arm64-msvc@npm:1.15.41"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@swc/core-win32-ia32-msvc@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-win32-ia32-msvc@npm:1.15.32"
"@swc/core-win32-ia32-msvc@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-win32-ia32-msvc@npm:1.15.41"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@swc/core-win32-x64-msvc@npm:1.15.32":
version: 1.15.32
resolution: "@swc/core-win32-x64-msvc@npm:1.15.32"
"@swc/core-win32-x64-msvc@npm:1.15.41":
version: 1.15.41
resolution: "@swc/core-win32-x64-msvc@npm:1.15.41"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@swc/core@npm:^1.15.18, @swc/core@npm:^1.15.26":
version: 1.15.32
resolution: "@swc/core@npm:1.15.32"
"@swc/core@npm:^1.15.18, @swc/core@npm:^1.15.26, @swc/core@npm:^1.15.41":
version: 1.15.41
resolution: "@swc/core@npm:1.15.41"
dependencies:
"@swc/core-darwin-arm64": "npm:1.15.32"
"@swc/core-darwin-x64": "npm:1.15.32"
"@swc/core-linux-arm-gnueabihf": "npm:1.15.32"
"@swc/core-linux-arm64-gnu": "npm:1.15.32"
"@swc/core-linux-arm64-musl": "npm:1.15.32"
"@swc/core-linux-ppc64-gnu": "npm:1.15.32"
"@swc/core-linux-s390x-gnu": "npm:1.15.32"
"@swc/core-linux-x64-gnu": "npm:1.15.32"
"@swc/core-linux-x64-musl": "npm:1.15.32"
"@swc/core-win32-arm64-msvc": "npm:1.15.32"
"@swc/core-win32-ia32-msvc": "npm:1.15.32"
"@swc/core-win32-x64-msvc": "npm:1.15.32"
"@swc/core-darwin-arm64": "npm:1.15.41"
"@swc/core-darwin-x64": "npm:1.15.41"
"@swc/core-linux-arm-gnueabihf": "npm:1.15.41"
"@swc/core-linux-arm64-gnu": "npm:1.15.41"
"@swc/core-linux-arm64-musl": "npm:1.15.41"
"@swc/core-linux-ppc64-gnu": "npm:1.15.41"
"@swc/core-linux-s390x-gnu": "npm:1.15.41"
"@swc/core-linux-x64-gnu": "npm:1.15.41"
"@swc/core-linux-x64-musl": "npm:1.15.41"
"@swc/core-win32-arm64-msvc": "npm:1.15.41"
"@swc/core-win32-ia32-msvc": "npm:1.15.41"
"@swc/core-win32-x64-msvc": "npm:1.15.41"
"@swc/counter": "npm:^0.1.3"
"@swc/types": "npm:^0.1.26"
peerDependencies:
Expand Down Expand Up @@ -2559,7 +2575,7 @@ __metadata:
peerDependenciesMeta:
"@swc/helpers":
optional: true
checksum: 10/917e1448ca7c37655ce693f7c75b8393bb7fd6cc202ab1a8b9dd5e2344ee4274b2a3dffad514eee2c5b7a37f2b4b08dd8478fea30b7dad375a03deedc2387d03
checksum: 10/4d4b47885468bb6635a06040afa566e5568b55c7a43facceadca39ebd093a96e5d11701d8a92872321ae527f873701de10a9be2b3d96c1a7188e3e862c4072c4
languageName: node
linkType: hard

Expand Down Expand Up @@ -3840,6 +3856,7 @@ __metadata:
"@sofie-automation/job-worker": "portal:../packages/job-worker"
"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib"
"@sofie-automation/shared-lib": "portal:../packages/shared-lib"
"@swc/core": "npm:^1.15.41"
"@swc/helpers": "npm:0.5.17"
"@types/deep-extend": "npm:^0.6.2"
"@types/jest": "npm:^30.0.0"
Expand Down
Loading