Skip to content

Commit

Permalink
Updated package dependencies; Updated Travis CI NodeJS targets; Writi…
Browse files Browse the repository at this point in the history
…ng eslint.xml on build
  • Loading branch information
nicjansma committed Dec 15, 2016
1 parent 9217aa8 commit b5443f6
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: node_js
node_js:
- "6.0"
- "5.0"
- "4.0"
- "0.12"
- "0.11"
- "0.10"
- "node"
- "6"
- "5"
- "4"
before_install: npm install -g gulp
script: gulp travis
15 changes: 11 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var uglify = require("gulp-uglify");
var mocha = require("gulp-spawn-mocha");
var rename = require("gulp-rename");
var karma = require("karma").server;
var Server = require("karma").Server;
var path = require("path");
var bower = require("gulp-bower");
var mergeJson = require("gulp-merge-json");
Expand All @@ -37,6 +37,13 @@
.pipe(eslint.format());
});

gulp.task("lint:build", function() {
return gulp.src(["*.js", "src/*.js", "test/*.js"])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.format("checkstyle", fs.createWriteStream("eslint.xml")));
});

gulp.task("merge-json", function(cb) {
return es.merge(
gulp.src("data/headers.json")
Expand Down Expand Up @@ -92,14 +99,14 @@
});

gulp.task("karma", ["bower", "mocha", "mocha-tap", "dist", "compress"], function(done) {
return karma.start({
new Server({
configFile: path.join(__dirname, "karma.config.js"),
singleRun: true
}, done);
}, done).start();
});

gulp.task("all", ["default"]);
gulp.task("test", ["mocha", "mocha-tap", "karma"]);
gulp.task("default", ["bower", "lint", "merge-json", "dist", "compress", "test"]);
gulp.task("default", ["bower", "lint", "lint:build", "merge-json", "dist", "compress", "test"]);
gulp.task("travis", ["default"]);
}());
35 changes: 15 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,25 @@
},
"homepage": "https://github.com/nicjansma/cdn-detector.js/",
"devDependencies": {
"chai": "^3.4.1",
"chai": "^3.5.0",
"event-stream": "^3.3.4",
"gulp": "^3.8.10",
"gulp-bower": "0.0.11",
"gulp-debug": "^2.1.2",
"gulp-eslint": "^2.0.0",
"gulp": "^3.9.1",
"gulp-bower": "0.0.13",
"gulp-debug": "^3.0.0",
"gulp-eslint": "^3.0.1",
"gulp-merge-json": "^0.6.0",
"gulp-rename": "^1.2.0",
"gulp-spawn-mocha": "^2.2.1",
"gulp-uglify": "^1.0.1",
"karma": "^0.12.31",
"gulp-rename": "^1.2.2",
"gulp-spawn-mocha": "^3.1.0",
"gulp-uglify": "^2.0.0",
"karma": "^1.3.0",
"karma-chai": "*",
"karma-chrome-launcher": "^0.1.5",
"karma-coverage": "^0.2.6",
"karma-firefox-launcher": "^0.1.4",
"karma-ie-launcher": "^0.1.5",
"karma-mocha": "^0.1.9",
"karma-opera-launcher": "^0.1.0",
"karma-phantomjs-launcher": "^0.1.4",
"karma-safari-launcher": "^0.1.1",
"karma-tap-reporter": "0.0.3",
"mocha": "^2.0.1"
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-tap-reporter": "0.0.6",
"mocha": "^3.2.0"
},
"dependencies": {
"gulp-concat": "^2.6.0"
"gulp-concat": "^2.6.1"
}
}

0 comments on commit b5443f6

Please sign in to comment.