@meteorjs/rspack 0.0.19 → 0.0.21

package/index.d.ts

@@ -5,6 +5,7 @@ import {
   defineConfig as _rspackDefineConfig,
   Configuration as _RspackConfig,
 } from '@rspack/cli';
+import { HtmlRspackPluginOptions } from '@rspack/core';
 
 export interface MeteorRspackConfig extends _RspackConfig {
   meteor?: {
@@ -34,3 +35,15 @@ export type ConfigFactory = (
 export function defineConfig(
   factory: ConfigFactory
 ): ReturnType<typeof _rspackDefineConfig>;
+
+/**
+ * A plugin that composes the original HtmlRspackPlugin from @rspack/core
+ * and RspackMeteorHtmlPlugin, in that order.
+ */
+export class HtmlRspackPlugin {
+  constructor(options?: HtmlRspackPluginOptions);
+  apply(compiler: any): void;
+}
+
+// Re-export HtmlRspackPluginOptions from @rspack/cli
+export { HtmlRspackPluginOptions };

package/index.js

@@ -1,4 +1,5 @@
 import { defineConfig as rspackDefineConfig } from '@rspack/cli';
+import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
 
 /**
  * @typedef {import('rspack').Configuration & {
@@ -21,3 +22,6 @@ export function defineConfig(factory) {
 
 // Export our helper plus passthrough
 export default defineConfig;
+
+// Export the HtmlRspackPlugin
+export { HtmlRspackPlugin };

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.19",
+  "version": "0.0.21",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "module",

package/plugins/HtmlRspackPlugin.js

@@ -0,0 +1,28 @@
+import RspackMeteorHtmlPlugin, { loadHtmlRspackPluginFromHost } from './RspackMeteorHtmlPlugin.js';
+
+/**
+ * A plugin that composes the original HtmlRspackPlugin from @rspack/core
+ * and RspackMeteorHtmlPlugin, in that order.
+ */
+export default class HtmlRspackPlugin {
+  constructor(options = {}) {
+    this.options = options;
+  }
+
+  apply(compiler) {
+    // Load the original HtmlRspackPlugin from the host project
+    const OriginalHtmlRspackPlugin = loadHtmlRspackPluginFromHost(compiler);
+
+    if (!OriginalHtmlRspackPlugin) {
+      throw new Error('Could not load HtmlRspackPlugin from host project.');
+    }
+
+    // Apply the original HtmlRspackPlugin
+    const originalPlugin = new OriginalHtmlRspackPlugin(this.options);
+    originalPlugin.apply(compiler);
+
+    // Apply the RspackMeteorHtmlPlugin
+    const meteorPlugin = new RspackMeteorHtmlPlugin();
+    meteorPlugin.apply(compiler);
+  }
+}

package/plugins/RspackMeteorHtmlPlugin.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { createRequire } from 'node:module';
 
-function loadHtmlRspackPluginFromHost(compiler) {
+export function loadHtmlRspackPluginFromHost(compiler) {
   // Prefer the compiler's context; fall back to process.cwd()
   const ctx = compiler.options?.context || compiler.context || process.cwd();
   const requireFromHost = createRequire(path.join(ctx, 'package.json'));

package/rspack.config.js

@@ -1,4 +1,4 @@
-import { DefinePlugin, BannerPlugin, HtmlRspackPlugin } from '@rspack/core';
+import { DefinePlugin, BannerPlugin } from '@rspack/core';
 import fs from 'fs';
 import { createRequire } from 'module';
 import path from 'path';
@@ -9,7 +9,7 @@ import { RequireExternalsPlugin } from './plugins/RequireExtenalsPlugin.js';
 import { getMeteorAppSwcConfig } from "./lib/swc.js";
 import { mergeSplitOverlap } from './lib/mergeRulesSplitOverlap.js';
 import CleanBuildAssetsPlugin from "./plugins/CleanBuildAssetsPlugin.js";
-import RspackMeteorHtmlPlugin from "./plugins/RspackMeteorHtmlPlugin.js";
+import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
 
 const require = createRequire(import.meta.url);
 
@@ -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,
@@ -303,7 +308,6 @@ export default function (inMeteor = {}, argv = {}) {
             </body>
           `,
       }),
-      new RspackMeteorHtmlPlugin(),
     ],
     watchOptions,
     devtool: isDevEnvironment || isTest ? 'source-map' : 'hidden-source-map',