@meteorjs/rspack 0.0.6 → 0.0.8

package/package.json

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

package/rspack.config.js

@@ -116,6 +116,7 @@ export default function (inMeteor = {}, argv = {}) {
   const isClient = Meteor.isClient;
   const isRun = Meteor.isRun;
   const isReactEnabled = Meteor.isReactEnabled;
+  const isTestModule = Meteor.isTestModule;
   const mode = isProd ? 'production' : 'development';
 
   const isTypescriptEnabled = Meteor.isTypescriptEnabled || false;
@@ -141,10 +142,10 @@ export default function (inMeteor = {}, argv = {}) {
 
   // Determine output directories
   const clientOutputDir = path.resolve(process.cwd(), 'public');
-  const serverOutputDir = path.resolve(process.cwd(), 'server');
+  const serverOutputDir = path.resolve(process.cwd(), 'private');
 
   // 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';
 
@@ -161,7 +162,7 @@ export default function (inMeteor = {}, argv = {}) {
   });
   const externals = [
     /^meteor.*/,
-    ...(isReactEnabled ? [/^react$/, /^react-dom$/] : [])
+    ...(isReactEnabled ? [/^react$/, /^react-dom$/] : []),
   ];
   const alias = {
     '/': path.resolve(process.cwd()),
@@ -185,16 +186,33 @@ export default function (inMeteor = {}, argv = {}) {
 
   const reactRefreshModule = isReactEnabled ? safeRequire('@rspack/plugin-react-refresh') : null;
 
+  const requireExternalsPlugin = new RequireExternalsPlugin({
+    filePath: path.join(buildContext, runPath),
+    ...(Meteor.isBlazeEnabled && {
+      externals: /\.html$/,
+      externalMap: (module) => {
+        const { request, context } = module;
+        if (request.endsWith('.html')) {
+          const relContext = path.relative(process.cwd(), context);
+          const { name } = path.parse(request);
+          return `./${relContext}/template.${name}.js`;
+        }
+        return request;
+      },
+    }),
+  });
+
+  const clientNameConfig = `[${isTest && 'test-' || ''}${isTestModule && 'module' || 'client'}-rspack]`;
   // Base client config
   let clientConfig = {
-    name: 'meteor-client',
+    name: clientNameConfig,
     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`,
@@ -221,28 +239,12 @@ export default function (inMeteor = {}, argv = {}) {
     resolve: { extensions, alias },
     externals,
     plugins: [
-      ...(isRun
-        ? [
-            ...(isReactEnabled && reactRefreshModule
-              ? [new reactRefreshModule()]
-              : []),
-            new RequireExternalsPlugin({
-              filePath: path.join(buildContext, runPath),
-              ...(Meteor.isBlazeEnabled && {
-                externals: /\.html$/,
-                externalMap: (module) => {
-                  const { request, context } = module;
-                  if (request.endsWith('.html')) {
-                    const relContext = path.relative(process.cwd(), context);
-                    const { name } = path.parse(request);
-                    return `./${relContext}/template.${name}.js`;
-                  }
-                  return request;
-                },
-              }),
-            }),
-          ].filter(Boolean)
-        : []),
+      ...[
+        ...(isReactEnabled && reactRefreshModule
+          ? [new reactRefreshModule()]
+          : []),
+        requireExternalsPlugin,
+      ].filter(Boolean),
       new DefinePlugin({
         'Meteor.isClient': JSON.stringify(true),
         'Meteor.isServer': JSON.stringify(false),
@@ -256,8 +258,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,
@@ -271,9 +273,10 @@ export default function (inMeteor = {}, argv = {}) {
     }),
   };
 
+  const serverNameConfig = `[${isTest && 'test-' || ''}${isTestModule && 'module' || 'server'}-rspack]`;
   // Base server config
   let serverConfig = {
-    name: 'meteor-server',
+    name: serverNameConfig,
     target: 'node',
     mode,
     entry: path.resolve(process.cwd(), buildContext, entryPath),
@@ -287,6 +290,12 @@ export default function (inMeteor = {}, argv = {}) {
     optimization: { usedExports: true },
     module: {
       rules: [swcConfigRule, ...extraRules],
+      parser: {
+        javascript: {
+          // Dynamic imports on the server are treated as bundled in the same chunk
+          dynamicImportMode: 'eager',
+        },
+      },
     },
     resolve: {
       extensions,
@@ -307,10 +316,11 @@ export default function (inMeteor = {}, argv = {}) {
         banner: bannerOutput,
         entryOnly: true,
       }),
+      isTestModule && requireExternalsPlugin,
     ],
     watchOptions,
     devtool: isRun ? 'source-map' : 'hidden-source-map',
-    ...(isRun &&
+    ...((isRun || isTest) &&
       createCacheStrategy(mode)
     ),
   };