X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=package.json;h=48b6534421463b7b9819c58433057e7e006a69ef;hb=0bc4cb546af5d1ce157ad701a45169cc07c9c839;hp=5ca91aa7aaaac3cbda81c54a1c2e86e7057b137b;hpb=4dbba4b17c6203b3c1493fd99dfcf12cb88103e7;p=dygraphs.git

diff --git a/package.json b/package.json
index 5ca91aa..48b6534 100644
--- 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-combined-dev.js",
+  "main": "dist/src/dygraph.js",
   "directories": {
     "doc": "docs",
     "test": "tests"
@@ -26,18 +26,22 @@
   },
   "homepage": "https://github.com/danvk/dygraphs",
   "devDependencies": {
+    "babel": "^5.8.23",
     "babel-core": "^5.8.25",
     "babelify": "^6.3.0",
     "browserify": "^11.2.0",
+    "browserify-header": "^0.9.2",
     "chai": "^3.3.0",
     "coveralls": "^2.11.2",
     "envify": "^3.4.0",
     "exorcist": "^0.4.0",
     "http-server": "^0.8.5",
+    "istanbul": "^0.4.0",
     "jshint": "^2.5.10",
     "lcov-parse": "0.0.9",
     "mocha": "^2.1.0",
-    "mocha-phantomjs": "^4.0.1",
+    "mocha-phantomjs": "3.5.3",
+    "mocha-phantomjs-istanbul": "0.0.2",
     "obvious-closure-library": "^20140401.0.2",
     "parse-data-uri": "^0.2.0",
     "phantomjs": "^1.9.7-8",
@@ -47,7 +51,11 @@
     "watchify": "^3.4.0"
   },
   "scripts": {
-    "test": "make test",
+    "build": "./scripts/build.sh",
+    "coverage": "./scripts/generate-coverage.sh",
+    "watch": "./scripts/watch.sh",
+    "build-tests": "./scripts/build-tests.sh",
+    "test": "./scripts/run-tests.sh",
     "tests-ok": "./scripts/check-no-only.sh"
   },
   "pre-commit": [