@meteorjs/rspack 0.0.20 → 0.0.22

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?: {
@@ -24,6 +25,12 @@ type MeteorEnv = Record<string, any> & {
   isReactEnabled: boolean;
   isBlazeEnabled: boolean;
   isBlazeHotEnabled: boolean;
+  /**
+   * A function that creates an instance of HtmlRspackPlugin with default options.
+   * @param options - Optional configuration options that will be merged with defaults
+   * @returns An instance of HtmlRspackPlugin
+   */
+  HtmlRspackPlugin: (options?: HtmlRspackPluginOptions) => HtmlRspackPlugin;
 }
 
 export type ConfigFactory = (
@@ -34,3 +41,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "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);
 
@@ -161,6 +161,28 @@ export default function (inMeteor = {}, argv = {}) {
   const buildOutputDir = path.resolve(process.cwd(), buildContext, outputDir);
   Meteor.buildOutputDir = buildOutputDir;
 
+  // Add HtmlRspackPlugin function to Meteor
+  Meteor.HtmlRspackPlugin = (options = {}) => {
+    return new HtmlRspackPlugin({
+      inject: false,
+      cache: true,
+      filename: `../${buildContext}/${outputDir}/index.html`,
+      templateContent: `
+          <head>
+            <% for tag in htmlRspackPlugin.tags.headTags { %>
+              <%= toHtml(tag) %>
+            <% } %>
+          </head>
+          <body>
+            <% for tag in htmlRspackPlugin.tags.bodyTags { %>
+              <%= toHtml(tag) %>
+            <% } %>
+          </body>
+        `,
+      ...options
+    });
+  };
+
   // Set watch options
   const watchOptions = {
     ...defaultWatchOptions,
@@ -291,24 +313,7 @@ export default function (inMeteor = {}, argv = {}) {
         banner: bannerOutput,
         entryOnly: true,
       }),
-      new HtmlRspackPlugin({
-        inject: false,
-        cache: true,
-        filename: `../${buildContext}/${outputDir}/index.html`,
-        templateContent: `
-            <head>
-              <% for tag in htmlRspackPlugin.tags.headTags { %>
-                <%= toHtml(tag) %>
-              <% } %>
-            </head>
-            <body>
-              <% for tag in htmlRspackPlugin.tags.bodyTags { %>
-                <%= toHtml(tag) %>
-              <% } %>
-            </body>
-          `,
-      }),
-      new RspackMeteorHtmlPlugin(),
+      Meteor.HtmlRspackPlugin(),
     ],
     watchOptions,
     devtool: isDevEnvironment || isTest ? 'source-map' : 'hidden-source-map',