From 06a9e565895b3b8c8bf66c8eff5a941e1b321b5f Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 6 Feb 2019 16:09:39 +0000
Subject: [PATCH 1/2] Ensure Gulp tasks run sequentially

So that images are always copied into place before trying to build the
SASS.
---
 gulpfile.babel.js | 31 ++++++++++++++++++-------------
 package.json      |  3 ++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 691564768..cc9ea9b6f 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -8,6 +8,7 @@
 import gulp from 'gulp';
 import loadPlugins from 'gulp-load-plugins';
 import stylish from 'jshint-stylish';
+import runSequence from 'run-sequence';
 
 const plugins = loadPlugins(),
 
@@ -156,19 +157,23 @@ gulp.task('lint',
 );
 
 // Default: compile everything
-gulp.task('default',
-  [
-    'copy:govuk_template:template',
-    'copy:govuk_template:images',
-    'copy:govuk_template:fonts',
-    'copy:govuk_template:css',
-    'copy:govuk_template:js',
-    'copy:govuk_template:error_page',
-    'images',
-    'javascripts',
-    'sass'
-  ]
-);
+gulp.task('default', function() {
+  runSequence(
+    [
+      'copy:govuk_template:template',
+      'copy:govuk_template:images',
+      'copy:govuk_template:fonts',
+      'copy:govuk_template:css',
+      'copy:govuk_template:js',
+      'images',
+    ],
+    [
+      'copy:govuk_template:error_page',
+      'javascripts',
+      'sass'
+    ]
+  );
+});
 
 // Optional: recompile on changes
 gulp.task('watch',
diff --git a/package.json b/package.json
index 799b49a0a..56d2c3589 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "gulp-prettyerror": "1.2.1",
     "gulp-sass-lint": "1.2.0",
     "jshint": "2.9.5",
-    "jshint-stylish": "2.2.1"
+    "jshint-stylish": "2.2.1",
+    "run-sequence": "^2.2.1"
   }
 }

From 0d3642148c294030b2931848a1855e3f32b96009 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 6 Feb 2019 16:16:28 +0000
Subject: [PATCH 2/2] Always pin to exact versions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56d2c3589..41b06c707 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,6 @@
     "gulp-sass-lint": "1.2.0",
     "jshint": "2.9.5",
     "jshint-stylish": "2.2.1",
-    "run-sequence": "^2.2.1"
+    "run-sequence": "2.2.1"
   }
 }