Merge pull request #330 from alphagov/bump-fet

Bump toolkit and standard / nunjucks, and tidy package.json a bit
alphagov · Dec 16, 2016 · dc248f7 · dc248f7
2 parents ec0851a + 6685822
commit dc248f7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -16,13 +16,12 @@
     "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",
     "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",
@@ -31,17 +30,16 @@
     "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.4.2",
+    "nunjucks": "^2.5.2",
     "portscanner": "^1.0.0",
     "prompt": "^0.2.14",
     "readdir": "0.0.6",
     "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"
   }