Merge branch 'modern-bundler-integration' into release-3.4

2026-05-02 03:01:46 -04:00 · 2025-09-10 17:34:04 +02:00
parent b717b86c66 9a32200b8c
commit 3e59392ec4
19 changed files with 43 additions and 18 deletions
--- a/npm-packages/meteor-rspack/lib/mergeRulesSplitOverlap.js
+++ b/npm-packages/meteor-rspack/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);
 }
--- a/npm-packages/meteor-rspack/package-lock.json
+++ b/npm-packages/meteor-rspack/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@meteorjs/rspack",
-  "version": "0.0.44",
+  "version": "0.0.46",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@meteorjs/rspack",
-      "version": "0.0.44",
+      "version": "0.0.46",
      "license": "ISC",
      "dependencies": {
        "ignore-loader": "^0.1.2",
--- a/npm-packages/meteor-rspack/package.json
+++ b/npm-packages/meteor-rspack/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",
--- a/npm-packages/meteor-rspack/rspack.config.js
+++ b/npm-packages/meteor-rspack/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()),
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -367,7 +367,6 @@ if (Plugin?.rspackHelpers?.isRspackOutputFile(inputFilePath)) {
            tsx: hasTSXSupport,
          },
          ...(hasSwcHelpersAvailable &&
-            !isNodeTarget &&
            (packageName == null ||
              !['core-runtime', 'modules', 'modules-runtime'].includes(
                packageName,
--- a/packages/rspack/lib/constants.js
+++ b/packages/rspack/lib/constants.js
@@ -5,7 +5,7 @@

 export const DEFAULT_RSPACK_VERSION = '1.5.0';

-export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.44';
+export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.46';

 export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3';

--- a/tools/modern-tests/apps/react-router/package.json
+++ b/tools/modern-tests/apps/react-router/package.json
@@ -11,6 +11,7 @@
    "@babel/runtime": "^7.23.5",
    "@modelcontextprotocol/sdk": "^1.17.3",
    "@swc/helpers": "^0.5.17",
+    "bcrypt": "^6.0.0",
    "meteor-node-stubs": "^1.2.12",
    "react": "^18.3.1",
    "react-compiler-runtime": "^19.1.0-rc.2",
--- a/tools/modern-tests/apps/react-router/server/main.js
+++ b/tools/modern-tests/apps/react-router/server/main.js
@@ -6,9 +6,11 @@ import '@helper/alias';
 import ReactAlias from '@react/alias';
 import './resolve-extensions/first';
 import { TypescriptEnabled } from './ts/helpers';
+import bcrypt from "bcrypt";

 console.log('@react/alias loaded', ReactAlias.version);
 console.log('TypescriptEnabled', TypescriptEnabled);
+console.log("bcrypt loaded", !!bcrypt);

 async function insertLink({ title, url }) {
  await LinksCollection.insertAsync({ title, url, createdAt: new Date() });
--- a/tools/modern-tests/apps/vue/package.json
+++ b/tools/modern-tests/apps/vue/package.json
@@ -17,7 +17,7 @@
    "vue-router": "^4.2.5"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rspack/cli": "^1.4.8",
    "@rspack/core": "^1.4.8",
    "@tailwindcss/postcss": "^4.1.12",
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -20,7 +20,7 @@
  "devDependencies": {
    "@graphql-tools/webpack-loader": "^7.0.0",
    "@rsdoctor/rspack-plugin": "^1.2.3",
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
    "@rspack/plugin-react-refresh": "^1.4.3",
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -14,7 +14,7 @@
    "meteor-node-stubs": "^1.2.12"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-chakra-ui/package.json
+++ b/tools/static-assets/skel-chakra-ui/package.json
@@ -21,7 +21,7 @@
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -12,7 +12,7 @@
    "meteor-node-stubs": "^1.2.12"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -15,7 +15,7 @@
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -14,7 +14,7 @@
    "picocolors": "^1.1.1"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -13,7 +13,7 @@
    "meteor-node-stubs": "^1.2.12"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-tailwind/package.json
+++ b/tools/static-assets/skel-tailwind/package.json
@@ -16,7 +16,7 @@
    "react-dom": "^17.0.2"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -15,7 +15,7 @@
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -17,7 +17,7 @@
    "vue-router": "^4.2.5"
  },
  "devDependencies": {
-    "@meteorjs/rspack": "^0.0.44",
+    "@meteorjs/rspack": "^0.0.46",
    "@rsdoctor/rspack-plugin": "^1.2.3",
    "@rspack/cli": "^1.5.0",
    "@rspack/core": "^1.5.0",