From 1057b35bb29ec179279e18960f8b47731f0fe35e Mon Sep 17 00:00:00 2001 From: Graeme Yeates Date: Sat, 15 Oct 2016 12:16:39 -0400 Subject: Add babel-cli as a dev dep No longer have to install it to run make :) --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 67f323c..2e95d5a 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "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", -- cgit v1.2.1 From 13f122a563eddd2f06307b5dcb5724e526ef16fe Mon Sep 17 00:00:00 2001 From: Graeme Yeates Date: Sat, 15 Oct 2016 12:32:33 -0400 Subject: Update various dev dependencies --- package.json | 35 ++++++++++++++++++----------------- support/build/aggregate-build.js | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 2e95d5a..85c8776 100644 --- a/package.json +++ b/package.json @@ -24,39 +24,40 @@ "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": "^3.8.0", "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", + "nyc": "^8.3.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": { @@ -67,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({ -- cgit v1.2.1 From 569b552b61cb58f4b59014c5dea828958f3752b7 Mon Sep 17 00:00:00 2001 From: Graeme Yeates Date: Sat, 15 Oct 2016 12:32:55 -0400 Subject: Test firefox and building bundles in travis fix travis testing of firefox Revert to eslint@2.0 --- .travis.yml | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9feb56a..6cdb549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ node_js: - "0.12" - "4" - "6" +addons: + firefox: "49.0" sudo: false after_success: npm run coveralls @@ -12,3 +14,10 @@ after_success: npm run coveralls before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + +script: + # ensure buildable + - make + - npm test + # test in firefox + - npm run mocha-browser-test \ No newline at end of file diff --git a/package.json b/package.json index 85c8776..0341ac8 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "cheerio": "^0.22.0", "coveralls": "^2.11.2", "es6-promise": "^2.3.0", - "eslint": "^3.8.0", + "eslint": "^2.13.1", "fs-extra": "^0.26.7", "gh-pages-deploy": "^0.4.2", "jsdoc": "^3.4.0", -- cgit v1.2.1 From 46a83a2c828f55ee2c5c54096d352f730fbcd13b Mon Sep 17 00:00:00 2001 From: Graeme Yeates Date: Sat, 15 Oct 2016 21:55:16 -0400 Subject: Tweak travis config Revert nyc upgrade --- .travis.yml | 21 ++++++++++++++------- package.json | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cdb549..ff46739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,19 @@ +sudo: false language: node_js node_js: - "0.10" - "0.12" - "4" - - "6" -addons: - firefox: "49.0" -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 @@ -16,8 +23,8 @@ before_script: - sh -e /etc/init.d/xvfb start script: - # ensure buildable - - make - npm test + # ensure buildable + - "[ $MAKE_TEST == false ] || make" # test in firefox - - npm run mocha-browser-test \ No newline at end of file + - "[ $BROWSER == false ] || npm run mocha-browser-test" \ No newline at end of file diff --git a/package.json b/package.json index 0341ac8..e00e034 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "karma-mocha-reporter": "^2.2.0", "mocha": "^3.1.2", "native-promise-only": "^0.8.0-a", - "nyc": "^8.3.0", + "nyc": "^7.0.0", "recursive-readdir": "^1.3.0", "rimraf": "^2.5.0", "rollup": "^0.36.3", -- cgit v1.2.1