Skip to content

Commit

Permalink
Merge pull request #158 from jakemmarsh/upgrade-angular
Browse files Browse the repository at this point in the history
Angular 1.5, bump dependencies
jakemmarsh committed Feb 29, 2016
2 parents 69cc3c0 + 29f74ea commit ffdd80e
Showing 3 changed files with 13 additions and 11 deletions.
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angularjs-gulp-browserify-boilerplate",
"version": "1.4.0",
"version": "1.5.0",
"author": "Jake Marsh <[email protected]>",
"description": "Boilerplate using AngularJS, SASS, Gulp, and Browserify while also utilizing best practices.",
"repository": {
@@ -23,16 +23,17 @@
"node": "~4.2.x"
},
"devDependencies": {
"angular": "^1.3.15",
"angular": "^1.5.0",
"angular-mocks": "^1.3.15",
"angular-ui-router": "^0.2.13",
"babel-core": "^6.3.26",
"babel-preset-es2015": "^6.3.13",
"babel-register": "^6.5.2",
"babelify": "^7.2.0",
"brfs": "^1.2.0",
"browser-sync": "^2.7.6",
"browserify": "^12.0.0",
"browserify-istanbul": "^0.2.1",
"browserify": "^13.0.0",
"browserify-istanbul": "^1.0.0",
"browserify-ngannotate": "^2.0.0",
"bulk-require": "^0.2.1",
"bulkify": "^1.1.1",
@@ -46,7 +47,7 @@
"gulp-gzip": "^1.2.0",
"gulp-if": "^2.0.0",
"gulp-imagemin": "^2.4.0",
"gulp-jshint": "^1.8.3",
"gulp-jshint": "^2.0.0",
"gulp-notify": "^2.0.0",
"gulp-protractor": "^2.1.0",
"gulp-rename": "^1.2.0",
@@ -57,9 +58,10 @@
"gulp-util": "^3.0.1",
"imagemin-pngcrush": "^4.1.0",
"isparta": "^4.0.0",
"jshint": "^2.9.1",
"jshint-stylish": "^2.1.0",
"karma": "^0.13.19",
"karma-browserify": "^4.4.0",
"karma": "^0.13.21",
"karma-browserify": "^5.0.2",
"karma-chrome-launcher": "^0.2.1",
"karma-coverage": "douglasduteil/karma-coverage#next",
"karma-firefox-launcher": "^0.1.3",
@@ -69,11 +71,11 @@
"pretty-hrtime": "^1.0.1",
"protractor": "^3.0.0",
"run-sequence": "^1.1.5",
"tiny-lr": "0.0.9",
"tiny-lr": "^0.2.1",
"uglifyify": "^3.0.1",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.4.0"
"watchify": "^3.7.0"
},
"scripts": {
"test": "./node_modules/.bin/gulp test",
2 changes: 1 addition & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -74,6 +74,6 @@ const ciAdditions = {
};

module.exports = function(config) {
const isCI = process.env.CI && process.env.TRAVIS_PULL_REQUEST;
const isCI = process.env.CI && Boolean(process.env.TRAVIS_PULL_REQUEST);
config.set(isCI ? Object.assign(karmaBaseConfig, ciAdditions) : karmaBaseConfig);
};
2 changes: 1 addition & 1 deletion test/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('babel-core/register');
require('babel-register');

const gulpConfig = require('../gulp/config').default;

0 comments on commit ffdd80e

Please sign in to comment.