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

Revert "refactor extend babel options"

Browse Source 
This reverts commit d983e791e1.
This commit is contained in:
Nacho Codoñer
2025-05-26 18:30:12 +02:00
parent b98d15c52f
commit 1fd8c98b22
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,33 +304,22 @@ BCp.processOneFileForTarget = function (inputFile, source) {
},
};
// Helper function to setup Babel options
const setupBabelOptions = () => {
this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
this.inferTypeScriptConfig(features, inputFile, cacheOptions.cacheDeps);
var babelOptions = Babel.getDefaultOptions(features);
babelOptions.caller = { name: "meteor", arch };
var babelOptions = Babel.getDefaultOptions(features);
babelOptions.caller = { name: "meteor", arch };
babelOptions.sourceMaps = true;
const filename = packageName
? `packages/${packageName}/${inputFilePath}`
: inputFilePath;
babelOptions.filename = babelOptions.sourceFileName = filename;
this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
this.inferExtraBabelOptions(inputFile, babelOptions, cacheOptions.cacheDeps);
if (this.modifyBabelConfig) {
this.modifyBabelConfig(babelOptions, inputFile);
}
return babelOptions;
};
// Define babelOptions at the outer scope so it's available for source map
var babelOptions;
babelOptions.sourceMaps = true;
const filename = packageName
? `packages/${packageName}/${inputFilePath}`
: inputFilePath;
babelOptions.filename = babelOptions.sourceFileName = filename;
if (this.modifyBabelConfig) {
this.modifyBabelConfig(babelOptions, inputFile);
}
try {
var result = (() => {
@@ -395,8 +384,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
arch,
});
}
// Set babelOptions.filename for source map
babelOptions = { filename };
return compilation;
}
@@ -409,12 +396,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
// Save result in cache
this.writeToSwcCache({ cacheKey, compilation });
usedSwc = true;
// Set babelOptions.filename for source map
babelOptions = { filename };
} else {
// Set up Babel options only when compiling with Babel
babelOptions = setupBabelOptions();
compilation = compileWithBabel(source, babelOptions, cacheOptions);
usedSwc = false;
}
@@ -432,10 +414,6 @@ BCp.processOneFileForTarget = function (inputFile, source) {
} catch (e) {
this._swcIncompatible[cacheKey] = true;
// If SWC fails, fall back to Babel
// Set up Babel options for fallback
babelOptions = setupBabelOptions();
compilation = compileWithBabel(source, babelOptions, cacheOptions);
if (config?.verbose) {
logTranspilation({