mjml-core - npm Package Compare versions

Comparing version 2.0.2 to 2.0.3-beta.1

lib/decorators/MJMLElement.js

@@ -192,5 +192,7 @@ 'use strict';
       _this.paddingParser = function (direction) {
-        var paddingDirection = _this.mjAttribute('padding-' + direction);
-        var padding = _this.mjAttribute('padding');
+        var prefix = arguments.length <= 1 || arguments[1] === undefined ? '' : arguments[1];
 
+        var paddingDirection = _this.mjAttribute(prefix + 'padding-' + direction);
+        var padding = _this.mjAttribute(prefix + 'padding');
+
         if (typeof paddingDirection !== 'undefined') {
@@ -239,4 +241,3 @@ return parseInt(paddingDirection);
             paddingRight: (0, _mjAttribute.defaultUnit)(this.mjAttribute('padding-right'), 'px'),
-            paddingLeft: (0, _mjAttribute.defaultUnit)(this.mjAttribute('padding-left'), 'px'),
-            textAlign: this.mjAttribute('align')
+            paddingLeft: (0, _mjAttribute.defaultUnit)(this.mjAttribute('padding-left'), 'px')
           }
@@ -333,2 +334,3 @@ });
               {
+                'data-legacy-align': this.mjAttribute('align'),
                 'data-legacy-background': this.mjAttribute('container-background-color'),
@@ -335,0 +337,0 @@ style: this.styles.td },

lib/MJMLRenderer.js

@@ -10,8 +10,10 @@ 'use strict';
 
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
 var _Error = require('./Error');
 
-var _jsBeautify = require('js-beautify');
+var _postRender = require('./helpers/postRender');
 
-var _postRender2 = require('./helpers/postRender');
-
 var _mjml = require('./helpers/mjml');
@@ -23,18 +25,2 @@
 
-var _document = require('./parsers/document');
-
-var _document2 = _interopRequireDefault(_document);
-
-var _dom = require('./helpers/dom');
-
-var _dom2 = _interopRequireDefault(_dom);
-
-var _fs = require('fs');
-
-var _fs2 = _interopRequireDefault(_fs);
-
-var _lodash = require('lodash');
-
-var _lodash2 = _interopRequireDefault(_lodash);
-
 var _getFontsImports = require('./helpers/getFontsImports');
