github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

ensure web.browser.legacy arch is forced when build commands except if configured modern-only

Browse Source
This commit is contained in:
Nacho Codoñer
2025-04-10 12:00:02 +02:00
parent f1684b42fe
commit fb37a8ee2d
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/cli/commands.js
View File

@@ -272,14 +272,29 @@ function isModernArchsOnlyEnabled(appDir) {
}
function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
if (!isCordovaEnabled) {
const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
const platforms = (options.platforms || []);
const isBuildMode = platforms?.length > 0;
if (isBuildMode) {
// Build Mode
const isModernOnlyPlatform = platforms.includes('modern') && !platforms.includes('legacy');
if (isModernOnlyPlatform) {
webArchs = webArchs.filter(arch => arch !== 'web.browser.legacy');
}
const hasCordovaPlatforms = platforms.includes('android') || platforms.includes('ios');
if (!hasCordovaPlatforms) {
webArchs = webArchs.filter(arch => arch !== 'web.cordova');
}
} else {
// Dev & Test Mode
const isCordovaEnabled = (options.args || []).some(arg => ['ios', 'ios-device', 'android', 'android-device'].includes(arg));
if (!isCordovaEnabled) {
const automaticallyIgnoredLegacyArchs = (appDir && isModernArchsOnlyEnabled(appDir)) ? ['web.browser.legacy', 'web.cordova'] : [];
if (excludeArchsOption || automaticallyIgnoredLegacyArchs.length) {
const excludeArchs = [...(excludeArchsOption ? excludeArchsOption.trim().split(/\s*,\s*/) : []), ...automaticallyIgnoredLegacyArchs];
webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
}
return webArchs;
}
return webArchs;
}
return webArchs;
}
@@ -1419,7 +1434,10 @@ on an OS X system.");
webArchs = filteredArchs.length ? filteredArchs : undefined;
} else {
webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir, options);
webArchs = filterWebArchs(baseWebArchs, options['exclude-archs'], options.appDir, {
...options,
platforms: projectContext.platformList.getPlatforms(),
});
}
var buildDir = projectContext.getProjectLocalDirectory('build_tar');