diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index 4d43061599..a648947ce6 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.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", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index 128d9d7947..057755bd0a 100644 --- 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", diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index abf277ee50..47948866dd 100644 --- 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 diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index cf3329063c..36ffb02761 100644 --- 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'; diff --git a/tools/modern-tests/apps/vue/package.json b/tools/modern-tests/apps/vue/package.json index a4ee5364d0..6e166ea67d 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@tailwindcss/postcss": "^4.1.12", diff --git a/tools/static-assets/skel-angular/package.json b/tools/static-assets/skel-angular/package.json index b27d20ae7c..921dd214ce 100644 --- 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", diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json index 7b87801d50..2fd4293ab9 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", "@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 f837e25219..5f57157e03 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json index 246f7199d5..7e284f0f50 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json index bb273c5395..f1bd6c9a73 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-coffeescript/package.json b/tools/static-assets/skel-coffeescript/package.json index 038aababf8..5dde4dc447 100644 --- 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", diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json index 2e683bf05e..eb9d907882 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json index e05b74d45b..6c17b4389c 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json index 103a7f50fe..fd34fb60f1 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json index 38e56933b8..d4698525aa 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json index 82f1708990..6cee0e65d0 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json index 34be51d6a7..06a2a4f3d6 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0", diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json index 8aa0de6f83..46a6dbbef9 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.1.4", + "@meteorjs/rspack": "^0.1.5", "@rsdoctor/rspack-plugin": "^1.2.3", "@rspack/cli": "^1.6.0", "@rspack/core": "^1.6.0",