Revert "update Meteor Rspack to support cross-os multiline banner output"

This reverts commit fb3aeff59a.

npm-packages/meteor-rspack/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.0.37",
+  "version": "0.0.36",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@meteorjs/rspack",
-      "version": "0.0.37",
+      "version": "0.0.36",
       "license": "ISC",
       "dependencies": {
         "ignore-loader": "^0.1.2",

npm-packages/meteor-rspack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.0.37",
+  "version": "0.0.36",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "module",

npm-packages/meteor-rspack/rspack.config.js

@@ -147,7 +147,7 @@ export default function (inMeteor = {}, argv = {}) {
   const runPath = Meteor.runPath;
 
   // Determine banner
-  const bannerOutput = JSON.parse(Meteor.bannerOutput || process.env.RSPACK_BANNER || '');
+  const bannerOutput = JSON.parse(Meteor.bannerOutput || '');
 
   // Determine output directories
   const clientOutputDir = path.resolve(process.cwd(), 'public');

packages/rspack/lib/constants.js

@@ -5,7 +5,7 @@
 
 export const DEFAULT_RSPACK_VERSION = '1.5.0';
 
-export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.37';
+export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.36';
 
 export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3';
 

packages/rspack/lib/processes.js

@@ -59,11 +59,11 @@ export function getConfigFileName() {
 }
 
 /**
- * Gets the appropriate Rspack environment variables and command line arguments
+ * Gets the appropriate Rspack environment variables
  * @param {Object} options - Options for environment variables
  * @param {boolean} options.isClient - Whether this is for client-side build
  * @param {boolean} options.isServer - Whether this is for server-side build
- * @returns {Object} Object containing params (command line arguments) and envs (environment variables)
+ * @returns {string[]} Array of command line arguments for Rspack
  */
 export function getRspackEnv({ isClient, isServer, isTest: inIsTest }) {
   const RSPACK_BUILD_CONTEXT = require('./constants').RSPACK_BUILD_CONTEXT;
@@ -127,6 +127,7 @@ export function getRspackEnv({ isClient, isServer, isTest: inIsTest }) {
       }),
     ],
     ['runPath', getBuildFilePath({ ...module, ...env, ...side, ...commandRole }) ],
+    ['bannerOutput', JSON.stringify(getBuildFileContent({ ...module, ...env, ...side, role: FILE_ROLE.output }))],
     ['buildContext', RSPACK_BUILD_CONTEXT],
     ['chunksContext', RSPACK_CHUNKS_CONTEXT],
     ['assetsContext', RSPACK_ASSETS_CONTEXT],
@@ -141,19 +142,10 @@ export function getRspackEnv({ isClient, isServer, isTest: inIsTest }) {
     ...(isBundleVisualizerEnabled &&  [['isBundleVisualizerEnabled', isBundleVisualizerEnabled]] || []),
 
   ].filter(Boolean);
-
+  return pairs.flatMap(([key, val]) => [
-  // Create environment variables object with bannerOutput
-  const envs = {
-    RSPACK_BANNER: JSON.stringify(getBuildFileContent({ ...module, ...env, ...side, role: FILE_ROLE.output }))
-  };
-
-  // Create params from pairs
-  const params = pairs.flatMap(([key, val]) => [
     '--env',
     `${key}=${val}`
   ]);
-
-  return { params, envs };
 }
 
 /**
@@ -174,13 +166,11 @@ export function startRspackClientServe(options = {}) {
 
   const appDir = getMeteorAppDir();
   const configFile = getConfigFileName();
-  const { params, envs } = getRspackEnv({ isClient: true, isServer: false });
+  const { command, args } = getNpxCommand(['rspack', 'serve', '--config', configFile, ...getRspackEnv({ isClient: true, isServer: false })]);
-  const { command, args } = getNpxCommand(['rspack', 'serve', '--config', configFile, ...params]);
   const newClientProcess = spawnProcess(
     command,
     args, {
       cwd: appDir,
-      env: { ...process.env, ...envs },
       onStdout: (data) => {
         logInfo(`[Rspack Client] ${data}`);
         if (onCompile && data.trim().includes("compiled")) {
@@ -229,13 +219,11 @@ export function startRspackServerWatch(options = {}) {
 
   const appDir = getMeteorAppDir();
   const configFile = getConfigFileName();
-  const { params, envs } = getRspackEnv({ isClient: false, isServer: true });
+  const { command, args } = getNpxCommand(['rspack', 'build', '--watch', '--config', configFile, ...getRspackEnv({ isClient: false, isServer: true })]);
-  const { command, args } = getNpxCommand(['rspack', 'build', '--watch', '--config', configFile, ...params]);
   const newServerProcess = spawnProcess(
     command,
     args, {
     cwd: appDir,
-    env: { ...process.env, ...envs },
     onStdout: (data) => {
       logInfo(`[Rspack Server] ${data}`);
       if (onCompile && data.trim().includes("compiled")) {
@@ -279,14 +267,13 @@ export async function runRspackBuild({ isClient, isServer, isTest, isTestModule,
   const endpoint = isTestModule ? 'Module' : isClient ? 'Client' : 'Server';
   // Use a promise to ensure Meteor waits until Rspack finishes
   return new Promise((resolve, reject) => {
-    const { params, envs } = getRspackEnv({ isClient, isServer, isTest, isTestModule });
     const rspackArgs = [
       'rspack',
       'build',
       '--config',
       configFile,
       ...(watch && ['--watch']) || [],
-      ...params,
+      ...getRspackEnv({ isClient, isServer, isTest, isTestModule }),
     ].filter(Boolean);
     const { command, args } = getNpxCommand(rspackArgs);
     spawnProcess(
@@ -294,7 +281,6 @@ export async function runRspackBuild({ isClient, isServer, isTest, isTestModule,
       args,
       {
       cwd: appDir,
-      env: { ...process.env, ...envs },
       onStdout: (data) => {
         logInfo(`[Rspack ${label} ${endpoint}] ${data}`);
         if (onCompile && data.trim().includes("compiled")) {

tools/modern-tests/apps/vue/package.json

@@ -17,7 +17,7 @@
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@tailwindcss/postcss": "^4.1.12",

tools/static-assets/skel-apollo/package.json

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@graphql-tools/webpack-loader": "^7.0.0",
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3",

tools/static-assets/skel-blaze/package.json

@@ -14,7 +14,7 @@
     "meteor-node-stubs": "^1.2.12"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3"

tools/static-assets/skel-chakra-ui/package.json

@@ -21,7 +21,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3",

tools/static-assets/skel-full/package.json

@@ -12,7 +12,7 @@
     "meteor-node-stubs": "^1.2.12"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "chai": "^4.2.0"

tools/static-assets/skel-react/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3",

tools/static-assets/skel-solid/package.json

@@ -14,7 +14,7 @@
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "babel-loader": "10.0.0",

tools/static-assets/skel-svelte/package.json

@@ -13,7 +13,7 @@
     "meteor-node-stubs": "^1.2.12"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "postcss-load-config": "^5.1.0",

tools/static-assets/skel-tailwind/package.json

@@ -16,7 +16,7 @@
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3",

tools/static-assets/skel-typescript/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@rspack/plugin-react-refresh": "^1.4.3",

tools/static-assets/skel-vue/package.json

@@ -17,7 +17,7 @@
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "@meteorjs/rspack": "^0.0.37",
+    "@meteorjs/rspack": "^0.0.36",
     "@rspack/cli": "^1.4.8",
     "@rspack/core": "^1.4.8",
     "@tailwindcss/postcss": "^4.1.12",