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:37:48 +02:00
parent 34710e2d5c 2fee467d6c
commit 484fde033f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,9 +296,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
const isLegacyWebArch = arch.includes('legacy');
const config = lastModifiedMeteorConfig?.modern?.transpiler;
const hasModernTranspiler =
lastModifiedMeteorConfig?.modern?.transpiler !== false ||
lastModifiedMeteorConfig?.modern === true;
const hasModernTranspiler = lastModifiedMeteorConfig?.modern?.transpiler !== false;
const shouldSkipSwc =
!hasModernTranspiler ||
(isAppCode && config?.excludeApp === true) ||

4
tools/cli/commands.js
View File

@@ -296,12 +296,12 @@ function getMeteorConfig(appDir) {
function isModernArchsOnlyEnabled(appDir) {
const meteorConfig = getMeteorConfig(appDir);
return normalizeModern(meteorConfig?.modern).webArchOnly === true;
return normalizeModern(meteorConfig?.modern).webArchOnly !== false;
}
export function isModernWatcherEnabled(appDir) {
const meteorConfig = getMeteorConfig(appDir);
return normalizeModern(meteorConfig?.modern).watcher === true;
return normalizeModern(meteorConfig?.modern).watcher !== false;
}
function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {