@meteorjs/rspack 0.0.45 → 0.0.47

package/index.js

@@ -1,5 +1,5 @@
-import { defineConfig as rspackDefineConfig } from '@rspack/cli';
-import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
+const { defineConfig: rspackDefineConfig } = require('@rspack/cli');
+const HtmlRspackPlugin = require('./plugins/HtmlRspackPlugin.js');
 
 /**
  * @typedef {import('rspack').Configuration & {
@@ -16,12 +16,13 @@ import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
  * @param {ConfigFactory} factory
  * @returns {ReturnType<typeof rspackDefineConfig>}
  */
-export function defineConfig(factory) {
+function defineConfig(factory) {
   return rspackDefineConfig(factory);
 }
 
-// Export our helper plus passthrough
-export default defineConfig;
+// Export our helper plus passthrough as default export
+module.exports = defineConfig;
 
-// Export the HtmlRspackPlugin
-export { HtmlRspackPlugin };
+// Export the HtmlRspackPlugin and defineConfig as named exports
+module.exports.defineConfig = defineConfig;
+module.exports.HtmlRspackPlugin = HtmlRspackPlugin;

package/lib/mergeRulesSplitOverlap.js

@@ -3,12 +3,12 @@
  * overlapping file extensions in module rules.
  */
 
-import { mergeWithCustomize } from 'webpack-merge';
+const { mergeWithCustomize } = require('webpack-merge');
 
 /**
  * File extensions to check when determining rule overlaps.
  */
-export const EXT_CATALOG = [
+const EXT_CATALOG = [
   '.tsx', '.ts', '.mts', '.cts',
   '.jsx', '.js', '.mjs', '.cjs',
 ];
@@ -130,7 +130,7 @@ function splitOverlapRulesMerge(aRules, bRules) {
  * @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) {
+function unique(key, pluginNames = [], getter = item => item.constructor && item.constructor.name) {
   return (a, b, k) => {
     if (k !== key) return undefined;
 
@@ -183,7 +183,7 @@ export function unique(key, pluginNames = [], getter = item => item.constructor
  * @param {Function} [options.warningFn] - Custom warning function that receives the path string
  * @returns {Object} The cleaned object with specified paths removed
  */
-export function cleanOmittedPaths(obj, options = {}) {
+function cleanOmittedPaths(obj, options = {}) {
   if (!obj || typeof obj !== 'object') {
     return obj;
   }
@@ -252,13 +252,35 @@ export function cleanOmittedPaths(obj, options = {}) {
   return result;
 }
 
+/**
+ * Normalizes externals configuration to ensure consistent handling.
+ * @param {Object} config - The configuration object
+ * @returns {Object} - The normalized configuration
+ */
+function normalizeExternals(config) {
+  if (!config || !config.externals) return config;
+
+  // Create a deep clone of the config to avoid modifying the original
+  const result = { ...config };
+
+  // If externals is not an array, convert it to an array
+  if (!Array.isArray(result.externals)) {
+    result.externals = [result.externals];
+  }
+
+  return result;
+}
+
 /**
  * Merges webpack/rspack configs with smart handling of overlapping rules.
  *
  * @param {...Object} configs - Configs to merge
  * @returns {Object} Merged config
  */
-export function mergeSplitOverlap(...configs) {
+function mergeSplitOverlap(...configs) {
+  // Normalize externals in all configs before merging
+  const normalizedConfigs = configs.map(normalizeExternals);
+
   return mergeWithCustomize({
     customizeArray(a, b, key) {
       if (key === 'module.rules') {
@@ -287,5 +309,12 @@ export function mergeSplitOverlap(...configs) {
       // fall through to default merging
       return undefined;
     }
-  })(...configs);
+  })(...normalizedConfigs);
 }
+
+module.exports = {
+  EXT_CATALOG,
+  unique,
+  cleanOmittedPaths,
+  mergeSplitOverlap
+};

package/lib/swc.js

@@ -1,12 +1,12 @@
-import fs from 'fs';
-import vm from 'vm';
+const fs = require('fs');
+const vm = require('vm');
 
 /**
  * Reads and parses the SWC configuration file.
  * @param {string} file - The name of the SWC configuration file (default: '.swcrc')
  * @returns {Object|undefined} The parsed SWC configuration or undefined if an error occurs
  */
-export function getMeteorAppSwcrc(file = '.swcrc') {
+function getMeteorAppSwcrc(file = '.swcrc') {
   try {
     const filePath = `${process.cwd()}/${file}`;
     if (file.endsWith('.js')) {
@@ -42,7 +42,7 @@ export function getMeteorAppSwcrc(file = '.swcrc') {
  * If the configuration has a baseUrl property, it will be set to process.cwd().
  * @returns {Object|undefined} The SWC configuration or undefined if no configuration exists
  */
-export function getMeteorAppSwcConfig() {
+function getMeteorAppSwcConfig() {
   const hasSwcRc = fs.existsSync(`${process.cwd()}/.swcrc`);
   const hasSwcJs = !hasSwcRc && fs.existsSync(`${process.cwd()}/swc.config.js`);
 
@@ -60,3 +60,8 @@ export function getMeteorAppSwcConfig() {
 
   return config;
 }
+
+module.exports = {
+  getMeteorAppSwcrc,
+  getMeteorAppSwcConfig
+};

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
-  "type": "module",
+  "type": "commonjs",
   "author": "",
   "license": "ISC",
   "dependencies": {

package/plugins/HtmlRspackPlugin.js

@@ -1,10 +1,11 @@
-import RspackMeteorHtmlPlugin, { loadHtmlRspackPluginFromHost } from './RspackMeteorHtmlPlugin.js';
+const RspackMeteorHtmlPlugin = require('./RspackMeteorHtmlPlugin.js');
+const { loadHtmlRspackPluginFromHost } = RspackMeteorHtmlPlugin;
 
 /**
  * A plugin that composes the original HtmlRspackPlugin from @rspack/core
  * and RspackMeteorHtmlPlugin, in that order.
  */
-export default class HtmlRspackPlugin {
+class HtmlRspackPlugin {
   constructor(options = {}) {
     this.options = options;
   }
@@ -26,3 +27,5 @@ export default class HtmlRspackPlugin {
     meteorPlugin.apply(compiler);
   }
 }
+
+module.exports = HtmlRspackPlugin;

package/plugins/RequireExtenalsPlugin.js

@@ -7,10 +7,10 @@
 // the externalMap function if provided.
 // Used for Blaze to translate require of html files to require of js files bundled by Meteor.
 
-import fs from 'fs';
-import path from 'path';
+const fs = require('fs');
+const path = require('path');
 
-export class RequireExternalsPlugin {
+class RequireExternalsPlugin {
   constructor({
     filePath,
     // Externals can be:
@@ -487,3 +487,5 @@ export class RequireExternalsPlugin {
     return existing;
   }
 }
+
+module.exports = { RequireExternalsPlugin };

package/plugins/RspackMeteorHtmlPlugin.js

@@ -1,7 +1,7 @@
-import path from 'node:path';
-import { createRequire } from 'node:module';
+const path = require('node:path');
+const { createRequire } = require('node:module');
 
-export function loadHtmlRspackPluginFromHost(compiler) {
+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'));
@@ -16,7 +16,7 @@ export function loadHtmlRspackPluginFromHost(compiler) {
  * 1. Remove the injected `*-rspack.js` script tags
  * 2. Strip <!doctype> and <html>…</html> wrappers from the final HTML
  */
-export default class RspackMeteorHtmlPlugin {
+class RspackMeteorHtmlPlugin {
   apply(compiler) {
     const HtmlRspackPlugin = loadHtmlRspackPluginFromHost(compiler);
     if (!HtmlRspackPlugin?.getCompilationHooks) {
@@ -45,3 +45,6 @@ export default class RspackMeteorHtmlPlugin {
     });
   }
 }
+
+module.exports = RspackMeteorHtmlPlugin;
+module.exports.loadHtmlRspackPluginFromHost = loadHtmlRspackPluginFromHost;

package/rspack.config.js

@@ -1,16 +1,13 @@
-import { DefinePlugin, BannerPlugin } from '@rspack/core';
-import fs from 'fs';
-import { createRequire } from 'module';
-import { inspect } from 'node:util';
-import path from 'path';
-import { merge } from 'webpack-merge';
+const { DefinePlugin, BannerPlugin } = require('@rspack/core');
+const fs = require('fs');
+const { inspect } = require('node:util');
+const path = require('path');
+const { merge } = require('webpack-merge');
 
-import { cleanOmittedPaths, mergeSplitOverlap } from "./lib/mergeRulesSplitOverlap.js";
-import { getMeteorAppSwcConfig } from './lib/swc.js';
-import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
-import { RequireExternalsPlugin } from './plugins/RequireExtenalsPlugin.js';
-
-const require = createRequire(import.meta.url);
+const { cleanOmittedPaths, mergeSplitOverlap } = require("./lib/mergeRulesSplitOverlap.js");
+const { getMeteorAppSwcConfig } = require('./lib/swc.js');
+const HtmlRspackPlugin = require('./plugins/HtmlRspackPlugin.js');
+const { RequireExternalsPlugin } = require('./plugins/RequireExtenalsPlugin.js');
 
 // Safe require that doesn't throw if the module isn't found
 function safeRequire(moduleName) {
@@ -114,7 +111,7 @@ const defaultWatchOptions = {
  * @param {{ mode?: string; clientEntry?: string; serverEntry?: string; clientOutputFolder?: string; serverOutputFolder?: string; chunksContext?: string; assetsContext?: string; serverAssetsContext?: string }} argv
  * @returns {import('@rspack/cli').Configuration[]}
  */
-export default function (inMeteor = {}, argv = {}) {
+module.exports = function (inMeteor = {}, argv = {}) {
   // Transform Meteor env properties to proper boolean values
   const Meteor = { ...inMeteor };
   // Convert string boolean values to actual booleans
@@ -232,6 +229,7 @@ export default function (inMeteor = {}, argv = {}) {
   const externals = [
     /^meteor.*/,
     ...(isReactEnabled ? [/^react$/, /^react-dom$/] : []),
+    ...(isServer ? [/^bcrypt$/] : []),
   ];
   const alias = {
     '/': path.resolve(process.cwd()),