Merge pull request #1307 from caolan/update-dependencies

Update dependencies and travis testing

3 files changed, 38 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 9feb56a..ff46739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,19 @@
+sudo: false
 language: node_js
 node_js:
   - "0.10"
   - "0.12"
   - "4"
-  - "6"
-sudo: false
+
+matrix:
+  include:
+    - node_js: "6"
+      addons:
+        firefox: "49.0"
+      env: BROWSER=true MAKE_TEST=true
+env:
+  matrix: BROWSER=false MAKE_TEST=false
+
 after_success: npm run coveralls
 
 # Needed to run Karma with Firefox on Travis
@@ -12,3 +21,10 @@ after_success: npm run coveralls
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+
+script:
+  - npm test
+  # ensure buildable
+  - "[ $MAKE_TEST == false ] || make"
+  # test in firefox
+  - "[ $BROWSER == false ] || npm run mocha-browser-test"
\ No newline at end of file
diff --git a/package.json b/package.json
index 67f323c..e00e034 100644
--- a/package.json
+++ b/package.json
@@ -22,40 +22,42 @@
     "lodash-es": "^4.14.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.16.0",
     "babel-core": "^6.3.26",
-    "babel-plugin-add-module-exports": "~0.1.2",
-    "babel-plugin-istanbul": "^1.0.3",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-istanbul": "^2.0.1",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.3.16",
     "babel-preset-es2015": "^6.3.13",
     "babelify": "^7.2.0",
     "benchmark": "^2.1.1",
-    "bluebird": "^2.9.32",
+    "bluebird": "^3.4.6",
     "chai": "^3.1.0",
-    "cheerio": "^0.20.0",
+    "cheerio": "^0.22.0",
     "coveralls": "^2.11.2",
     "es6-promise": "^2.3.0",
-    "eslint": "^2.11.1",
+    "eslint": "^2.13.1",
     "fs-extra": "^0.26.7",
     "gh-pages-deploy": "^0.4.2",
     "jsdoc": "^3.4.0",
-    "karma": "^0.13.2",
-    "karma-browserify": "^4.2.1",
-    "karma-firefox-launcher": "^0.1.6",
-    "karma-mocha": "^0.2.0",
-    "karma-mocha-reporter": "^1.0.2",
-    "mocha": "^2.2.5",
+    "karma": "^1.3.0",
+    "karma-browserify": "^5.1.0",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-mocha": "^1.2.0",
+    "karma-mocha-reporter": "^2.2.0",
+    "mocha": "^3.1.2",
     "native-promise-only": "^0.8.0-a",
     "nyc": "^7.0.0",
     "recursive-readdir": "^1.3.0",
     "rimraf": "^2.5.0",
-    "rollup": "^0.25.0",
-    "rollup-plugin-node-resolve": "^1.5.0",
-    "rollup-plugin-npm": "~1.3.0",
+    "rollup": "^0.36.3",
+    "rollup-plugin-node-resolve": "^2.0.0",
+    "rollup-plugin-npm": "^2.0.0",
     "rsvp": "^3.0.18",
     "semver": "^4.3.6",
-    "uglify-js": "~2.4.0",
+    "uglify-js": "~2.7.3",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
+    "watchify": "^3.7.0",
     "yargs": "~3.9.1"
   },
   "scripts": {
@@ -66,7 +68,7 @@
     "mocha-browser-test": "karma start",
     "mocha-node-test": "mocha mocha_test/ --compilers js:babel-core/register",
     "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
-    "test": "npm run-script lint && npm run mocha-node-test"
+    "test": "npm run lint && npm run mocha-node-test"
   },
   "license": "MIT",
   "gh-pages-deploy": {
diff --git a/support/build/aggregate-build.js b/support/build/aggregate-build.js
index 61833b8..7269291 100644
--- a/support/build/aggregate-build.js
+++ b/support/build/aggregate-build.js
@@ -1,10 +1,10 @@
 import compileModules from './compile-modules';
-import rollup from 'rollup';
+import {rollup} from 'rollup';
 import rimraf from 'rimraf/rimraf';
 
 export default function buildBundle(options) {
     function bundle() {
-        rollup.rollup({
+        rollup({
             entry: options.outpath + '/index.js'
         }).then(function ( bundle ) {
             bundle.write({