From 0dfd60ad5e4d783db5ee6e65818e00212588af5c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Jan 2017 19:02:25 +0000
Subject: [PATCH] Merge compile target into build

---
 .eslintrc.js | 2 ++
 package.json | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 6cdd0229b..4d6b899a5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,5 +11,7 @@ module.exports = {
             ignoreComments: true,
         }],
         curly: ["error", "multi-line"],
+        "require-jsdoc": ["warn"],
+        "valid-jsdoc": ["warn"],
     }
 }
diff --git a/package.json b/package.json
index c0a603b0b..e923e31ba 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,8 @@
     "test": "istanbul cover --report cobertura --config .istanbul.yml -i \"lib/**/*.js\" jasmine-node -- spec --verbose --junitreport --captureExceptions",
     "check": "jasmine-node spec --verbose --junitreport --captureExceptions",
     "gendoc": "jsdoc -r lib -P package.json -R README.md -d .jsdoc",
-    "compile": "npm run lint && babel -s -d lib src",
     "start": "babel -s -w -d lib src",
-    "build": "npm run compile && rimraf dist && mkdir dist && browserify --exclude olm browser-index.js -o dist/browser-matrix.js --ignore-missing && uglifyjs -c -m -o dist/browser-matrix.min.js dist/browser-matrix.js",
+    "build": "npm run lint && babel -s -d lib src && rimraf dist && mkdir dist && browserify --exclude olm browser-index.js -o dist/browser-matrix.js --ignore-missing && uglifyjs -c -m -o dist/browser-matrix.min.js dist/browser-matrix.js",
     "dist": "npm run build",
     "watch": "watchify --exclude olm browser-index.js -o dist/browser-matrix-dev.js -v",
     "lint": "eslint src",