Skip to content

Commit

Permalink
Move lint task calls to watch task
Browse files Browse the repository at this point in the history
Helps reduce duplication in `gulpfile.mjs` once we start to move directory and file path configs over
  • Loading branch information
colinrotherham committed Mar 9, 2023
1 parent 08431a8 commit 62c7273
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
16 changes: 4 additions & 12 deletions gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ import { npmScriptTask } from './tasks/run.mjs'
* Runs JavaScript code quality checks, documentation, compilation
*/
gulp.task('scripts', gulp.series(
gulp.parallel(
npmScriptTask('lint:js'),
compileJavaScripts
),
compileJavaScripts,
npmScriptTask('build:jsdoc')
))

Expand All @@ -27,10 +24,7 @@ gulp.task('scripts', gulp.series(
* Runs Sass code quality checks, documentation, compilation
*/
gulp.task('styles', gulp.series(
gulp.parallel(
npmScriptTask('lint:scss'),
compileStylesheets
),
compileStylesheets,
npmScriptTask('build:sassdoc')
))

Expand All @@ -41,10 +35,8 @@ gulp.task('styles', gulp.series(
gulp.task('build:public', gulp.series(
clean,
copyAssets,
compileJavaScripts,
compileStylesheets,
npmScriptTask('build:jsdoc'),
npmScriptTask('build:sassdoc')
'scripts',
'styles'
))

/**
Expand Down
15 changes: 11 additions & 4 deletions tasks/gulp/watch.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import gulp from 'gulp'
import slash from 'slash'

import { paths } from '../../config/index.js'
import { npmScriptTask } from '../run.mjs'

/**
* Watch task
* During development, this task will:
* - run `gulp styles` when `.scss` files change
* - run `gulp scripts` when `.mjs` files change
* - lint and run `gulp styles` when `.scss` files change
* - lint and run `gulp scripts` when `.mjs` files change
*
* @returns {Promise<import('fs').FSWatcher[]>} Array from file system watcher objects
*/
Expand All @@ -18,12 +19,18 @@ export function watch () {
`${slash(paths.app)}/**/*.scss`,
`${slash(paths.src)}/govuk/**/*.scss`,
`!${slash(paths.src)}/govuk/vendor/*`
], gulp.series('styles')),
], gulp.parallel(
npmScriptTask('lint:scss'),
'styles'
)),

gulp.watch([
'jsdoc.config.js',
`${slash(paths.src)}/govuk/**/*.mjs`
], gulp.series('scripts'))
], gulp.parallel(
npmScriptTask('lint:js'),
'scripts'
))
])
}

Expand Down

0 comments on commit 62c7273

Please sign in to comment.