Merge branch 'release/1.2.0'

.circleci/config.yml

@@ -0,0 +1,60 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:10
+
+    working_directory: ~/mjml2html
+
+    environment:
+      PORT: 3001
+
+    steps:
+      - checkout
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+
+      - run:
+          name: Running API server
+          command: npm start
+          background: true
+
+      - run:
+          name: Wait for the API server
+          command: |
+            dockerize -wait tcp://127.0.0.1:3001 -timeout 1m
+            curl http://0.0.0.0:3001
+
+      - run:
+          name: Run tests
+          command: npm test
+
+  misc:
+    docker:
+      - image: circleci/node:10
+
+    working_directory: ~/mjml2html
+
+    steps:
+      - checkout
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+
+      - run:
+          name: Audit for vulnerabilities
+          command: npm audit
+
+      - run:
+          name: Lint files
+          command: npm run lint
+
+workflows:
+  version: 2
+  mjml2html:
+    jobs:
+      - misc
+      - build

.eslintrc.json

@@ -0,0 +1,7 @@
+{
+    "extends": "standard",
+    "plugins": ["jest"],
+    "env": {
+        "jest/globals": true
+    }
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.11.0
+FROM node:10
 
 WORKDIR /app
 

README.md

@@ -1,6 +1,12 @@
 # MJML2HTML
 
-Simple API to convert MJML content to HTML on the fly.
+![CircleCI](https://img.shields.io/circleci/project/github/chronotruck/mjml2html/master.svg)
+![Dependencies](https://img.shields.io/david/chronotruck/mjml2html.svg)
+![Dev Dependencies](https://img.shields.io/david/dev/chronotruck/mjml2html.svg)
+![Docker Pulls](https://img.shields.io/docker/pulls/chronotruck/mjml2html.svg)
+[![License](https://img.shields.io/github/license/chronotruck/mjml2html.svg)](https://github.com/chronotruck/mjml2html/blob/master/LICENSE)
+
+> Simple API to convert MJML content to HTML on the fly.
 
 ## Requirements
 

index.js

@@ -42,7 +42,7 @@ app.post('/', (req, res) => {
         minify,
         validationLevel
       })
-      
+
       res
         .type('html')
         .status(200)