From: gustavo Date: Wed, 11 Nov 2015 23:40:57 +0000 (+0100) Subject: update dependencies X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=cefa5cb1d77f5a8b6f43c010bcb80fb037c61a6e;p=JavaScriptForFun update dependencies --- diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json index fab94eb..572f8bf 100644 --- a/angularjs/showcase/bower.json +++ b/angularjs/showcase/bower.json @@ -18,16 +18,16 @@ "dependencies": { "bootstrap": "~4.0.0-alpha", "font-awesome": "~4.4.0", - "oclazyload": "~1.0.6", + "oclazyload": "~1.0.8", "angular-animate": "~1.4.7", - "angular-bootstrap": "~0.14.0", + "angular-bootstrap": "~0.14.3", "angular-translate": "~2.8.1", "angular-ui-router": "~0.2.15", "angular": "~1.4.7" }, "devDependencies": { "angular-mocks": "~1.4.7", - "marked": "~0.3.4" + "marked": "~0.3.5" }, "overrides": { "bootstrap": { diff --git a/gulp/gulp-my-tasks/package.json b/gulp/gulp-my-tasks/package.json index 75f33cd..e76424a 100644 --- a/gulp/gulp-my-tasks/package.json +++ b/gulp/gulp-my-tasks/package.json @@ -24,9 +24,9 @@ "gulp-htmlhint": "~0.3.0", "gulp-if": "~2.0.0", "gulp-inject": "~3.0.0", - "gulp-jscs": "~3.0.1", - "gulp-jshint": "~1.11.2", - "gulp-load-plugins": "~1.0.0-rc.1", + "gulp-jscs": "~3.0.2", + "gulp-jshint": "~1.12.0", + "gulp-load-plugins": "~1.1.0", "gulp-minify-css": "~1.2.1", "gulp-minify-html": "~1.0.4", "gulp-ng-annotate": "~1.1.0", @@ -37,22 +37,22 @@ "gulp-rev": "~6.0.1", "gulp-rev-replace": "~0.4.2", "gulp-task-listing": "~1.0.1", - "gulp-uglify": "~1.4.1", - "gulp-useref": "~1.3.0", - "gulp-util": "~3.0.6", + "gulp-uglify": "~1.4.2", + "gulp-useref": "~3.0.0", + "gulp-util": "~3.0.7", "gulp-watch": "~4.3.5", "jasmine-core": "~2.3.4", "jshint-stylish": "~2.0.1", - "karma": "~0.13.10", - "karma-coverage": "~0.5.2", + "karma": "~0.13.15", + "karma-coverage": "~0.5.3", "karma-jasmine": "~0.3.6", - "karma-junit-reporter": "~0.3.7", + "karma-junit-reporter": "~0.3.8", "karma-phantomjs-launcher": "~0.2.1", "morgan": "~1.6.1", "phantomjs": "~1.9.18", "serve-favicon": "~2.3.0", "wiredep": "~3.0.0-beta", - "yargs": "~3.27.0" + "yargs": "~3.29.0" }, "devDependencies": { "gulp": "~3.9.0" diff --git a/gulp/gulp-my-tasks/tasks/tasks.js b/gulp/gulp-my-tasks/tasks/tasks.js index ef422af..82a99d8 100644 --- a/gulp/gulp-my-tasks/tasks/tasks.js +++ b/gulp/gulp-my-tasks/tasks/tasks.js @@ -191,7 +191,7 @@ module.exports = function(gulp, customConfig) { log('*** Building application for production - Optimizing assets - HTML,CSS,JS ***'); - var assets = plugins.useref.assets({searchPath: './'}); + var assets = plugins.useref({searchPath: './'}); // Filters are named for the gulp-useref path var cssFilter = plugins.filter('**/*.css', {restore: true}); var jsAppFilter = plugins.filter('**/app.min.js', {restore: true}); @@ -255,10 +255,6 @@ module.exports = function(gulp, customConfig) { // Take inventory of the file names for future rev numbers .pipe(plugins.rev()) - // Apply the concat and file replacement with useref - .pipe(assets.restore()) - .pipe(plugins.useref()) - // Replace the file names in the html with rev numbers .pipe(plugins.revReplace())