From a00a34fcc9ca65df52d4a093dfa816fbd5783c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 30 Apr 2025 15:11:59 +0200
Subject: [PATCH] force CI to pass tests using modern bundler

---
 .circleci/config.yml                      | 3 +++
 packages/babel-compiler/babel-compiler.js | 4 +++-
 tools/cli/commands.js                     | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be2fe2cae4..8b714c9285 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,6 +115,9 @@ build_machine_environment:
     NUM_GROUPS: 12
     RUNNING_AVG_LENGTH: 6
 
+    # Force modern bundler test
+    METEOR_MODERN: true
+
 jobs:
   Get Ready:
     <<: *build_machine_environment
diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index a8e3a0c539..32e486a05b 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -114,6 +114,8 @@ const normalizeModern = r => Object.fromEntries(
     ]),
 );
 
+let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
+
 let lastModifiedMeteorConfig;
 let lastModifiedMeteorConfigTime;
 BCp.initializeMeteorAppConfig = function () {
@@ -128,7 +130,7 @@ BCp.initializeMeteorAppConfig = function () {
     lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
     lastModifiedMeteorConfig = {
       ...lastModifiedMeteorConfig,
-      modern: normalizeModern(lastModifiedMeteorConfig?.modern),
+      modern: normalizeModern(modernForced || lastModifiedMeteorConfig?.modern),
     };
 
     if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index fb4cb93f6f..7ad18f597f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -280,6 +280,8 @@ const normalizeModern = r => Object.fromEntries(
     ]),
 );
 
+
+let modernForced = Boolean(JSON.parse(process.env.METEOR_MODERN || "false"));
 let meteorConfig;
 
 function getMeteorConfig(appDir) {
@@ -296,12 +298,12 @@ function getMeteorConfig(appDir) {
 
 function isModernArchsOnlyEnabled(appDir) {
   const meteorConfig = getMeteorConfig(appDir);
-  return normalizeModern(meteorConfig?.modern).webArchOnly !== false;
+  return normalizeModern(modernForced || meteorConfig?.modern).webArchOnly !== false;
 }
 
 export function isModernWatcherEnabled(appDir) {
   const meteorConfig = getMeteorConfig(appDir);
-  return normalizeModern(meteorConfig?.modern).watcher !== false;
+  return normalizeModern(modernForced || meteorConfig?.modern).watcher !== false;
 }
 
 function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {