enhanced rspack.config.js to support testClientEntry and testServerEntry settings for better test entry handling

2026-05-02 03:01:46 -04:00 · 2025-11-13 10:06:40 +01:00
parent 7a30d81e21
commit fa66aa1a3d
18 changed files with 26 additions and 20 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.1.4",
+  "version": "0.1.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@meteorjs/rspack",
-      "version": "0.1.4",
+      "version": "0.1.5",
      "license": "ISC",
      "dependencies": {
        "fast-deep-equal": "^3.1.3",
--- a/npm-packages/meteor-rspack/package.json
+++ b/npm-packages/meteor-rspack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@meteorjs/rspack",
-  "version": "0.1.4",
+  "version": "0.1.5",
  "description": "Configuration logic for using Rspack in Meteor projects",
  "main": "index.js",
  "type": "commonjs",
--- a/npm-packages/meteor-rspack/rspack.config.js
+++ b/npm-packages/meteor-rspack/rspack.config.js
@@ -227,6 +227,8 @@ module.exports = async function (inMeteor = {}, argv = {}) {
  const projectConfigPath = Meteor.projectConfigPath || path.resolve(projectDir, 'rspack.config.js');
  const configPath = Meteor.configPath;
  const testEntry = Meteor.testEntry;
+  const testClientEntry = Meteor.testClientEntry;
+  const testServerEntry = Meteor.testServerEntry;

  const isTypescriptEnabled = Meteor.isTypescriptEnabled || false;
  const isJsxEnabled =
@@ -428,8 +430,10 @@ module.exports = async function (inMeteor = {}, argv = {}) {
          ignoreEntries: [...meteorIgnoreEntries, "**/server/**"],
          prefix: "client",
        })
-      : isTest
+      : isTest && testEntry
      ? path.resolve(process.cwd(), testEntry)
+      : isTest && testClientEntry
+      ? path.resolve(process.cwd(), testClientEntry)
      : path.resolve(process.cwd(), buildContext, entryPath);
  const clientNameConfig = `[${(isTest && 'test-') || ''}client-rspack]`;
  // Base client config
@@ -543,8 +547,10 @@ module.exports = async function (inMeteor = {}, argv = {}) {
          ignoreEntries: [...meteorIgnoreEntries, "**/client/**"],
          prefix: "server",
        })
-      : isTest
+      : isTest && testEntry
      ? path.resolve(process.cwd(), testEntry)
+      : isTest && testServerEntry
+      ? path.resolve(process.cwd(), testServerEntry)
      : path.resolve(projectDir, buildContext, entryPath);
  const serverNameConfig = `[${(isTest && 'test-') || ''}server-rspack]`;
  // Base server config
--- a/packages/rspack/lib/constants.js
+++ b/packages/rspack/lib/constants.js
@@ -5,7 +5,7 @@

 export const DEFAULT_RSPACK_VERSION = '1.6.0';

-export const DEFAULT_METEOR_RSPACK_VERSION = '0.1.4';
+export const DEFAULT_METEOR_RSPACK_VERSION = '0.1.5';

 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rspack/cli": "^1.4.8",
    "@rspack/core": "^1.4.8",
    "@tailwindcss/postcss": "^4.1.12",
--- a/tools/static-assets/skel-angular/package.json
+++ b/tools/static-assets/skel-angular/package.json
@@ -22,7 +22,7 @@
  },
  "devDependencies": {
    "@angular/compiler-cli": "^20.0.0",
-    "@meteorjs/rspack": "^0.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@nx/angular-rspack": "^21.1.0",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
    "@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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- a/tools/static-assets/skel-coffeescript/package.json
+++ b/tools/static-assets/skel-coffeescript/package.json
@@ -15,7 +15,7 @@
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",
--- 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.1.4",
+    "@meteorjs/rspack": "^0.1.5",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.6.0",
    "@rspack/core": "^1.6.0",