Merge branch 'master' into feature/d3_v4

.circleci/config.yml

@@ -17,13 +17,10 @@ jobs:
             echo "$(google-chrome --version)"
       - restore_cache:
           key: v1-npm-dependencies-{{ .Branch }}-{{ checksum "package.json" }}
-      - run:
+      - run: npm install
-          name: Install dependencies
-          command: npm install
       - save_cache:
           key: v1-npm-dependencies-{{ .Branch }}-{{ checksum "package.json" }}
           paths:
             - ./node_modules
-      - run:
+      - run: npm test
-          name: Run Tests
+      - run: npm run codecov
-          command: npm run test

.travis.yml

@@ -1,25 +0,0 @@
-language: node_js
-node_js:
-- 6
-dist: trusty
-sudo: false
-addons:
-  apt:
-    packages:
-      - google-chrome-stable
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start &
-  - sleep 3
-
-after_success:
-- npm run codecov
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/b90b361c0bc91a778bcc
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always

README.md

@@ -1,7 +1,6 @@
 # c3
 
-[![Build Status](https://travis-ci.org/c3js/c3.svg?branch=master)](https://travis-ci.org/c3js/c3)
+[![CircleCI](https://circleci.com/gh/c3js/c3.svg?style=svg)](https://circleci.com/gh/c3js/c3)
-[![devDependency Status](https://david-dm.org/c3js/c3/dev-status.svg)](https://david-dm.org/c3js/c3#info=devDependencies)
 [![license](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/c3js/c3/blob/master/LICENSE)
 [![codecov.io](https://codecov.io/github/c3js/c3/coverage.svg?branch=master)](https://codecov.io/github/c3js/c3?branch=master)
 [![Greenkeeper badge](https://badges.greenkeeper.io/c3js/c3.svg)](https://greenkeeper.io/)

package.json

@@ -46,7 +46,7 @@
     "babel-plugin-istanbul": "^4.1.4",
     "babel-preset-es2015": "^6.24.1",
     "babelify": "^7.3.0",
-    "browserify": "^14.4.0",
+    "browserify": "^15.0.0",
     "clean-css-cli": "^4.1.3",
     "codecov": "^3.0.0",
     "jasmine-core": "^2.3.4",
@@ -61,7 +61,7 @@
     "node-sass": "^4.5.3",
     "node-static": "^0.7.9",
     "nodemon": "^1.11.0",
-    "rollup": "^0.53.0",
+    "rollup": "^0.54.0",
     "rollup-plugin-babel": "^3.0.0",
     "uglify-js": "^3.0.15",
     "watchify": "^3.9.0"