Merge pull request #212 from mjmlio/2.8.0

2.8.0

.babelrc

@@ -1,35 +1,20 @@
 {
   "presets": [
-    ["env", { "targets": { "node": 6 }, "useBuiltIns": true }],
-    "es2015",
-    "stage-0",
-    "react"
-  ],
-  "plugins": [
-    "add-module-exports",
-    "transform-decorators-legacy",
     [
-      "module-resolver",
+      "env",
       {
-        "root": [
-          "app"
-        ]
+        "loose": true,
+        "modules": "commonjs",
+        "targets": {
+          "electron": "1.8",
+          "node": "current"
+        }
       }
     ],
+    "react",
+    "stage-0"
   ],
-  "env": {
-    "production": {
-      "presets": ["react-optimize"],
-      "plugins": ["babel-plugin-dev-expression"]
-    },
-    "development": {
-      "plugins": [],
-      "presets": ["react-hmre"]
-    },
-    "test": {
-      "plugins": [
-        ["webpack-loaders", { "config": "webpack.config.test.js", "verbose": false }]
-      ]
-    }
-  }
+  "plugins": [
+    ["module-resolver", { "root": ["src"] }]
+  ]
 }

.eslintrc

@@ -1,30 +1,57 @@
 {
-  "extends": [
-    "zavatta",
-    "zavatta-react",
-    "prettier",
-    "prettier/react"
-  ],
-  "env": {
-    "browser": true,
-    "node": true
-  },
+  "parser": "babel-eslint",
+  "extends": ["airbnb", "prettier", "prettier/react"],
   "globals": {
-    "Promise": false,
-    "dataLayer": false,
+    "fetch": false,
+    "Image": false,
+    "window": false,
+    "document": false,
     "__MJML_APP_VERSION__": false,
     "__MJML_VERSION__": false,
   },
   "rules": {
-    "no-undefined": 0,
+    "camelcase": 0,
+    "global-require": 0,
+    "import/no-extraneous-dependencies": 0,
+    "import/no-named-as-default": 0,
+    "import/prefer-default-export": 0,
+    "jsx-a11y/anchor-is-valid": 0,
+    "jsx-a11y/label-has-for": 0,
+    "new-cap": 0,
+    "no-nested-ternary": 0,
+    "no-bitwise": 0,
+    "no-param-reassign": 0,
+    "no-plusplus": 0,
+    "no-return-assign": 0,
+    "no-shadow": 0,
+    "no-underscore-dangle": 0,
+    "no-use-before-define": 0,
+    "no-await-in-loop": 0,
+    "no-void": 0,
     "no-unused-expressions": 0,
-    "no-case-declarations": 0,
-    "id-length": 0,
+    "no-useless-escape": 0,
+    "consistent-return": 0,
+    "react/no-multi-comp": 0,
+    "react/forbid-prop-types": 0,
+    "react/jsx-curly-brace-presence": 0,
+    "react/jsx-filename-extension": 0,
+    "react/jsx-no-target-blank": 0,
+    "react/prefer-stateless-function": 0,
+    "react/prop-types": 0,
+    "react/sort-comp": 0,
+    "jsx-a11y/iframe-has-title": 0,
+    "jsx-a11y/no-autofocus": 0,
+    "jsx-a11y/no-noninteractive-tabindex": 0,
+    "jsx-a11y/click-events-have-key-events": 0,
+    "jsx-a11y/no-static-element-interactions": 0,
+    "jsx-a11y/mouse-events-have-key-events": 0,
+    "jsx-a11y/alt-text": 0,
+    "import/first": 0,
+    "arrow-body-style": 0,
   },
-  "plugins": [
-    "react"
-  ],
-  "parserOptions": {
-    "sourceType": "module",
+  "settings": {
+    "import/resolver": {
+      "babel-module": {},
+    },
   },
 }

.gitignore

@@ -1,46 +1,4 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-.eslintcache
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
-app/node_modules
-
-# OSX
 .DS_Store
-
-# App packaged
-release
-app/main.js
-app/main.js.map
-app/bundle.js
-app/bundle.js.map
-app/style.css
-app/style.css.map
-dist
-main.js
-main.js.map
-
-.idea
+dist/
+node_modules/
+thumbs.db

.prettierrc

@@ -0,0 +1,4 @@
+printWidth: 100
+semi: false
+singleQuote: true
+trailingComma: all

.travis.yml

@@ -7,32 +7,12 @@ cache:
   yarn: true
   directories:
     - node_modules
-    - app/node_modules
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-      - icnsutils
-      - graphicsmagick
-      - xz-utils
-      - xorriso
 
 install:
-  - export CXX="g++-4.8"
   - yarn
-  - cd app && yarn && cd ..
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start &
-  - sleep 3
 
 script:
   - node --version
   - yarn lint
   - yarn prettier:check
-  - yarn package
+  - yarn dist:dir

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.8.0 (2018-03-06)
+
+- [MJML](https://github.com/mjmlio/mjml) 4 ([#213](https://github.com/mjmlio/mjml-app/issues/213)), update of default templates for MJML 4
+- Setup auto-updates
+- Crashes fixes ([#188](https://github.com/mjmlio/mjml-app/issues/188)) - @kmcb777
+- Handle subfolders when create/delete file ([#192](https://github.com/mjmlio/mjml-app/issues/192)) - @kmcb777
+- Fix path resolution in node_modules ([#174](https://github.com/mjmlio/mjml-app/issues/174)) - @kmcb777
+
 ### 2.7.0 (2017-09-22)
 
 - Ability to change the sender name when sending test email - @Mistra - [#177](https://github.com/mjmlio/mjml-app/pull/177)

README.md

@@ -25,7 +25,7 @@ Visit the [website](http://mjmlio.github.io/mjml-app/) to download the version t
 yarn
 
 # build for your platform
-yarn package
+yarn dist
 
 # the binary can be found in the release/ folder
 ```
@@ -37,4 +37,4 @@ yarn package
 yarn dev
 ```
 
-For contributing, make sure that your commit passes the `yarn lint` command :smile:.
+For contributing, make sure that your commit passes the `yarn lint` and `yarn prettier` command :smile:.