@meteorjs/rspack 0.0.44 → 0.0.46

package/lib/mergeRulesSplitOverlap.js

@@ -252,6 +252,25 @@ 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.
  *
@@ -259,6 +278,9 @@ export function cleanOmittedPaths(obj, options = {}) {
  * @returns {Object} Merged config
  */
 export 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,5 @@ export function mergeSplitOverlap(...configs) {
       // fall through to default merging
       return undefined;
     }
-  })(...configs);
+  })(...normalizedConfigs);
 }

package/package.json

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

package/rspack.config.js

@@ -217,7 +217,7 @@ export default function (inMeteor = {}, argv = {}) {
     console.log('[i] Meteor flags:', Meteor);
   }
 
-  const enableSwcExternalHelpers = !isServer && swcExternalHelpers;
+  const enableSwcExternalHelpers = !!swcExternalHelpers;
   const isDevEnvironment = isRun && isDev && !isTest && !isNative;
   const swcConfigRule = createSwcConfig({
     isTypescriptEnabled,
@@ -232,6 +232,7 @@ export default function (inMeteor = {}, argv = {}) {
   const externals = [
     /^meteor.*/,
     ...(isReactEnabled ? [/^react$/, /^react-dom$/] : []),
+    ...(isServer ? [/^bcrypt$/] : []),
   ];
   const alias = {
     '/': path.resolve(process.cwd()),
@@ -272,7 +273,7 @@ export default function (inMeteor = {}, argv = {}) {
   const doctorPluginConfig = isBundleVisualizerEnabled && rsdoctorModule?.RsdoctorRspackPlugin
     ? [
         new rsdoctorModule.RsdoctorRspackPlugin({
-          port: isClient 
+          port: isClient
             ? (parseInt(Meteor.rsdoctorClientPort || '8888', 10))
             : (parseInt(Meteor.rsdoctorServerPort || '8889', 10)),
         }),