use new toolchain

felixhammerl · felixhammerl · commit 79718f975841 · 2017-12-29T21:12:23.000+01:00
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["env"]
+}
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+max_line_length = null
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,10 @@
 node_modules/
 npm-debug.log
-.DS_Store
+.DS_Store
+package-lock.json
+
+# VIM Swap Files
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
diff --git a/.jshintrc b/.jshintrc
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-  - 4.1
-before_install:
-  - npm install -g grunt-cli
+  - lts/*
 notifications:
   email:
     recipients:
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run ES6 Tests",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "stopOnEntry": false,
+      "args": [
+        "./src/*-unit.js",
+        "--require", "babel-register", "testutils.js",
+        "--reporter", "spec",
+        "--no-timeouts"
+      ],
+      "runtimeArgs": [
+          "--nolazy"
+      ],
+      "sourceMaps": true
+  }
+  ]
+}
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emailjs-mime-builder",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "homepage": "https://github.com/emailjs/emailjs-mime-builder",
   "description": "emailjs-mime-builder is a low level rfc2822 message composer. Define your own mime tree, no magic included.",
   "author": "Andris Reinman <andris@kreata.ee>",
@@ -10,30 +10,44 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "grunt"
+    "build": "./scripts/build.sh",
+    "release": "./scripts/release.sh",
+    "lint": "$(npm bin)/standard",
+    "test": "npm run lint && npm run unit",
+    "unit": "$(npm bin)/mocha './src/*-unit.js' --reporter spec --require babel-register testutils.js"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/emailjs/emailjs-mime-builder.git"
   },
-  "main": "src/emailjs-mime-builder",
+  "main": "dist/builder",
   "dependencies": {
-    "emailjs-addressparser": "^1.0.1",
-    "emailjs-mime-codec": "^1.0.1",
+    "emailjs-addressparser": "^2.0.2",
+    "emailjs-mime-codec": "^2.0.3",
     "emailjs-mime-types": "^1.0.0",
-    "punycode": "^1.4.0"
+    "punycode": "^2.1.0"
   },
   "devDependencies": {
-    "amdefine": "^1.0.0",
-    "chai": "^3.4.1",
-    "grunt": "^0.4.5",
-    "grunt-contrib-connect": "^0.11.2",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-mocha-phantomjs": "^2.0.1",
-    "grunt-mocha-test": "^0.12.7",
-    "mocha": "^2.3.4",
-    "phantomjs": "^1.9.19",
-    "requirejs": "^2.1.22",
-    "sinon": "^1.17.2"
+    "babel-cli": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-register": "^6.26.0",
+    "chai": "^4.1.2",
+    "mocha": "^4.0.1",
+    "pre-commit": "^1.2.2",
+    "standard": "^10.0.3"
+  },
+  "standard": {
+    "globals": [
+      "describe",
+      "it",
+      "before",
+      "beforeAll",
+      "afterAll",
+      "after",
+      "expect"
+    ],
+    "ignore": [
+      "dist"
+    ]
   }
 }
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -rf $PWD/dist
+babel src --out-dir dist --ignore '**/*-unit.js' --source-maps inline
+git reset
+git add $PWD/dist
+git commit -m 'Updating dist files' -n
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+json_value() {
+  KEY=$1
+  num=$2
+  awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'$KEY'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p
+}
+
+# read version from package.json and trim leading/trailing whitespace
+version=`less package.json | json_value version 1 | sed -e 's/^ *//' -e 's/ *$//'`
+prefix="v"
+# tag, push, publish
+echo -e "\n> tagging $prefix$version"
+git tag "$prefix$version"
+echo -e "\n> pushing commits to origin"
+git push
+echo -e "\n> pushing tags to origin"
+git push --tags
+echo -e "\n> publishing on npm"
+npm publish
diff --git a/testutils.js b/testutils.js
@@ -0,0 +1,3 @@
+import { expect } from 'chai'
+
+global.expect = expect

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { expect } from 'chai'`
	`2`	`+`
	`3`	`+global.expect = expect`