@meteorjs/rspack 0.0.18 → 0.0.20

package/lib/mergeRulesSplitOverlap.js

@@ -122,6 +122,57 @@ function splitOverlapRulesMerge(aRules, bRules) {
   return result;
 }
 
+/**
+ * Creates a customizer function for unique plugins.
+ * 
+ * @param {string} key - The key to check for uniqueness
+ * @param {string[]} pluginNames - Array of plugin constructor names to make unique
+ * @param {Function} getter - Function to get the identifier from the plugin
+ * @returns {Function} Customizer function
+ */
+export function unique(key, pluginNames = [], getter = item => item.constructor && item.constructor.name) {
+  return (a, b, k) => {
+    if (k !== key) return undefined;
+
+    const aItems = Array.isArray(a) ? a : [];
+    const bItems = Array.isArray(b) ? b : [];
+
+    // If not dealing with plugins, return undefined to use default merging
+    if (key !== 'plugins') return undefined;
+
+    // Create a map to track plugins by their identifier
+    const uniquePlugins = new Map();
+
+    // Process all plugins from both arrays
+    [...aItems, ...bItems].forEach(plugin => {
+      const id = getter(plugin);
+
+      // If this is a plugin we want to make unique and we can identify it
+      if (id && pluginNames.includes(id)) {
+        uniquePlugins.set(id, plugin); // Keep only the last instance
+      }
+    });
+
+    // Create the result array with all non-unique plugins from a
+    const result = aItems.filter(plugin => {
+      const id = getter(plugin);
+      return !id || !pluginNames.includes(id) || uniquePlugins.get(id) === plugin;
+    });
+
+    // Add unique plugins from b that weren't already in the result
+    bItems.forEach(plugin => {
+      const id = getter(plugin);
+      if (!id || !pluginNames.includes(id)) {
+        result.push(plugin);
+      } else if (uniquePlugins.get(id) === plugin) {
+        result.push(plugin);
+      }
+    });
+
+    return result;
+  };
+}
+
 /**
  * Merges webpack/rspack configs with smart handling of overlapping rules.
  *
@@ -136,6 +187,16 @@ export function mergeSplitOverlap(...configs) {
         const bRules = Array.isArray(b) ? b : [];
         return splitOverlapRulesMerge(aRules, bRules);
       }
+
+      // Handle plugins uniqueness
+      if (key === 'plugins') {
+        return unique(
+          'plugins',
+          ['HtmlRspackPlugin'],
+          (plugin) => plugin.constructor && plugin.constructor.name
+        )(a, b, key);
+      }
+
       // fall through to default merging
       return undefined;
     }

package/package.json

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

package/plugins/CleanBuildAssetsPlugin.js

@@ -17,7 +17,6 @@ export default class CleanBuildAssetsPlugin {
   constructor(options = {}) {
     const defaults = [
       'public/_build-assets',
-      'public/_build-bundles',
       'private/_build-assets',
     ];
 

package/rspack.config.js

@@ -139,6 +139,7 @@ export default function (inMeteor = {}, argv = {}) {
   // Determine output points
   const outputPath = Meteor.outputPath;
   const outputDir = path.dirname(Meteor.outputPath || '');
+
   const outputFilename = Meteor.outputFilename;
 
   // Determine run point
@@ -156,6 +157,10 @@ export default function (inMeteor = {}, argv = {}) {
   const bundlesContext = Meteor.bundlesContext || 'bundles';
   const assetsContext = Meteor.assetsContext || 'assets';
 
+  // Determine build output and pass to Meteor
+  const buildOutputDir = path.resolve(process.cwd(), buildContext, outputDir);
+  Meteor.buildOutputDir = buildOutputDir;
+
   // Set watch options
   const watchOptions = {
     ...defaultWatchOptions,
@@ -243,6 +248,7 @@ export default function (inMeteor = {}, argv = {}) {
       cssChunkFilename: `${assetsContext}/[id]${
         isProd ? '.[contenthash]' : ''
       }.css`,
+      clean: isProd,
     },
     optimization: {
       usedExports: true,
@@ -302,7 +308,7 @@ export default function (inMeteor = {}, argv = {}) {
             </body>
           `,
       }),
-      new RspackMeteorHtmlPlugin({}),
+      new RspackMeteorHtmlPlugin(),
     ],
     watchOptions,
     devtool: isDevEnvironment || isTest ? 'source-map' : 'hidden-source-map',