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

cleaning up the error handling and the variable naming

Browse Source
This commit is contained in:
BrianMulhall
2020-03-26 21:56:32 -05:00
parent 21e39491fc
commit 3f331f002b
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/minifier-js/minifier.js
View File

@@ -5,7 +5,7 @@ meteorJsMinify = function (source) {
const NODE_ENV = process.env.NODE_ENV || "development";
try {
const options = {
const terserOptions = {
compress: {
drop_debugger: false, // remove debugger; statements
unused: false, // drop unreferenced functions and variables
@@ -20,7 +20,7 @@ meteorJsMinify = function (source) {
safari10: true, // set this option to true to work around the Safari 10/11 await bug
};
const terserResult = terser.minify(source, options);
const terserResult = terser.minify(source, terserOptions);
if (typeof terserResult.code === "string") {
result.code = terserResult.code;
@@ -34,13 +34,23 @@ meteorJsMinify = function (source) {
// Although Babel.minify can handle a wider variety of ECMAScript
// 2015+ syntax, it is substantially slower than terser, so
// we use it only as a fallback.
const options = Babel.getMinifierOptions({
const babelOptions = Babel.getMinifierOptions({
inlineNodeEnv: NODE_ENV
});
const babelResult = Babel.minify(source, options);
result.code = babelResult.code;
result.minifier = 'babel-minify';
const babelResult = Babel.minify(source, babelOptions);
console.log(babelResult);
if (typeof babelResult.code === "string") {
result.code = babelResult.code;
result.minifier = 'babel-minify';
}
else {
// this error gets raised when babel-minify doesn't
// raise an exception when it executes but fails to
// return any useful result in the code field
throw new Error("Unknown babel-minify error");
}
}
return result;

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

@@ -129,13 +129,6 @@ class MeteorBabelMinifier {
let minified;
try {
minified = meteorJsMinify(file.getContentsAsString());
if (!(minified && typeof minified.code === "string")) {
// this error gets raised when babel-minify doesn't
// raise an exception when it executes but fails to
// return any useful result in the code field
throw new Error("Unknown babel-minify error");
}
}
catch (err) {