From da38295969651dffd65a5617a518ca074304de6f Mon Sep 17 00:00:00 2001 From: Adam Fenwick Date: Fri, 12 Jul 2024 14:51:51 +0100 Subject: [PATCH 1/2] Enable logging when nodemon crashes --- gulpfile.js | 74 +++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6edce9a7..994bd189 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,54 +16,50 @@ const port = process.env.PORT || config.port; // Delete all the files in /public build directory function cleanPublic() { - return gulp.src('public', { allowEmpty: true}) - .pipe(clean()); + return gulp.src('public', { allowEmpty: true }).pipe(clean()); } sass.compiler = require('sass'); // Compile SASS to CSS function compileStyles() { - return gulp.src([ - 'app/assets/sass/**/*.scss', - 'docs/assets/sass/**/*.scss' - ]) + return gulp + .src(['app/assets/sass/**/*.scss', 'docs/assets/sass/**/*.scss']) .pipe(sass()) .pipe(gulp.dest('public/css')) .on('error', (err) => { - console.log(err) - process.exit(1) + console.log(err); + process.exit(1); }); } // Compile JavaScript (with ES6 support) function compileScripts() { - return gulp.src([ - 'app/assets/javascript/**/*.js', - 'docs/assets/javascript/**/*.js' - ]) - .pipe(babel()) - .pipe(gulp.dest('public/js')); + return gulp + .src(['app/assets/javascript/**/*.js', 'docs/assets/javascript/**/*.js']) + .pipe(babel()) + .pipe(gulp.dest('public/js')); } // Compile assets function compileAssets() { - return gulp.src([ - 'app/assets/**/**/*.*', - 'docs/assets/**/**/*.*', - '!**/assets/**/**/*.js', // Don't copy JS files - '!**/assets/**/**/*.scss', // Don't copy SCSS files - ]) - .pipe(gulp.dest('public')); + return gulp + .src([ + 'app/assets/**/**/*.*', + 'docs/assets/**/**/*.*', + '!**/assets/**/**/*.js', // Don't copy JS files + '!**/assets/**/**/*.scss', // Don't copy SCSS files + ]) + .pipe(gulp.dest('public')); } // Start nodemon function startNodemon(done) { const server = nodemon({ script: 'app.js', - stdout: false, + stdout: true, ext: 'js', - quiet: true, + quiet: false, }); let starting = false; @@ -90,18 +86,21 @@ function reload() { } // Start browsersync -function startBrowserSync(done){ - browserSync.init({ - proxy: 'localhost:' + port, - port: port + 1000, - ui: false, - files: ['app/views/**/*.*', 'docs/views/**/*.*'], - ghostmode: false, - open: false, - notify: true, - watch: true, - }, done); - gulp.watch("public/**/*.*").on("change", reload); +function startBrowserSync(done) { + browserSync.init( + { + proxy: 'localhost:' + port, + port: port + 1000, + ui: false, + files: ['app/views/**/*.*', 'docs/views/**/*.*'], + ghostmode: false, + open: false, + notify: true, + watch: true, + }, + done + ); + gulp.watch('public/**/*.*').on('change', reload); } // Watch for changes within assets/ @@ -119,5 +118,8 @@ exports.compileStyles = compileStyles; exports.compileScripts = compileScripts; exports.cleanPublic = cleanPublic; -gulp.task('build', gulp.series(cleanPublic, compileStyles, compileScripts, compileAssets)); +gulp.task( + 'build', + gulp.series(cleanPublic, compileStyles, compileScripts, compileAssets) +); gulp.task('default', gulp.series(startNodemon, startBrowserSync, watch)); From 23165851be8a994173639ec4b768707235c5e063 Mon Sep 17 00:00:00 2001 From: Adam Fenwick Date: Fri, 12 Jul 2024 14:56:07 +0100 Subject: [PATCH 2/2] Adding changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7099640b..820bb2e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # NHS.UK prototype kit Changelog +## 4.12.0 - Unreleased + +:wrench: + +- Enable console logging for nodemon + ## 4.11.0 - 27 June 2024 :wrench: **Fixes** @@ -21,7 +27,7 @@ - Add aria-labels to coronavirus hub page and mental health pagenavigation links - Removed the duplicate selector in '\_related-nav.scss' -- Removed Covid banner from 'Social care and support guide' and 'NHS Services' templates +- Removed Covid banner from 'Social care and support guide' and 'NHS Services' templates - Use 'String#startsWith' method instead of getting the index of a substring in utils.js - Change unexpected var for const in gulpfile.js - Update 'Social care and support guide' template to use primary cards with chevrons