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 'release-3.3' into modern-legacy-selftests

Browse Source
This commit is contained in:
Nacho Codoñer
2025-05-06 16:08:55 +02:00
parent c957ae5e66 195cb927e0
commit 67a7cbe23f
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,11 @@ BCp.initializeMeteorAppSwcrc = function () {
lastModifiedSwcConfigTime = currentLastModifiedConfigTime;
lastModifiedSwcConfig = getMeteorAppSwcrc();
// Resolve custom baseUrl to an absolute path pointing to the project root
if (lastModifiedSwcConfig.jsc && lastModifiedSwcConfig.jsc.baseUrl) {
lastModifiedSwcConfig.jsc.baseUrl = path.resolve(process.cwd(), lastModifiedSwcConfig.jsc.baseUrl);
}
if (lastModifiedMeteorConfig?.modern?.transpiler?.verbose) {
logConfigBlock('SWC Config', lastModifiedSwcConfig);
}

17
tools/cli/commands.js
View File

@@ -332,9 +332,21 @@ function filterWebArchs(webArchs, excludeArchsOption, appDir, options) {
const excludeArchs = [...excludeArchsOptions, ...automaticallyIgnoredLegacyArchs];
webArchs = webArchs.filter(arch => !excludeArchs.includes(arch));
}
return webArchs;
}
}
const forcedInclArchs = process.env.METEOR_FORCE_INCLUDE_ARCHS;
if (forcedInclArchs != null) {
const nextInclArchs = forcedInclArchs.trim().split(/\s*,\s*/);
webArchs = Array.from(new Set([...webArchs, ...nextInclArchs]));
}
const forcedExclArchs = process.env.METEOR_FORCE_EXCLUDE_ARCHS;
if (forcedExclArchs != null) {
const nextExclArchs = forcedExclArchs.trim().split(/\s*,\s*/);
webArchs = webArchs.filter(_webArch => !nextExclArchs.includes(_webArch));
}
return webArchs;
}
@@ -584,7 +596,8 @@ async function doRunCommand(options) {
const buildMode = options.production ? 'production' : 'development';
let cordovaRunner;
if (!_.isEmpty(runTargets)) {
const shouldDisableCordova = Boolean(JSON.parse(process.env.METEOR_CORDOVA_DISABLE || 'false'));
if (!shouldDisableCordova && !_.isEmpty(runTargets)) {
async function prepareCordovaProject() {
import { CordovaProject } from '../cordova/project.js';

3
tools/cli/main.js
View File

@@ -1544,6 +1544,9 @@ makeGlobalAsyncLocalStorage().run({}, async function () {
});
}
// Set the currentCommand in the global object to spread context
global.currentCommand = { name: command.name, options };
var ret = await command.func(options, { rawOptions });
} catch (e) {