From 3fe1cf682db9811c681c8ee3c6bcfb0f1804b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Mon, 22 Sep 2025 17:25:24 +0200 Subject: [PATCH] udate Rspack version to 0.0.55 and fix a React issue on server side with email components --- npm-packages/meteor-rspack/package-lock.json | 4 ++-- npm-packages/meteor-rspack/package.json | 2 +- npm-packages/meteor-rspack/rspack.config.js | 4 +++- packages/rspack/lib/constants.js | 2 +- .../monorepo/app/imports/emails/TestEmail.jsx | 15 +++++++++++++++ tools/modern-tests/apps/monorepo/app/package.json | 1 + .../modern-tests/apps/monorepo/app/server/main.js | 3 +++ 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 +- 20 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 tools/modern-tests/apps/monorepo/app/imports/emails/TestEmail.jsx diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index 121e31d2e4..1af0f8a6dc 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.54", + "version": "0.0.55", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "0.0.54", + "version": "0.0.55", "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 f4745c6dcf..2bbb043043 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.54", + "version": "0.0.55", "description": "Configuration logic for using Rspack in Meteor projects", "main": "index.js", "type": "commonjs", diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index 13701e3e13..878128f8d8 100644 --- a/npm-packages/meteor-rspack/rspack.config.js +++ b/npm-packages/meteor-rspack/rspack.config.js @@ -50,6 +50,7 @@ function createSwcConfig({ isTsxEnabled, externalHelpers, isDevEnvironment, + isClient, }) { const defaultConfig = { jsc: { @@ -64,7 +65,7 @@ function createSwcConfig({ transform: { react: { development: isDevEnvironment, - refresh: isDevEnvironment, + ...(isClient && { refresh: isDevEnvironment }), }, }, externalHelpers, @@ -229,6 +230,7 @@ module.exports = async function (inMeteor = {}, argv = {}) { isTsxEnabled, externalHelpers: enableSwcExternalHelpers, isDevEnvironment, + isClient, }); // Expose swc config to use in custom configs Meteor.swcConfigOptions = swcConfigRule.options; diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index 257fa9ae63..bf495ec1ea 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.54'; +export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.55'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/tools/modern-tests/apps/monorepo/app/imports/emails/TestEmail.jsx b/tools/modern-tests/apps/monorepo/app/imports/emails/TestEmail.jsx new file mode 100644 index 0000000000..4d2a6c491c --- /dev/null +++ b/tools/modern-tests/apps/monorepo/app/imports/emails/TestEmail.jsx @@ -0,0 +1,15 @@ +import { Button, Html } from '@react-email/components'; +import * as React from 'react'; + +export default function TestEmail() { + return ( + + + + ); +} diff --git a/tools/modern-tests/apps/monorepo/app/package.json b/tools/modern-tests/apps/monorepo/app/package.json index 959d48a987..ee33e0b059 100644 --- a/tools/modern-tests/apps/monorepo/app/package.json +++ b/tools/modern-tests/apps/monorepo/app/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@babel/runtime": "^7.23.5", + "@react-email/components": "0.5.3", "@swc/helpers": "^0.5.17", "meteor-node-stubs": "^1.2.12", "react": "^18.2.0", diff --git a/tools/modern-tests/apps/monorepo/app/server/main.js b/tools/modern-tests/apps/monorepo/app/server/main.js index 49452ad352..ee5c021669 100644 --- a/tools/modern-tests/apps/monorepo/app/server/main.js +++ b/tools/modern-tests/apps/monorepo/app/server/main.js @@ -1,5 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { LinksCollection } from '/imports/api/links'; +import { TestEmail } from '/imports/emails/TestEmail'; + +console.log('-> TestEmail loaded', !!TestEmail); async function insertLink({ title, url }) { await LinksCollection.insertAsync({ title, url, createdAt: new Date() }); diff --git a/tools/modern-tests/apps/vue/package.json b/tools/modern-tests/apps/vue/package.json index 092833dc8a..cdc830acba 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 c21de5ce5f..85ed486b89 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 042f9b3eab..36bd07c57e 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 0a75f00bf4..4d62e5d130 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 d84dde8416..0bf0ea0609 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 0abbee8276..4f56fcb9f8 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 dbfa49f93f..35b7ec14a5 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 20bb8d1470..d4542e780c 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 621cd9f703..f840855ef9 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 af7aeaf929..57eb462529 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 da9e5c7bdf..3d0b591759 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 1a4a81cde3..e8a1b041c4 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.54", + "@meteorjs/rspack": "^0.0.55", "@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 2882f7751e..bd38a841b5 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.54", + "@meteorjs/rspack": "^0.0.55", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.5.3", "@rspack/core": "^1.5.3",