From f5be5731cb366647e7f424a1b97d071e534a4092 Mon Sep 17 00:00:00 2001 From: Parbhat Puri Date: Thu, 25 Aug 2016 16:07:17 +0530 Subject: [PATCH 1/3] fix: Gulpfile Issue #738 --- {{cookiecutter.project_slug}}/gulpfile.js | 9 +++++---- {{cookiecutter.project_slug}}/package.json | 15 +++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index e5b0df9d..73b71339 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -16,9 +16,10 @@ var gulp = require('gulp'), pixrem = require('gulp-pixrem'), uglify = require('gulp-uglify'), imagemin = require('gulp-imagemin'), - exec = require('gulp-exec'), + exec = require('child_process').exec, runSequence = require('run-sequence'), - browserSync = require('browser-sync'); + browserSync = require('browser-sync').create(), + reload = browserSync.reload; // Relative paths function @@ -100,8 +101,8 @@ gulp.task('default', function() { gulp.task('watch', ['default'], function() { gulp.watch(paths.sass + '/*.scss', ['styles']); - gulp.watch(paths.js + '/*.js', ['scripts']); + gulp.watch(paths.js + '/*.js', ['scripts']).on("change", reload); gulp.watch(paths.images + '/*', ['imgCompression']); - gulp.watch('templates/*.html'); + gulp.watch(paths.templates + '/**/*.html').on("change", reload); }); diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 2be4b50c..0c8af427 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -16,20 +16,19 @@ "pixrem": "~1.3.1", "time-grunt": "~1.2.1" {% elif cookiecutter.js_task_runner == 'Gulp' %} - "browser-sync": "^2.12.10", - "del": "^2.2.0", + "browser-sync": "^2.14.0", + "del": "^2.2.2", "gulp": "^3.9.1", - "gulp-autoprefixer": "^3.1.0", + "gulp-autoprefixer": "^3.1.1", "gulp-cssnano": "^2.1.2", - "gulp-exec": "^2.1.2", - "gulp-imagemin": "^3.0.1", + "gulp-imagemin": "^3.0.3", "gulp-pixrem": "^1.0.0", "gulp-plumber": "^1.1.0", "gulp-rename": "^1.2.2", - "gulp-sass": "^2.3.1", - "gulp-uglify": "^1.5.3", + "gulp-sass": "^2.3.2", + "gulp-uglify": "^2.0.0", "gulp-util": "^3.0.7", - "run-sequence": "^1.2.1" + "run-sequence": "^1.2.2" {% endif %} }, "engines": { From 36474c9d78f1a51214fd4a39cb1f252fb14c2aff Mon Sep 17 00:00:00 2001 From: Parbhat Puri Date: Thu, 25 Aug 2016 16:09:35 +0530 Subject: [PATCH 2/3] Correct order of postgresql version --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 665518fe..4932bb1d 100644 --- a/README.rst +++ b/README.rst @@ -127,10 +127,10 @@ Answer the prompts with your own desired options_. For example:: use_heroku [n]: y use_compressor [n]: y Select postgresql_version: - 1 - 9.2 - 2 - 9.3 - 3 - 9.4 - 4 - 9.5 + 1 - 9.5 + 2 - 9.4 + 3 - 9.3 + 4 - 9.2 Choose from 1, 2, 3, 4 [1]: 1 Select js_task_runner: 1 - Gulp From 6ce53bf6d8e99079fb481f5e84c78a41c7475b1a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 25 Aug 2016 06:43:43 -0700 Subject: [PATCH 3/3] Update opbeat from 3.3.4 to 3.4.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index a674e32c..d5ed4cba 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -35,5 +35,5 @@ raven==5.25.0 {% if cookiecutter.use_opbeat == "y" -%} # Opbeat agent for performance monitoring # ----------------------------------------- -opbeat==3.3.4 +opbeat==3.4.0 {%- endif %}