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

Merge branch 'modern-config' into modern-watcher-config

Browse Source 
# Conflicts:
#	tools/cli/commands.js
This commit is contained in:
Nacho Codoñer
2025-04-30 13:16:54 +02:00
parent 86ae1efad0 df576c6604
commit 34710e2d5c
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,22 @@ function compileWithSwc(source, swcOptions = {}, { inputFilePath, features, arch
};
});
}
const DEFAULT_MODERN = {
transpiler: true,
};
const normalizeModern = r => Object.fromEntries(
Object.entries(DEFAULT_MODERN).map(([k, def]) => [
k,
r === true
? def
: r === false || r?.[k] === false
? false
: typeof r?.[k] === 'object'
? { ...r[k] }
: def,
]),
);
let lastModifiedMeteorConfig;
let lastModifiedMeteorConfigTime;
@@ -110,6 +126,10 @@ BCp.initializeMeteorAppConfig = function () {
if (currentLastModifiedConfigTime !== lastModifiedMeteorConfigTime) {
lastModifiedMeteorConfigTime = currentLastModifiedConfigTime;
lastModifiedMeteorConfig = getMeteorAppPackageJson()?.meteor;
lastModifiedMeteorConfig = {
...lastModifiedMeteorConfig,
modern: normalizeModern(lastModifiedMeteorConfig?.modern),
};
if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
logConfigBlock('Meteor Config', lastModifiedMeteorConfig);
@@ -277,7 +297,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
const config = lastModifiedMeteorConfig?.modern?.transpiler;
const hasModernTranspiler =
lastModifiedMeteorConfig?.modern?.transpiler === true ||
lastModifiedMeteorConfig?.modern?.transpiler !== false ||
lastModifiedMeteorConfig?.modern === true;
const shouldSkipSwc =
!hasModernTranspiler ||

25
tools/cli/commands.js
View File

@@ -261,6 +261,25 @@ export function parseRunTargets(targets) {
});
};
const DEFAULT_MODERN = {
transpiler: true,
webArchsOnly: true,
watcher: true,
};
const normalizeModern = r => Object.fromEntries(
Object.entries(DEFAULT_MODERN).map(([k, def]) => [
k,
r === true
? def
: r === false || r?.[k] === false
? false
: typeof r?.[k] === 'object'
? { ...r[k] }
: def,
]),
);
let meteorConfig;
function getMeteorConfig(appDir) {
@@ -277,12 +296,12 @@ function getMeteorConfig(appDir) {
function isModernArchsOnlyEnabled(appDir) {
const meteorConfig = getMeteorConfig(appDir);
return meteorConfig?.modern?.webArchsOnly === true || meteorConfig?.modern === true;
return normalizeModern(meteorConfig?.modern).webArchOnly === true;
}
export function isModernWatcherEnabled(appDir) {
const meteorConfig = getMeteorConfig(appDir);
return meteorConfig?.modern?.watcher === true || meteorConfig?.modern === true;
return normalizeModern(meteorConfig?.modern).watcher === true;
}
function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
@@ -306,7 +325,7 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
const hasExcludeArchsOptions = (excludeArchsOptions?.length || 0) > 0;
const hasModernArchsOnlyEnabled = appDir && isModernArchsOnlyEnabled(appDir);
if (hasExcludeArchsOptions && hasModernArchsOnlyEnabled) {
console.warn('modernWebArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
console.warn('modern.webArchsOnly and --exclude-archs are both active. If both are set, --exclude-archs takes priority.');
}
const automaticallyIgnoredLegacyArchs = (!hasExcludeArchsOptions && hasModernArchsOnlyEnabled) ? ['web.browser.legacy', 'web.cordova'] : [];
if (hasExcludeArchsOptions || automaticallyIgnoredLegacyArchs.length) {