@@ -85,5 +71,7 @@
     value: function registerDotfile() {
+      var fs = require('fs');
+
       try {
         var path = process.cwd();
-        var mjmlConfig = JSON.parse(_fs2.default.readFileSync(path + '/.mjmlconfig').toString());
+        var mjmlConfig = JSON.parse(fs.readFileSync(path + '/.mjmlconfig').toString());
         var packages = mjmlConfig.packages;
@@ -111,35 +99,17 @@
     value: function parseDocument() {
+      var documentParser = require('./parsers/document').default;
+
       debug('Start parsing document');
-      this.content = (0, _document2.default)(this.content);
+      this.content = documentParser(this.content);
       debug('Content parsed');
     }
   }, {
-    key: 'render',
-    value: function render() {
-      if (!this.content) {
-        throw new _Error.EmptyMJMLError('.render: No MJML to render in options ' + this.options.toString());
-      }
+    key: 'postRender',
+    value: function postRender(MJMLDocument) {
+      var dom = require('./helpers/dom').default;
 
-      var rootElemComponent = _react2.default.createElement(_MJMLElementsCollection2.default[this.content.tagName], { mjml: (0, _mjml.parseInstance)(this.content) });
+      var $ = dom.parseHTML(MJMLDocument);
 
-      debug('Render to static markup');
-      var renderedMJML = _server2.default.renderToStaticMarkup(rootElemComponent);
+      $ = (0, _postRender.fixLegacyAttrs)($);
 
-      debug('React rendering done. Continue with special overrides.');
-
-      var MJMLDocument = (0, _defaultContainer2.default)({
-        title: this.options.title,
-        content: renderedMJML,
-        fonts: (0, _getFontsImports2.default)({ content: renderedMJML })
-      });
-
-      return this._postRender(MJMLDocument);
-    }
-  }, {
-    key: '_postRender',
-    value: function _postRender(MJMLDocument) {
-      var $ = _dom2.default.parseHTML(MJMLDocument);
-
-      $ = (0, _postRender2.fixLegacyAttrs)($);
-
       _MJMLElementsCollection.postRenders.forEach(function (postRender) {
@@ -151,7 +121,9 @@ if (typeof postRender === 'function') {
 
-      var finalMJMLDocument = _dom2.default.getHTML($);
-      finalMJMLDocument = (0, _postRender2.removeCDATA)(finalMJMLDocument);
+      var finalMJMLDocument = dom.getHTML($);
+      finalMJMLDocument = (0, _postRender.removeCDATA)(finalMJMLDocument);
 
-      if (this.options.beautify && _jsBeautify.html) {
-        finalMJMLDocument = (0, _jsBeautify.html)(finalMJMLDocument, {
+      if (this.options.beautify) {
+        var beautify = require('js-beautify').html;
+
+        finalMJMLDocument = beautify(finalMJMLDocument, {
           indent_size: 2,
@@ -163,3 +135,2 @@ wrap_attributes_indent_size: 2
       if (this.options.minify) {
-
         var minify = require('html-minifier').minify;
@@ -176,2 +147,24 @@
     }
+  }, {
+    key: 'render',
+    value: function render() {
+      if (!this.content) {
+        throw new _Error.EmptyMJMLError('.render: No MJML to render in options ' + this.options.toString());
+      }
+
+      var rootElemComponent = _react2.default.createElement(_MJMLElementsCollection2.default[this.content.tagName], { mjml: (0, _mjml.parseInstance)(this.content) });
+
+      debug('Render to static markup');
+      var renderedMJML = _server2.default.renderToStaticMarkup(rootElemComponent);
+
+      debug('React rendering done. Continue with special overrides.');
+
+      var MJMLDocument = (0, _defaultContainer2.default)({
+        title: this.options.title,
+        content: renderedMJML,
+        fonts: (0, _getFontsImports2.default)({ content: renderedMJML })
+      });
+
+      return this.postRender(MJMLDocument);
+    }
   }]);
@@ -178,0 +171,0 @@

lib/parsers/document.js

@@ -9,2 +9,6 @@ 'use strict';
 
+var _mjCssClasses = require('../mjCssClasses');
+
+var _mjDefaultAttributes = require('../mjDefaultAttributes');
+
 var _compact = require('lodash/compact');
@@ -18,2 +22,6 @@
 
+var _each = require('lodash/each');
+
+var _each2 = _interopRequireDefault(_each);
+
 var _filter = require('lodash/filter');
@@ -23,6 +31,2 @@
 
-var _each = require('lodash/each');
-
-var _each2 = _interopRequireDefault(_each);
-
 var _MJMLElementsCollection = require('../MJMLElementsCollection');
@@ -32,6 +36,2 @@
 
-var _mjDefaultAttributes = require('../mjDefaultAttributes');
-
-var _mjCssClasses = require('../mjCssClasses');
-
 var _MJMLHead = require('../MJMLHead');
@@ -38,0 +38,0 @@

package.json

 {
   "name": "mjml-core",
-  "version": "2.0.2",
+  "version": "2.0.3-beta.1",
   "main": "lib/index.js",
@@ -21,9 +21,9 @@ "scripts": {
     "debug": "^2.2.0",
-    "html-minifier": "^2.1.2",
+    "html-minifier": "^2.1.3",
     "immutable": "^3.8.1",
-    "jquery": "^2.2.3",
+    "jquery": "^2.2.4",
     "js-beautify": "^1.6.2",
-    "lodash": "^4.12.0",
-    "react-dom": "^15.0.2",
-    "react": "^15.0.2",
+    "lodash": "^4.13.0",
+    "react-dom": "^15.1.0",
+    "react": "^15.1.0",
     "warning": "^2.1.0"
@@ -33,4 +33,4 @@ },
     "chai": "^3.5.0",
-    "mocha": "^2.4.5"
+    "mocha": "^2.5.1"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

40095

decreased by-0.09%

Lines of code

869

decreased by-0.23%

Number of low quality alerts

1

increased byInfinity%

Dependency changes

• Updatedhtml-minifier@^2.1.3

• Updatedjquery@^2.2.4

• Updatedlodash@^4.13.0

• Updatedreact@^15.1.0

• Updatedreact-dom@^15.1.0