From 33cafe7dcc4a829171b268c4bda9b9959dd7b2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 23 Sep 2025 14:37:47 +0200 Subject: [PATCH 1/3] add optional React configuration to SWC loader --- npm-packages/meteor-rspack/rspack.config.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index 878128f8d8..dba120b9bf 100644 --- a/npm-packages/meteor-rspack/rspack.config.js +++ b/npm-packages/meteor-rspack/rspack.config.js @@ -46,6 +46,7 @@ function createCacheStrategy(mode, side) { // SWC loader rule (JSX/JS) function createSwcConfig({ isTypescriptEnabled, + isReactEnabled, isJsxEnabled, isTsxEnabled, externalHelpers, @@ -62,12 +63,14 @@ function createSwcConfig({ ...(isJsxEnabled && { jsx: true }), }, target: 'es2015', - transform: { - react: { - development: isDevEnvironment, - ...(isClient && { refresh: isDevEnvironment }), + ...(isReactEnabled && { + transform: { + react: { + development: isDevEnvironment, + ...(isClient && { refresh: isDevEnvironment }), + }, }, - }, + }), externalHelpers, }, }; @@ -226,6 +229,7 @@ module.exports = async function (inMeteor = {}, argv = {}) { const isDevEnvironment = isRun && isDev && !isTest && !isNative; const swcConfigRule = createSwcConfig({ isTypescriptEnabled, + isReactEnabled, isJsxEnabled, isTsxEnabled, externalHelpers: enableSwcExternalHelpers, From 5e4e11740d904eb098477192dd25a9079bd17163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 23 Sep 2025 14:40:25 +0200 Subject: [PATCH 2/3] bump @meteorjs/rspack version to 0.0.56 and ensure react transform only applied when enabled --- npm-packages/meteor-rspack/package-lock.json | 4 ++-- npm-packages/meteor-rspack/package.json | 2 +- packages/rspack/lib/constants.js | 2 +- tools/modern-tests/apps/vue/package.json | 2 +- tools/static-assets/skel-apollo/package.json | 2 +- tools/static-assets/skel-babel/package.json | 2 +- tools/static-assets/skel-blaze/package.json | 2 +- tools/static-assets/skel-chakra-ui/package.json | 2 +- tools/static-assets/skel-coffee/package.json | 2 +- tools/static-assets/skel-full/package.json | 2 +- tools/static-assets/skel-react/package.json | 2 +- tools/static-assets/skel-solid/package.json | 2 +- tools/static-assets/skel-svelte/package.json | 2 +- tools/static-assets/skel-tailwind/package.json | 2 +- tools/static-assets/skel-typescript/package.json | 2 +- tools/static-assets/skel-vue/package.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index 1af0f8a6dc..83804870b4 100644 --- a/npm-packages/meteor-rspack/package-lock.json +++ b/npm-packages/meteor-rspack/package-lock.json @@ -1,12 +1,12 @@ { "name": "@meteorjs/rspack", - "version": "0.0.55", + "version": "0.0.56", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "0.0.55", + "version": "0.0.56", "license": "ISC", "dependencies": { "ignore-loader": "^0.1.2", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index 2bbb043043..7c491a6da5 100644 --- a/npm-packages/meteor-rspack/package.json +++ b/npm-packages/meteor-rspack/package.json @@ -1,6 +1,6 @@ { "name": "@meteorjs/rspack", - "version": "0.0.55", + "version": "0.0.56", "description": "Configuration logic for using Rspack in Meteor projects", "main": "index.js", "type": "commonjs", diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index bf495ec1ea..ee1b74a091 100644 --- a/packages/rspack/lib/constants.js +++ b/packages/rspack/lib/constants.js @@ -5,7 +5,7 @@ export const DEFAULT_RSPACK_VERSION = '1.5.3'; -export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.55'; +export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.56'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/tools/modern-tests/apps/vue/package.json b/tools/modern-tests/apps/vue/package.json index cdc830acba..57302a6ba1 100644 --- a/tools/modern-tests/apps/vue/package.json +++ b/tools/modern-tests/apps/vue/package.json @@ -17,7 +17,7 @@ "vue-router": "^4.2.5" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@tailwindcss/postcss": "^4.1.12", diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json index 85ed486b89..d6bfb78ff0 100644 --- a/tools/static-assets/skel-apollo/package.json +++ b/tools/static-assets/skel-apollo/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@graphql-tools/webpack-loader": "^7.0.0", "@rsdoctor/rspack-plugin": "^1.2.3", - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", "@rspack/plugin-react-refresh": "^1.4.3", diff --git a/tools/static-assets/skel-babel/package.json b/tools/static-assets/skel-babel/package.json index 36bd07c57e..ead41cdf58 100644 --- a/tools/static-assets/skel-babel/package.json +++ b/tools/static-assets/skel-babel/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@babel/preset-env": "^7.28.3", "@babel/preset-react": "^7.23.3", - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json index 4d62e5d130..b1e818757b 100644 --- a/tools/static-assets/skel-blaze/package.json +++ b/tools/static-assets/skel-blaze/package.json @@ -14,7 +14,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json index 0bf0ea0609..0b15dd5028 100644 --- a/tools/static-assets/skel-chakra-ui/package.json +++ b/tools/static-assets/skel-chakra-ui/package.json @@ -21,7 +21,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-coffee/package.json b/tools/static-assets/skel-coffee/package.json index 4f56fcb9f8..152eb69afe 100644 --- a/tools/static-assets/skel-coffee/package.json +++ b/tools/static-assets/skel-coffee/package.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json index 35b7ec14a5..b1226e9ec8 100644 --- a/tools/static-assets/skel-full/package.json +++ b/tools/static-assets/skel-full/package.json @@ -12,7 +12,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json index d4542e780c..893b600590 100644 --- a/tools/static-assets/skel-react/package.json +++ b/tools/static-assets/skel-react/package.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json index f840855ef9..200277f0b5 100644 --- a/tools/static-assets/skel-solid/package.json +++ b/tools/static-assets/skel-solid/package.json @@ -14,7 +14,7 @@ "picocolors": "^1.1.1" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json index 57eb462529..0bb5bac820 100644 --- a/tools/static-assets/skel-svelte/package.json +++ b/tools/static-assets/skel-svelte/package.json @@ -13,7 +13,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json index 3d0b591759..672f18e444 100644 --- a/tools/static-assets/skel-tailwind/package.json +++ b/tools/static-assets/skel-tailwind/package.json @@ -16,7 +16,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json index e8a1b041c4..cab90fb577 100644 --- a/tools/static-assets/skel-typescript/package.json +++ b/tools/static-assets/skel-typescript/package.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json index bd38a841b5..8c60d8069e 100644 --- a/tools/static-assets/skel-vue/package.json +++ b/tools/static-assets/skel-vue/package.json @@ -17,7 +17,7 @@ "vue-router": "^4.2.5" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.55", + "@meteorjs/rspack": "^0.0.56", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3", From c34b06fb7d1c9923cfcdac74f9161802204c810e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 23 Sep 2025 14:53:17 +0200 Subject: [PATCH 3/3] bump @meteorjs/swc-core version to 1.13.5 --- packages/babel-compiler/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 2e69cdc028..6055b82852 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -8,7 +8,7 @@ Npm.depends({ '@meteorjs/babel': '7.20.1', 'json5': '2.2.3', 'semver': '7.6.3', - "@meteorjs/swc-core": "1.12.14", + "@meteorjs/swc-core": "1.13.5", }); Package.onUse(function (api) { diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 6f23b6e939..384cad5770 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -12,7 +12,7 @@ Package.registerBuildPlugin({ 'ecmascript' ], npmDependencies: { - '@meteorjs/swc-core': '1.12.14', + '@meteorjs/swc-core': '1.13.5', 'acorn': '8.10.0', "@babel/runtime": "7.18.9", '@babel/parser': '7.22.7',