Merge branch 'modern-bundler-integration' into release-3.4

2026-05-02 03:01:46 -04:00 · 2025-09-19 14:28:30 +02:00
parent 4a3325888f b2c7ae3c25
commit 6581a4d83c
18 changed files with 27 additions and 18 deletions
--- 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.52",
+  "version": "0.0.53",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@meteorjs/rspack",
-      "version": "0.0.52",
+      "version": "0.0.53",
      "license": "ISC",
      "dependencies": {
        "ignore-loader": "^0.1.2",
--- a/npm-packages/meteor-rspack/package.json
+++ b/npm-packages/meteor-rspack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@meteorjs/rspack",
-  "version": "0.0.52",
+  "version": "0.0.53",
  "description": "Configuration logic for using Rspack in Meteor projects",
  "main": "index.js",
  "type": "commonjs",
--- 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.52';
+export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.53';

 export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3';

--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rspack/cli": "^1.4.8",
    "@rspack/core": "^1.4.8",
    "@tailwindcss/postcss": "^4.1.12",
--- a/tools/modern-tests/react-router.test.js
+++ b/tools/modern-tests/react-router.test.js
@@ -19,9 +19,13 @@ describe('ReactRouter App Bundling /', () => {
      process.env.METEOR_PACKAGE_DIRS = '';
    },
    customAssertions: {
+      afterInit: async ({ result }) => {
+        await waitForMeteorOutput(result.outputLines, /.*babel-plugin-react-compiler.*/);
+      },
      afterRun: async ({ result, port }) => {
        await waitForReactEnvs(result.outputLines, { isTsxEnabled: true });
-        await waitForMeteorOutput(result.outputLines, /.*babel-plugin-react-compiler.*/);
+        // negated as cached output (babel.config.js)
+        await waitForMeteorOutput(result.outputLines, /.*babel-plugin-react-compiler.*/, { negate: true });
        await assert404Page(port);
        // Less styles support
        await assertBodyStyles({
--- a/tools/modern-tests/test-helpers.js
+++ b/tools/modern-tests/test-helpers.js
@@ -200,6 +200,11 @@ export function testMeteorRspackBundler(options) {
      await assertFileExist(appDir, '.gitignore', { content: buildDir });
      await assertFileExist(appDir, configFile, { content: '@meteorjs/rspack' });

+      // Run custom assertions if provided
+      if (customAssertions && customAssertions.afterInit) {
+        await customAssertions.afterInit({ tempDir, port, meteorProcess, result });
+      }
+
      // Kill the meteor process
      await killMeteorProcess(meteorProcess);

--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
    "@rspack/plugin-react-refresh": "^1.4.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",
--- 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.52",
+    "@meteorjs/rspack": "^0.0.53",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.3",
    "@rspack/core": "^1.5.3",