@meteorjs/rspack 0.0.7 → 0.0.9

package/package.json

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

package/rspack.config.js

@@ -43,7 +43,7 @@ function createCacheStrategy(mode) {
 }
 
 // SWC loader rule (JSX/JS)
-function createSwcConfig({ isRun, isTypescriptEnabled, isJsxEnabled, isTsxEnabled }) {
+function createSwcConfig({ isRun, isTypescriptEnabled, isJsxEnabled, isTsxEnabled, externalHelpers }) {
   const defaultConfig = {
     jsc: {
       baseUrl: process.cwd(),
@@ -60,6 +60,7 @@ function createSwcConfig({ isRun, isTypescriptEnabled, isJsxEnabled, isTsxEnable
           refresh: isRun,
         },
       },
+      externalHelpers,
     },
   };
   const customConfig = getMeteorAppSwcConfig() || {};
@@ -116,6 +117,8 @@ export default function (inMeteor = {}, argv = {}) {
   const isClient = Meteor.isClient;
   const isRun = Meteor.isRun;
   const isReactEnabled = Meteor.isReactEnabled;
+  const isTestModule = Meteor.isTestModule;
+  const swcExternalHelpers = Meteor.swcExternalHelpers;
   const mode = isProd ? 'production' : 'development';
 
   const isTypescriptEnabled = Meteor.isTypescriptEnabled || false;
@@ -141,7 +144,7 @@ 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 || '_build';
@@ -158,6 +161,7 @@ export default function (inMeteor = {}, argv = {}) {
     isTypescriptEnabled,
     isJsxEnabled,
     isTsxEnabled,
+    externalHelpers: swcExternalHelpers,
   });
   const externals = [
     /^meteor.*/,
@@ -185,9 +189,26 @@ 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: '[client-rspack]',
+    name: clientNameConfig,
     target: 'web',
     mode,
     entry: path.resolve(process.cwd(), buildContext, entryPath),
@@ -221,28 +242,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),
@@ -271,9 +276,10 @@ export default function (inMeteor = {}, argv = {}) {
     }),
   };
 
+  const serverNameConfig = `[${isTest && 'test-' || ''}${isTestModule && 'module' || 'server'}-rspack]`;
   // Base server config
   let serverConfig = {
-    name: '[server-rspack]',
+    name: serverNameConfig,
     target: 'node',
     mode,
     entry: path.resolve(process.cwd(), buildContext, entryPath),
@@ -287,6 +293,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,6 +319,7 @@ export default function (inMeteor = {}, argv = {}) {
         banner: bannerOutput,
         entryOnly: true,
       }),
+      isTestModule && requireExternalsPlugin,
     ],
     watchOptions,
     devtool: isRun ? 'source-map' : 'hidden-source-map',