Fix Gulp

Author: ehmicky

gulp/files.json

@@ -1,15 +1,27 @@
 {
-  "JAVASCRIPT": [
+  "CHECK": [
     "{index,custom,gulpfile}.js",
-    "src/*.js",
-    "src/**/*.js",
-    "gulp/*.js",
-    "gulp/**/*.js",
-    "test/*.js",
-    "test/**/*.js",
-    "examples/*.js",
-    "examples/**/*.js"
+    "{src,gulp,test,examples}/*.js",
+    "{src,gulp,test,examples}/**/*.js",
+    "*.md"
   ],
-  "TRANSPILED": ["src", "test", "helpers"],
-  "MARKDOWN": ["*.md"]
+  "UNIT": ["{index,custom}.js", "src", "test"],
+  "TEST": [
+    "{index,custom,gulpfile}.js",
+    "src",
+    "gulp",
+    "test",
+    "examples",
+    "*.md"
+  ],
+  "BUILD": ["src", "test", "helpers"],
+  "DEV": [
+    "{index,custom,gulpfile}.js",
+    "src",
+    "gulp",
+    "test",
+    "helpers",
+    "examples",
+    "*.md"
+  ]
 }

gulp/tasks/build.js

@@ -3,11 +3,11 @@
 const { series } = require('gulp')
 
 const { getWatchTask } = require('../utils')
-const { TRANSPILED } = require('../files')
+const FILES = require('../files')
 const gulpExeca = require('../exec')
 
 const babel = function() {
-  const promises = TRANSPILED.map(dir =>
+  const promises = FILES.BUILD.map(dir =>
     gulpExeca(
       `babel ${dir} --out-dir dist/${dir} --copy-files --delete-dir-on-start --source-maps --no-comments --minified --retain-lines`,
     ),
@@ -20,7 +20,7 @@ const build = series(babel)
 // eslint-disable-next-line fp/no-mutation
 build.description = 'Build source files'
 
-const buildwatch = getWatchTask({ TRANSPILED: build }, build)
+const buildwatch = getWatchTask({ BUILD: build }, build)
 
 // eslint-disable-next-line fp/no-mutation
 buildwatch.description = 'Build source files in watch mode'

gulp/tasks/check.js

@@ -7,26 +7,24 @@ const FILES = require('../files')
 const { getWatchTask } = require('../utils')
 const gulpExeca = require('../exec')
 
-const format = function() {
-  const files = [...FILES.JAVASCRIPT].join(' ')
-  return gulpExeca(`prettier --write --loglevel warn ${files}`)
-}
+const format = () =>
+  gulpExeca(`prettier --write --loglevel warn ${FILES.CHECK.join(' ')}`)
 
 // We do not use `gulp-eslint` because it does not support --cache
-const eslint = function() {
-  const files = [...FILES.JAVASCRIPT, ...FILES.MARKDOWN].join(' ')
-  return gulpExeca(
-    `eslint ${files} --ignore-path .gitignore --fix --cache --format codeframe --max-warnings 0 --report-unused-disable-directives`,
+const eslint = () =>
+  gulpExeca(
+    `eslint ${FILES.CHECK.join(
+      ' ',
+    )} --ignore-path .gitignore --fix --cache --format codeframe --max-warnings 0 --report-unused-disable-directives`,
   )
-}
 
 const lint = series(format, eslint)
 
 // eslint-disable-next-line fp/no-mutation
 lint.description = 'Lint source files'
 
-const dup = function() {
-  return src([...FILES.JAVASCRIPT, ...FILES.MARKDOWN]).pipe(
+const dup = () =>
+  src(FILES.CHECK).pipe(
     jscpd({
       verbose: true,
       blame: true,
@@ -35,7 +33,6 @@ const dup = function() {
       'skip-comments': true,
     }),
   )
-}
 
 // eslint-disable-next-line fp/no-mutation
 dup.description = 'Check for code duplication'
@@ -45,10 +42,7 @@ const check = parallel(lint, dup)
 // eslint-disable-next-line fp/no-mutation
 check.description = 'Lint and check for code duplication'
 
-const checkwatch = getWatchTask(
-  { JAVASCRIPT: [lint, dup], MARKDOWN: [lint, dup] },
-  check,
-)
+const checkwatch = getWatchTask({ CHECK: check }, check)
 
 // eslint-disable-next-line fp/no-mutation
 checkwatch.description = 'Lint and test the application in watch mode'

gulp/tasks/main.js

@@ -1,11 +1,15 @@
 'use strict'
 
-const { parallel } = require('gulp')
+const { series } = require('gulp')
 
-const { testwatch } = require('./test')
-const { buildwatch } = require('./build')
+const { getWatchTask } = require('../utils')
 
-const dev = parallel(testwatch, buildwatch)
+const { test } = require('./test')
+const { build } = require('./build')
+
+const devTask = series(build, test)
+
+const dev = getWatchTask({ DEV: devTask }, devTask)
 
 // eslint-disable-next-line fp/no-mutation
 dev.description = 'Lint, test and build source files'

gulp/tasks/test.js

@@ -1,16 +1,18 @@
 'use strict'
 
-const { series, parallel } = require('gulp')
+const { series } = require('gulp')
 
-const { check, checkwatch } = require('./check')
-const { unit, unitwatch } = require('./unit')
+const { getWatchTask } = require('../utils')
+
+const { check } = require('./check')
+const { unit } = require('./unit')
 
 const testTask = series(check, unit)
 
 // eslint-disable-next-line fp/no-mutation
 testTask.description = 'Lint and test source files'
 
-const testwatch = parallel(checkwatch, unitwatch)
+const testwatch = getWatchTask({ TEST: testTask }, testTask)
 
 // eslint-disable-next-line fp/no-mutation
 testwatch.description = 'Lint and test source files in watch mode'

gulp/tasks/unit.js

@@ -5,6 +5,7 @@ const { promisify } = require('util')
 
 const { load: loadYaml } = require('js-yaml')
 
+const { getWatchTask } = require('../utils')
 const gulpExeca = require('../exec')
 
 const TRAVIS_CONFIG = `${__dirname}/../../.travis.yml`
@@ -15,7 +16,7 @@ const unit = () => gulpExeca('ava')
 unit.description = 'Run unit tests'
 
 // We have to use this to debug Ava test files with Chrome devtools
-const unitwatch = () => gulpExeca('ndb ava -w')
+const unitwatch = getWatchTask({ UNIT: unit }, unit)
 
 // eslint-disable-next-line fp/no-mutation
 unitwatch.description = 'Run unit tests in watch mode'
@@ -43,7 +44,7 @@ const getNodeVersions = async function() {
 const NVM_PATH = '~/.nvm/nvm.sh'
 
 // eslint-disable-next-line fp/no-mutation
-unit.description = 'Run unit tests on all supported Node.js versions'
+unitfull.description = 'Run unit tests on all supported Node.js versions'
 
 module.exports = {
   unit,