Skip to content

Commit

Permalink
Prepare 2.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Loëck Vézien committed Aug 12, 2016
1 parent 7602452 commit ded09e8
Show file tree
Hide file tree
Showing 27 changed files with 125 additions and 117 deletions.
8 changes: 7 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@
"space-before-function-paren": [2, "always"],
"space-in-parens": 0,
"vars-on-top": 0,
"no-mixed-operators": 0,

"import/no-unresolved": 0,
"import/imports-first": 0,
"import/no-extraneous-dependencies": 0,
"import/prefer-default-export": 0,

"react/jsx-boolean-value": 0,
"react/jsx-closing-bracket-location": 0,
Expand All @@ -65,7 +69,9 @@
"react/no-did-update-set-state": 0,
"react/no-multi-comp": 0,
"react/prefer-stateless-function": 0,
"react/prop-types": 0
"react/prop-types": 0,
"react/jsx-filename-extension": 0,
"react/jsx-no-target-blank": 0
},

"env": {
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
},
"devDependencies": {
"babel": "^6.5.2",
"babel-core": "^6.9.1",
"babel-eslint": "^6.0.4",
"babel-core": "^6.13.2",
"babel-eslint": "^6.1.2",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015": "^6.9.0",
"babel-preset-react": "^6.5.0",
"babel-preset-es2015": "^6.13.2",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.9.0",
"eslint": "^2.13.0",
"eslint-config-airbnb": "^9.0.1",
"eslint-plugin-import": "^1.8.1",
"eslint-plugin-jsx-a11y": "^1.5.3",
"eslint-plugin-react": "^5.2.2",
"babel-register": "^6.11.6",
"eslint": "^3.2.2",
"eslint-config-airbnb": "^10.0.0",
"eslint-plugin-import": "^1.13.0",
"eslint-plugin-jsx-a11y": "^2.1.0",
"eslint-plugin-react": "^6.0.0",
"gulp": "^3.9.1",
"gulp-babel": "^6.1.2",
"gulp-newer": "^1.2.0",
"pre-commit": "^1.1.3",
"shelljs": "^0.7.0",
"shelljs": "^0.7.3",
"through2": "^2.0.1",
"yargs": "^4.7.1"
"yargs": "^4.8.1"
}
}
8 changes: 4 additions & 4 deletions packages/mjml-button/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-button",
"description": "mjml-button",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
6 changes: 3 additions & 3 deletions packages/mjml-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-cli",
"description": "MJML: the only framework that makes responsive-email easy",
"version": "2.3.1",
"version": "2.3.2",
"main": "bin/mjml",
"bin": {
"mjml-cli": "bin/mjml"
Expand All @@ -19,8 +19,8 @@
"commander": "^2.9.0",
"fs-promise": "^0.5.0",
"glob": "^7.0.3",
"lodash": "^4.13.1",
"mjml-core": "^2.3.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2"
},
"devDependencies": {
"chai": "^3.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/mjml-cli/src/client.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MJMLRenderer, version } from 'mjml-core'
import camelCase from 'lodash/camelCase'
import createComponent from './createComponent'
import fs from 'fs'
import glob from 'glob'
import path from 'path'
import camelCase from 'lodash/camelCase'
import upperFirst from 'lodash/upperFirst'
import createComponent from './createComponent'

/*
* The version number is the NPM
Expand Down
8 changes: 4 additions & 4 deletions packages/mjml-column/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-column",
"description": "mjml-column",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
6 changes: 3 additions & 3 deletions packages/mjml-container/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-container",
"description": "mjml-container",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,7 +13,7 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
12 changes: 6 additions & 6 deletions packages/mjml-core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-core",
"description": "mjml-core",
"version": "2.3.1",
"version": "2.3.2",
"main": "lib/index.js",
"scripts": {
"test": "mocha --compilers js:babel-register"
Expand All @@ -25,17 +25,17 @@
"classnames": "^2.2.5",
"debug": "^2.2.0",
"he": "^1.1.0",
"html-minifier": "^3.0.1",
"html-minifier": "^3.0.2",
"immutable": "^3.8.1",
"jquery": "^3.1.0",
"js-beautify": "^1.6.3",
"lodash": "^4.13.1",
"react": "^15.2.1",
"react-dom": "^15.2.1",
"lodash": "^4.14.2",
"react": "^15.3.0",
"react-dom": "^15.3.0",
"warning": "^3.0.0"
},
"devDependencies": {
"chai": "^3.5.0",
"mocha": "^2.5.3"
"mocha": "^3.0.2"
}
}
1 change: 1 addition & 0 deletions packages/mjml-core/src/MJMLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default class MJMLRenderer {

registerDotfile () {
const fs = require('fs')

const path = process.cwd()

try {
Expand Down
1 change: 1 addition & 0 deletions packages/mjml-core/src/helpers/dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ if (inBrowser) {
}
} else {
const cheerio = require('cheerio')

let $ = cheerio.load('', { decodeEntities: false })

const parseMarkup = (str, options) => {
Expand Down
8 changes: 4 additions & 4 deletions packages/mjml-divider/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-divider",
"description": "mjml-divider",
"version": "2.0.9",
"version": "2.0.10",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/mjml-group/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-group",
"description": "mjml-group",
"version": "2.0.2",
"version": "2.0.3",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://github.com/mjmlio/mjml",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
4 changes: 2 additions & 2 deletions packages/mjml-head-attributes/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-head-attributes",
"description": "mjml-head-attributes",
"version": "2.0.6",
"version": "2.0.7",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,6 +13,6 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1"
"lodash": "^4.14.2"
}
}
8 changes: 4 additions & 4 deletions packages/mjml-hero/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-hero",
"description": "mjml-hero",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
4 changes: 2 additions & 2 deletions packages/mjml-hero/src/Hero.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ class Hero extends Component {

return (
<tr style={this.styles.tr}>
<td style={this.styles.edge}></td>
<td style={this.styles.edge} />
<td
data-legacy-background={mjAttribute('background-url')}
style={this.styles.hero}>
{children}
</td>
<td style={this.styles.edge}></td>
<td style={this.styles.edge} />
</tr>
)
}
Expand Down
8 changes: 4 additions & 4 deletions packages/mjml-html/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-html",
"description": "mjml-html",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/mjml-image/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-image",
"description": "mjml-image",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/mjml-list/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-list",
"description": "mjml-list",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,8 +13,8 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"react": "^15.3.0"
}
}
12 changes: 6 additions & 6 deletions packages/mjml-location/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mjml-location",
"description": "mjml-location",
"version": "2.0.8",
"version": "2.0.9",
"main": "lib/index.js",
"repository": {
"type": "git",
Expand All @@ -13,10 +13,10 @@
},
"homepage": "https://mjml.io",
"dependencies": {
"lodash": "^4.13.1",
"mjml-core": "^2.3.1",
"mjml-image": "^2.0.8",
"mjml-text": "^2.0.8",
"react": "^15.2.1"
"lodash": "^4.14.2",
"mjml-core": "^2.3.2",
"mjml-image": "^2.0.9",
"mjml-text": "^2.0.9",
"react": "^15.3.0"
}
}
Loading

0 comments on commit ded09e8

Please sign in to comment.