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

updated the error handling logic (to be terser specific as opposed to babel-minify specific) and then tested this function against a collection of bundled JS files I wrote to disk during minification. I was able to retrieve the original source file's name from a given line number in the bundled JS file so this should work well in production

Browse Source
This commit is contained in:
Brian Mulhall
2020-04-04 12:47:12 -05:00
parent 3b3274ada9
commit ab2a121910
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/standard-minifier-js/plugin/minify-js.js
View File

@@ -7,8 +7,6 @@ Plugin.registerMinifier({
() => new MeteorBabelMinifier()
);
class MeteorBabelMinifier {
processFilesForBundle (files, options) {
@@ -26,38 +24,35 @@ class MeteorBabelMinifier {
return;
}
// nested function
// this function tries its best to locate the original source file
// that the error being reported was located inside of
function maybeThrowMinifyErrorBySourceFile(error, file) {
const lines = file.getContentsAsString().split(/\n/);
const lines = file.getContentsAsString().split(/\n/);
const lineContent = lines[error.line - 1];
let originalSourceFileLineNumber = 0;
// Count backward from the failed line to find the oringal filename
for (let i = (error.line - 1); i >= 0; i--) {
let currentLine = lines[i];
// If the line is a boatload of slashes, we're in the right place.
if (/^\/\/\/{6,}$/.test(currentLine)) {
// Count backward from the failed line to find the filename.
for (let i = error.line - 1; i >= 0; i--) {
let currentLine = lines[i];
// If 4 lines back is the same exact line, we've found the framing.
if (lines[i - 4] === currentLine) {
// If the line is a boatload of slashes, we're in the right place.
if (/^\/\/\/{6,}$/.test(currentLine)) {
// So in that case, 2 lines back is the file path.
let originalFilePath = lines[i - 2].substring(3).replace(/\s+\/\//, "");
// If 4 lines back is the same exact line, we've found the framing.
if (contents[i - 4] === currentLine) {
// So in that case, 2 lines back is the file path.
let originalFilePath = contents[c - 2].substring(3).replace(/\s+\/\//, "");
throw new Error(
"terser minification error within" +
file.getPathInBundle() + ":\n" +
originalFilePath +
", line " + error.line + "\n\n" +
error.message + ":\n\n" +
lineContent + "\n"
);
throw new Error(
`terser minification error (${error.message})\n` +
`Source file: ${originalFilePath} (${originalSourceFileLineNumber}:${error.col})\n` +
`Line content: ${lineContent}\n`);
}
}
}
originalSourceFileLineNumber++;
}
}
@@ -80,11 +75,9 @@ class MeteorBabelMinifier {
minified = meteorJsMinify(file.getContentsAsString());
}
catch (err) {
const filePath = file.getPathInBundle();
maybeThrowMinifyErrorBySourceFile(err, file);
err.message += " while minifying " + filePath;
err.message += " while minifying " + file.getPathInBundle();
throw err;
}