@meteorjs/rspack 1.1.0-beta.21 → 1.1.0-beta.22

package/index.d.ts

@@ -75,6 +75,12 @@ type MeteorEnv = Record<string, any> & {
   disablePlugins: (
     matchers: string | RegExp | ((plugin: any, index: number) => boolean) | Array<string | RegExp | ((plugin: any, index: number) => boolean)>
   ) => Record<string, any>;
+  /**
+   * Omit `Meteor.isDevelopment` and `Meteor.isProduction` from the DefinePlugin so
+   * the bundle is not tied to a specific Meteor environment (portable / isomorphic builds).
+   * @returns A config fragment with `meteor.enablePortableBuild: true`
+   */
+  enablePortableBuild: () => Record<string, any>;
 }
 
 export type ConfigFactory = (

package/lib/meteorRspackHelpers.js

@@ -152,6 +152,19 @@ function extendSwcConfig(swcConfig) {
   });
 }
 
+/**
+ * Signal that `Meteor.isDevelopment` and `Meteor.isProduction` should be omitted
+ * from DefinePlugin, making the bundle portable across Meteor environments.
+ * Usage: return Meteor.enablePortableBuild() in your rspack.config.js
+ *
+ * @returns {Record<string, object>} config fragment with `meteor.enablePortableBuild: true`
+ */
+function enablePortableBuild() {
+  return prepareMeteorRspackConfig({
+    "meteor.enablePortableBuild": true,
+  });
+}
+
 /**
  * Remove plugins from a Rspack config by name, RegExp, predicate, or array of them.
  * When using a function predicate, it receives both the plugin and its index in the plugins array.
@@ -210,4 +223,5 @@ module.exports = {
   extendSwcConfig,
   makeWebNodeBuiltinsAlias,
   disablePlugins,
+  enablePortableBuild,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "1.1.0-beta.21",
+  "version": "1.1.0-beta.22",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "commonjs",

package/rspack.config.js

@@ -20,6 +20,7 @@ const {
   extendSwcConfig,
   makeWebNodeBuiltinsAlias,
   disablePlugins,
+  enablePortableBuild,
 } = require('./lib/meteorRspackHelpers.js');
 const { loadUserAndOverrideConfig } = require('./lib/meteorRspackConfigHelpers.js');
 const { prepareMeteorRspackConfig } = require("./lib/meteorRspackConfigFactory");
@@ -214,6 +215,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   const isTestLike = !!Meteor.isTestLike;
   const swcExternalHelpers = !!Meteor.swcExternalHelpers;
   const isNative = !!Meteor.isNative;
+  const devServerPort = Meteor.devServerPort || 8080;
 
   const projectDir = process.cwd();
   const projectConfigPath =
@@ -225,17 +227,6 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   const outputDir = path.dirname(Meteor.outputPath || "");
   Meteor.buildOutputDir = path.resolve(projectDir, buildContext, outputDir);
 
-  // Defined here so it can be called both before and after the first config load;
-  // without loaded configs it falls through to argv/Meteor flags.
-  const getModeFromConfig = (userConfig = undefined, overrideConfig = undefined) => {
-    if (overrideConfig?.mode) return overrideConfig.mode;
-    if (userConfig?.mode) return userConfig.mode;
-    if (argv.mode) return argv.mode;
-    if (Meteor.isProduction) return "production";
-    if (Meteor.isDevelopment) return "development";
-    return null;
-  };
-
   // Meteor flags derived purely from input; independent of loaded user/override configs
   const isTest = !!Meteor.isTest;
   const isClient = !!Meteor.isClient;
@@ -247,16 +238,33 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   const isTestEager = !!Meteor.isTestEager;
   const isTestFullApp = !!Meteor.isTestFullApp;
   const isTypescriptEnabled = Meteor.isTypescriptEnabled || false;
-  const isJsxEnabled = Meteor.isJsxEnabled || (!isTypescriptEnabled && isReactEnabled) || false;
-  const isTsxEnabled = Meteor.isTsxEnabled || (isTypescriptEnabled && isReactEnabled) || false;
+  const isJsxEnabled =
+    Meteor.isJsxEnabled || (!isTypescriptEnabled && isReactEnabled) || false;
+  const isTsxEnabled =
+    Meteor.isTsxEnabled || (isTypescriptEnabled && isReactEnabled) || false;
   const isBundleVisualizerEnabled = Meteor.isBundleVisualizerEnabled || false;
   const isAngularEnabled = Meteor.isAngularEnabled || false;
   const enableSwcExternalHelpers = !isServer && swcExternalHelpers;
 
+  // Defined here so it can be called both before and after the first config load;
+  // without loaded configs it falls through to argv/Meteor flags.
+  const getModeFromConfig = (userConfig, overrideConfig) => {
+    if (overrideConfig?.mode) return overrideConfig.mode;
+    if (userConfig?.mode) return userConfig.mode;
+    if (argv.mode) return argv.mode;
+    if (Meteor.isProduction) return "production";
+    if (Meteor.isDevelopment) return "development";
+    return null;
+  };
+
   // Initial mode before user/override configs are loaded
   const initialCurrentMode = getModeFromConfig();
-  const initialIsProd = initialCurrentMode ? initialCurrentMode === "production" : !!Meteor.isProduction;
-  const initialIsDev = initialCurrentMode ? initialCurrentMode === "development" : !!Meteor.isDevelopment || !initialIsProd;
+  const initialIsProd = initialCurrentMode
+    ? initialCurrentMode === "production"
+    : !!Meteor.isProduction;
+  const initialIsDev = initialCurrentMode
+    ? initialCurrentMode === "development"
+    : !!Meteor.isDevelopment || !initialIsProd;
   const initialMode = initialIsProd ? "production" : "development";
 
   // Initialized with pre-load values so helpers work during the first config load;
@@ -294,6 +302,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     prepareMeteorRspackConfig({
       disablePlugins: matchers,
     });
+  Meteor.enablePortableBuild = () => enablePortableBuild();
 
   // Add HtmlRspackPlugin function to Meteor
   Meteor.HtmlRspackPlugin = (options = {}) => {
@@ -319,8 +328,10 @@ module.exports = async function (inMeteor = {}, argv = {}) {
 
   // First pass: resolve user/override configs early so mode overrides (e.g. "production")
   // are available before computing isProd/isDev and the rest of the build flags.
-  let { nextUserConfig, nextOverrideConfig } =
-    await loadUserAndOverrideConfig(projectConfigPath, Meteor, argv);
+  // Skipped for Angular since it manages its own mode via the second pass.
+  let { nextUserConfig, nextOverrideConfig } = isAngularEnabled
+    ? {}
+    : await loadUserAndOverrideConfig(projectConfigPath, Meteor, argv);
 
   // Determine the final mode with loaded configs
   const currentMode = getModeFromConfig(nextUserConfig, nextOverrideConfig);
@@ -331,6 +342,10 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     ? currentMode === "development"
     : !!Meteor.isDevelopment || !isProd;
   const mode = isProd ? "production" : "development";
+  const isPortableBuild = !!(
+    nextUserConfig?.["meteor.enablePortableBuild"] ||
+    nextOverrideConfig?.["meteor.enablePortableBuild"]
+  );
   const configPath = Meteor.configPath;
   const testEntry = Meteor.testEntry;
 
@@ -564,8 +579,10 @@ module.exports = async function (inMeteor = {}, argv = {}) {
         "Meteor.isServer": JSON.stringify(false),
         "Meteor.isTest": JSON.stringify(isTestLike && !isTestFullApp),
         "Meteor.isAppTest": JSON.stringify(isTestLike && isTestFullApp),
-        "Meteor.isDevelopment": JSON.stringify(isDev),
-        "Meteor.isProduction": JSON.stringify(isProd),
+        ...(!isPortableBuild && {
+          "Meteor.isDevelopment": JSON.stringify(isDev),
+          "Meteor.isProduction": JSON.stringify(isProd),
+        }),
       }),
       ...bannerPluginConfig,
       Meteor.HtmlRspackPlugin(),
@@ -586,7 +603,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
         hot: true,
         liveReload: true,
         ...(Meteor.isBlazeEnabled && { hot: false }),
-        port: Meteor.devServerPort || 8080,
+        port: devServerPort,
         devMiddleware: {
           writeToDisk: (filePath) =>
             /\.(html)$/.test(filePath) && !filePath.includes(".hot-update."),
@@ -662,15 +679,19 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           ? {
               "Meteor.isTest": JSON.stringify(isTest && !isTestFullApp),
               "Meteor.isAppTest": JSON.stringify(isTest && isTestFullApp),
-              "Meteor.isDevelopment": JSON.stringify(isDev),
+              ...(!isPortableBuild && {
+                "Meteor.isDevelopment": JSON.stringify(isDev),
+              }),
             }
           : {
               "Meteor.isClient": JSON.stringify(false),
               "Meteor.isServer": JSON.stringify(true),
               "Meteor.isTest": JSON.stringify(isTestLike && !isTestFullApp),
               "Meteor.isAppTest": JSON.stringify(isTestLike && isTestFullApp),
-              "Meteor.isDevelopment": JSON.stringify(isDev),
-              "Meteor.isProduction": JSON.stringify(isProd),
+              ...(!isPortableBuild && {
+                "Meteor.isDevelopment": JSON.stringify(isDev),
+                "Meteor.isProduction": JSON.stringify(isProd),
+              }),
             }
       ),
       ...bannerPluginConfig,
@@ -692,7 +713,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   const angularExpandConfig = isAngularEnabled
     ? {
         mode: isProd ? "production" : "development",
-        devServer: { port: Meteor.devServerPort },
+        devServer: { port: devServerPort },
         stats: { preset: "normal" },
         infrastructureLogging: { level: "info" },
         ...(isProd && isClient && { output: { module: false } }),
@@ -719,23 +740,24 @@ module.exports = async function (inMeteor = {}, argv = {}) {
         }
       : {};
 
+
   // Second pass: re-run only when a mode override was detected, so the user config
   // can depend on fully-computed Meteor flags and helpers (swcConfigOptions, buildOutputDir, etc.).
-  if (nextUserConfig?.mode || nextOverrideConfig?.mode) {
-    ({ nextUserConfig, nextOverrideConfig } =
-      await loadUserAndOverrideConfig(projectConfigPath, Meteor, argv));
+  if (nextUserConfig?.mode || nextOverrideConfig?.mode || isAngularEnabled) {
+    ({ nextUserConfig, nextOverrideConfig } = await loadUserAndOverrideConfig(
+      projectConfigPath,
+      Meteor,
+      argv
+    ));
   }
-
-  let config = mergeSplitOverlap(
-    isClient ? clientConfig : serverConfig,
-    angularExpandConfig
-  );
-  config = mergeSplitOverlap(config, testClientExpandConfig);
-
+  let config = isClient ? clientConfig : serverConfig;
   if (nextUserConfig) {
     config = mergeSplitOverlap(config, nextUserConfig);
   }
 
+  config = mergeSplitOverlap(config, angularExpandConfig);
+  config = mergeSplitOverlap(config, testClientExpandConfig);
+
   if (nextOverrideConfig) {
     config = mergeSplitOverlap(config, nextOverrideConfig);
   }
@@ -746,9 +768,11 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     delete config.disablePlugins;
   }
 
-  if (Meteor.isDebug || Meteor.isVerbose) {
+  delete config["meteor.enablePortableBuild"];
+
+  // if (Meteor.isDebug || Meteor.isVerbose) {
     console.log("Config:", inspect(config, { depth: null, colors: true }));
-  }
+  // }
 
   // Check if lazyCompilation is enabled and warn the user
   if (