From 4c0cbe147ba978df32136c8d44778b8adeca8823 Mon Sep 17 00:00:00 2001 From: Robin Whittleton Date: Fri, 16 Dec 2016 10:50:01 +0000 Subject: [PATCH 1/3] Bump standard to current version And fix reported issues: just spacing. --- gulp/clean.js | 4 ++-- gulp/nodemon.js | 4 ++-- gulp/sass.js | 12 ++++++------ gulp/watch.js | 2 +- package.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gulp/clean.js b/gulp/clean.js index 0c31a7ca83..4cda27777d 100644 --- a/gulp/clean.js +++ b/gulp/clean.js @@ -12,7 +12,7 @@ var clean = require('gulp-clean') gulp.task('clean', function () { return gulp.src([config.paths.public + '/*', - config.paths.govukModules + '/*', - '.port.tmp'], {read: false}) + config.paths.govukModules + '/*', + '.port.tmp'], {read: false}) .pipe(clean()) }) diff --git a/gulp/nodemon.js b/gulp/nodemon.js index 23f6d744ba..d94c3bb38c 100644 --- a/gulp/nodemon.js +++ b/gulp/nodemon.js @@ -15,8 +15,8 @@ gulp.task('server', function () { script: 'server.js', ext: 'js, json', ignore: [config.paths.public + '*', - config.paths.assets + '*', - config.paths.nodeModules + '*'] + config.paths.assets + '*', + config.paths.nodeModules + '*'] }).on('quit', function () { // remove .port.tmp if it exists try { diff --git a/gulp/sass.js b/gulp/sass.js index 07e7f84f43..6fd9da6078 100644 --- a/gulp/sass.js +++ b/gulp/sass.js @@ -14,9 +14,9 @@ var config = require('./config.json') gulp.task('sass', function () { return gulp.src(config.paths.assets + '/sass/*.scss') .pipe(sass({outputStyle: 'expanded', - includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets', - 'govuk_modules/govuk_template/assets/stylesheets', - 'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError)) + includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets', + 'govuk_modules/govuk_template/assets/stylesheets', + 'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError)) .pipe(sourcemaps.init()) .pipe(sourcemaps.write()) .pipe(gulp.dest(config.paths.public + '/stylesheets/')) @@ -25,9 +25,9 @@ gulp.task('sass', function () { gulp.task('sass-documentation', function () { return gulp.src(config.paths.docsAssets + '/sass/*.scss') .pipe(sass({outputStyle: 'expanded', - includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets', - 'govuk_modules/govuk_template/assets/stylesheets', - 'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError)) + includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets', + 'govuk_modules/govuk_template/assets/stylesheets', + 'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError)) .pipe(sourcemaps.init()) .pipe(sourcemaps.write()) .pipe(gulp.dest(config.paths.public + '/stylesheets/')) diff --git a/gulp/watch.js b/gulp/watch.js index 3d469cb628..2a9d405d0c 100644 --- a/gulp/watch.js +++ b/gulp/watch.js @@ -13,5 +13,5 @@ gulp.task('watch-sass', function () { gulp.task('watch-assets', function () { return gulp.watch([config.paths.assets + 'images/**', - config.paths.assets + 'javascripts/**'], {cwd: './'}, ['copy-assets']) + config.paths.assets + 'javascripts/**'], {cwd: './'}, ['copy-assets']) }) diff --git a/package.json b/package.json index 7e83ea80aa..bd5a34de6d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "require-dir": "^0.3.0", "run-sequence": "^1.2.2", "serve-favicon": "2.3.0", - "standard": "^7.1.2", + "standard": "^8.6.0", "supertest": "^2.0.0", "sync-request": "^3.0.1" } From 47adf8a3729d28de45137f97c48d1c3f54d66a24 Mon Sep 17 00:00:00 2001 From: Robin Whittleton Date: Fri, 16 Dec 2016 10:54:38 +0000 Subject: [PATCH 2/3] Bump toolkit and nunjucks to latest versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bd5a34de6d..196c3459d3 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "express-session": "^1.13.0", "express-writer": "0.0.4", "govuk-elements-sass": "2.2.1", - "govuk_frontend_toolkit": "^5.0.1", + "govuk_frontend_toolkit": "5.0.2", "govuk_template_jinja": "0.19.2", "gulp": "^3.9.1", "gulp-clean": "^0.3.2", @@ -34,7 +34,7 @@ "hogan.js": "3.0.2", "marked": "^0.3.6", "minimist": "0.0.8", - "nunjucks": "^2.4.2", + "nunjucks": "^2.5.2", "portscanner": "^1.0.0", "prompt": "^0.2.14", "readdir": "0.0.6", From 6685822f61dca603f983a026df8835f23600dc81 Mon Sep 17 00:00:00 2001 From: Robin Whittleton Date: Fri, 16 Dec 2016 11:36:48 +0000 Subject: [PATCH 3/3] Remove some unused packages - consolidate was added to help replace mu2 for mustache rendering - hogan.js was also in there for mustache rendering --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 196c3459d3..44853bd16f 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "basic-auth-connect": "^1.0.0", "body-parser": "^1.14.1", "browser-sync": "^2.11.1", - "consolidate": "0.x", "cross-spawn": "^5.0.0", "express": "4.13.3", "express-session": "^1.13.0", @@ -31,7 +30,6 @@ "gulp-sass": "^2.3.2", "gulp-sourcemaps": "^1.6.0", "gulp-util": "^3.0.7", - "hogan.js": "3.0.2", "marked": "^0.3.6", "minimist": "0.0.8", "nunjucks": "^2.5.2",