Skip to content

Commit

Permalink
Merge pull request #7 from tyler-johnson/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
tyler-johnson authored Aug 29, 2017
2 parents cc6aee7 + eeba813 commit 3b1de9b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 20 deletions.
14 changes: 4 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
sudo: false
language: node_js
addons:
apt:
packages:
- xvfb
cache:
directories:
- node_modules
notifications:
email: false
node_js:
- '6'
- '7'
before_install:
- npm i -g npm@latest
install:
- "export DISPLAY=':99.0'"
- 'Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &'
- npm install
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
before_script:
- npm run lint
script:
Expand Down
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,21 @@
"devDependencies": {
"autorelease": "^1.6.0",
"autorelease-github": "^1.1.1",
"autorelease-travis": "^1.2.1",
"autorelease-travis": "^1.3.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.1",
"babel-plugin-transform-object-rest-spread": "^6.6.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-es2015-rollup": "^3.0.0",
"browserify": "^14.1.0",
"eslint": "^3.0.0",
"npm-run-all": "^4.0.2",
"rollup": "^0.41.6",
"rollup-plugin-babel": "^2.4.0",
"rollup-plugin-json": "^2.0.0",
"eslint": "^4.5.0",
"lodash": "^4.17.4",
"npm-run-all": "^4.1.1",
"rollup": "^0.49.2",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-json": "^2.3.0",
"shx": "^0.2.2",
"tape": "^4.5.1",
"tape-run": "^3.0.0",
"uglify-js": "^2.6.2"
"tape": "^4.8.0",
"tape-run": "^3.0.0"
},
"keywords": [],
"license": "MIT",
Expand Down

0 comments on commit 3b1de9b

Please sign in to comment.