Merge branch 'master' into 0.7.0

acquia · Aug 3, 2016 · 1e4721f · 1e4721f
2 parents 82031f0 + aa62af2
commit 1e4721f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,4 @@
+node_modules
+coverage
+.nyc_output
+test/server/js/waterwheel.js
diff --git a/package.json b/package.json
@@ -16,8 +16,7 @@
     "build": "webpack --progress",
     "test": "nyc --reporter=html ava -v && nyc report",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "lint": "eslint .",
-    "postinstall": "npm run build"
+    "lint": "eslint ."
   },
   "keywords": [
     "drupal",