Merge pull request #628 from pshevtsov/super-annotations-xOptView

[dygraphs.git] / package.json

diff --git a/package.json b/package.json
index de85acc..cbe5638 100644 (file)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "dygraphs",
   "version": "1.1.0",
   "description": "dygraphs is a fast, flexible open source JavaScript charting library.",
-  "main": "dygraph.js",
+  "main": "dygraph-combined-dev.js",
   "directories": {
     "doc": "docs",
     "test": "tests"
@@ -43,6 +43,7 @@
     "karma-chai-plugins": "^0.2.4",
     "karma-chrome-launcher": "^0.1.7",
     "karma-coverage": "^0.2.7",
+    "karma-firefox-launcher": "^0.1.4",
     "karma-mocha": "^0.1.10",
     "karma-mocha-reporter": "^1.0.2",
     "karma-phantomjs-launcher": "^0.1.4",
@@ -52,10 +53,15 @@
     "obvious-closure-library": "^20140401.0.2",
     "parse-data-uri": "^0.2.0",
     "phantomjs": "^1.9.7-8",
+    "pre-commit": "^1.0.6",
     "source-map": "^0.4.2",
     "uglify-js": "^2"
   },
   "scripts": {
-    "test": "make test"
-  }
+    "test": "make test",
+    "tests-ok": "./scripts/check-no-only.sh"
+  },
+  "pre-commit": [
+    "tests-ok"
+  ]
 }