github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-01-10 16:18:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

force CI to pass tests using modern bundler

Browse Source
This commit is contained in:
Nacho Codoñer
2025-04-30 15:11:59 +02:00
parent 7eef543902
commit a00a34fcc9
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.circleci/config.yml
View File

@@ -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

4
packages/babel-compiler/babel-compiler.js
View File

@@ -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) {

6
tools/cli/commands.js
View File

@@ -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) {