Comparing version 4.9.0 to 4.9.1
@@ -12,2 +12,4 @@ "use strict"; | ||
var _omit2 = _interopRequireDefault(require("lodash/omit")); | ||
var _get2 = _interopRequireDefault(require("lodash/get")); | ||
@@ -21,4 +23,2 @@ | ||
var _omit2 = _interopRequireDefault(require("lodash/fp/omit")); | ||
var _pickBy2 = _interopRequireDefault(require("lodash/fp/pickBy")); | ||
@@ -66,2 +66,15 @@ | ||
const beautifyConfig = { | ||
indent_size: 2, | ||
wrap_attributes_indent_size: 2, | ||
max_preserve_newline: 0, | ||
preserve_newlines: false | ||
}; | ||
const minifyConfig = { | ||
collapseWhitespace: true, | ||
minifyCSS: false, | ||
caseSensitive: true, | ||
removeEmptyAttributes: true | ||
}; | ||
var _default = async () => { | ||
@@ -196,3 +209,5 @@ let EXIT_CODE = 0; | ||
(0, _watchFiles.default)(inputFiles, { ...argv, | ||
config | ||
config, | ||
minifyConfig, | ||
beautifyConfig | ||
}); | ||
@@ -251,16 +266,7 @@ KEEP_OPEN = true; | ||
if (beautify) { | ||
compiled.html = (0, _jsBeautify.html)(compiled.html, { | ||
indent_size: 2, | ||
wrap_attributes_indent_size: 2, | ||
max_preserve_newline: 0, | ||
preserve_newlines: false | ||
}); | ||
compiled.html = (0, _jsBeautify.html)(compiled.html, beautifyConfig); | ||
} | ||
if (minify) { | ||
compiled.html = (0, _htmlMinifier.minify)(compiled.html, { | ||
collapseWhitespace: true, | ||
minifyCSS: false, | ||
caseSensitive: true, | ||
removeEmptyAttributes: true, | ||
compiled.html = (0, _htmlMinifier.minify)(compiled.html, { ...minifyConfig, | ||
...config.minifyOptions | ||
@@ -267,0 +273,0 @@ }); |
@@ -10,2 +10,4 @@ "use strict"; | ||
var _omit2 = _interopRequireDefault(require("lodash/omit")); | ||
var _remove2 = _interopRequireDefault(require("lodash/fp/remove")); | ||
@@ -31,2 +33,6 @@ | ||
var _jsBeautify = require("js-beautify"); | ||
var _htmlMinifier = require("html-minifier"); | ||
var _readFile = _interopRequireDefault(require("./readFile")); | ||
@@ -79,9 +85,30 @@ | ||
content: (0, _readFile.default)(file).mjml | ||
}), args => ({ ...args, | ||
compiled: (0, _mjmlCore.default)(args.content, { | ||
}), args => { | ||
const { | ||
config, | ||
beautifyConfig, | ||
minifyConfig | ||
} = options; | ||
const beautify = config.beautify && config.beautify !== 'false'; | ||
const minify = config.minify && config.minify !== 'false'; | ||
const compiled = (0, _mjmlCore.default)(args.content, { | ||
filePath: args.file, | ||
actualPath: args.file, | ||
...options.config | ||
}) | ||
}), args => { | ||
...(0, _omit2.default)(config, ['minify', 'beautify']) | ||
}); | ||
if (beautify) { | ||
compiled.html = (0, _jsBeautify.html)(compiled.html, beautifyConfig); | ||
} | ||
if (minify) { | ||
compiled.html = (0, _htmlMinifier.minify)(compiled.html, { ...minifyConfig, | ||
...config.minifyOptions | ||
}); | ||
} | ||
return { ...args, | ||
compiled | ||
}; | ||
}, args => { | ||
const { | ||
@@ -88,0 +115,0 @@ compiled: { |
{ | ||
"name": "mjml-cli", | ||
"description": "MJML: the only framework that makes responsive-email easy", | ||
"version": "4.9.0", | ||
"version": "4.9.1", | ||
"main": "bin/mjml", | ||
@@ -34,6 +34,6 @@ "bin": { | ||
"lodash": "^4.17.15", | ||
"mjml-core": "4.9.0", | ||
"mjml-migrate": "4.9.0", | ||
"mjml-parser-xml": "4.9.0", | ||
"mjml-validator": "4.9.0", | ||
"mjml-core": "4.9.1", | ||
"mjml-migrate": "4.9.1", | ||
"mjml-parser-xml": "4.9.1", | ||
"mjml-validator": "4.9.1", | ||
"yargs": "^16.1.0" | ||
@@ -45,3 +45,3 @@ }, | ||
}, | ||
"gitHead": "167a375d47aa78e834376b99c8a2bbbc0c3581a0" | ||
"gitHead": "ba92553c1a889bf35e396703b7a86ae8da0c204c" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
27716
576
+ Addedmjml-core@4.9.1(transitive)
+ Addedmjml-migrate@4.9.1(transitive)
+ Addedmjml-parser-xml@4.9.1(transitive)
+ Addedmjml-validator@4.9.1(transitive)
- Removedmjml-core@4.9.0(transitive)
- Removedmjml-migrate@4.9.0(transitive)
- Removedmjml-parser-xml@4.9.0(transitive)
- Removedmjml-validator@4.9.0(transitive)
Updatedmjml-core@4.9.1
Updatedmjml-migrate@4.9.1
Updatedmjml-parser-xml@4.9.1
Updatedmjml-validator@4.9.1