@meteorjs/rspack 0.0.5 → 0.0.7

package/package.json

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

package/rspack.config.js

@@ -3,6 +3,7 @@ import fs from 'fs';
 import { createRequire } from 'module';
 import path from 'path';
 import { merge } from 'webpack-merge';
+import { inspect } from "node:util";
 
 import { RequireExternalsPlugin } from './plugins/RequireExtenalsPlugin.js';
 import { getMeteorAppSwcConfig } from "./lib/swc.js";
@@ -143,7 +144,7 @@ export default function (inMeteor = {}, argv = {}) {
   const serverOutputDir = path.resolve(process.cwd(), 'server');
 
   // Determine context for bundles and assets
-  const buildContext = Meteor.buildContext || '_rspack';
+  const buildContext = Meteor.buildContext || '_build';
   const bundlesContext = Meteor.bundlesContext || 'bundles';
   const assetsContext = Meteor.assetsContext || 'assets';
 
@@ -160,7 +161,7 @@ export default function (inMeteor = {}, argv = {}) {
   });
   const externals = [
     /^meteor.*/,
-    ...(isReactEnabled ? [/^react$/, /^react-dom$/] : [])
+    ...(isReactEnabled ? [/^react$/, /^react-dom$/] : []),
   ];
   const alias = {
     '/': path.resolve(process.cwd()),
@@ -182,16 +183,18 @@ export default function (inMeteor = {}, argv = {}) {
       : []),
   ];
 
+  const reactRefreshModule = isReactEnabled ? safeRequire('@rspack/plugin-react-refresh') : null;
+
   // Base client config
   let clientConfig = {
-    name: 'meteor-client',
+    name: '[client-rspack]',
     target: 'web',
     mode,
     entry: path.resolve(process.cwd(), buildContext, entryPath),
     output: {
       path: clientOutputDir,
       filename: () =>
-        isDev ? outputFilename : `../${buildContext}/${outputPath}`,
+        isRun && !isTest ? outputFilename : `../${buildContext}/${outputPath}`,
       libraryTarget: 'commonjs',
       publicPath: '/',
       chunkFilename: `${bundlesContext}/[id].[chunkhash].js`,
@@ -220,8 +223,8 @@ export default function (inMeteor = {}, argv = {}) {
     plugins: [
       ...(isRun
         ? [
-            ...(isReactEnabled
-              ? [new (safeRequire('@rspack/plugin-react-refresh'))()]
+            ...(isReactEnabled && reactRefreshModule
+              ? [new reactRefreshModule()]
               : []),
             new RequireExternalsPlugin({
               filePath: path.join(buildContext, runPath),
@@ -253,8 +256,8 @@ export default function (inMeteor = {}, argv = {}) {
       }),
     ],
     watchOptions,
-    devtool: isDev ? 'source-map' : 'hidden-source-map',
-    ...(isRun && {
+    devtool: isDev || isTest ? 'source-map' : 'hidden-source-map',
+    ...(isRun && !isTest && {
       devServer: {
         static: { directory: clientOutputDir, publicPath: '/__rspack__/' },
         hot: true,
@@ -270,7 +273,7 @@ export default function (inMeteor = {}, argv = {}) {
 
   // Base server config
   let serverConfig = {
-    name: 'meteor-server',
+    name: '[server-rspack]',
     target: 'node',
     mode,
     entry: path.resolve(process.cwd(), buildContext, entryPath),
@@ -307,7 +310,7 @@ export default function (inMeteor = {}, argv = {}) {
     ],
     watchOptions,
     devtool: isRun ? 'source-map' : 'hidden-source-map',
-    ...(isRun &&
+    ...((isRun || isTest) &&
       createCacheStrategy(mode)
     ),
   };
@@ -334,10 +337,11 @@ export default function (inMeteor = {}, argv = {}) {
     }
   }
 
-  // Return the appropriate configuration
-  if (isClient) {
-    return [clientConfig];
+  const config = isClient ? clientConfig : serverConfig;
+
+  if (Meteor.isDebug) {
+    console.log('Config:', inspect(config, { depth: null, colors: true }));
   }
-  // Meteor.isServer
-  return [serverConfig];
+
+  return [config];
 }