Improvements and fixes to watch tasks.

buildit · Oct 25, 2018 · 0100903 · 0100903
1 parent b3bc078
commit 0100903
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/gulp/patternlab.js b/gulp/patternlab.js
@@ -70,13 +70,13 @@ const preBuildTask = gulp.parallel(preSvgSymbolsTask, preSvgSymbolsInfoTask);
  * STYLEGUIDE CSS TASKS
 ******************************************************/
 
-function sassTask() {
+function plSassTask() {
   return gulp.src(pkgPaths.normalizePath(paths().source.root, 'sass', 'pattern-scaffolding.scss'))
     .pipe(sass(eyeglass(sass.sync().on('error', sass.logError))))
     .pipe(gulp.dest(pkgPaths.normalizePath(paths().public.css)))
 };
-sassTask.displayName = taskNamePrefix + 'sass';
-sassTask.description = 'Compiles pattern library CSS files from source SASS.';
+plSassTask.displayName = taskNamePrefix + 'sass';
+plSassTask.description = 'Compiles pattern library CSS files from source SASS.';
 
 
 /******************************************************
@@ -137,16 +137,14 @@ function plBuildSgTask() {
   return patternlab.build({
     watch: argv.watch,
     cleanPublic: config.cleanPublic
-  }).then(() => {
-    // do something else when this promise resolves
   });
 }
 plBuildSgTask.displayName = taskNamePrefix + 'sg:build';
 plBuildSgTask.description = 'Builds the styleguide';
 
 
 const plBuildTask = gulp.series(
-  gulp.parallel(sassTask, preBuildTask),
+  gulp.parallel(plSassTask, preBuildTask),
   plBuildSgTask
 );
 plBuildTask.displayName = taskNamePrefix + 'build';
@@ -160,8 +158,7 @@ plBuildTask.description = 'Compiles the patterns and frontend, outputting to con
 function plWatchSassTask() {
   gulp.watch(
     pkgPaths.normalizePath(paths().source.root, 'sass', '**', '*.scss'),
-    { awaitWriteFinish: true },
-    gulp.series(sassTask, patternlab.server.refreshCSS)
+    gulp.series(plSassTask, patternlab.server.refreshCSS)
   );
 }
 plWatchSassTask.displayName = taskNamePrefix + 'css:watch';
@@ -172,16 +169,14 @@ function plWatchSgTask() {
   return patternlab.build({
     watch: true,
     cleanPublic: config.cleanPublic
-  }).then(() => {
-    // do something else when this promise resolves
   });
 }
 plWatchSgTask.displayName = taskNamePrefix + 'sg:watch';
 plWatchSgTask.description = 'Watches for changes to styleguide source files.';
 
 
 const plWatchTask = gulp.series(
-  gulp.parallel(sassTask, preBuildTask),
+  gulp.parallel(plSassTask, preBuildTask),
   gulp.parallel(plWatchSassTask, plWatchSgTask)
 );
 plWatchTask.displayName = taskNamePrefix + 'watch';
@@ -196,16 +191,14 @@ function plServeSgTask() {
   return patternlab.server.serve({
     watch: true,
     cleanPublic: config.cleanPublic
-  }).then(() => {
-    // do something else when this promise resolves
   });
 }
 plServeSgTask.displayName = taskNamePrefix + 'sg:serve';
 plServeSgTask.description = 'Builds styleguide HTML only and launches Pattern Lab\'s built-in server.';
 
 
 const plServeTask = gulp.series(
-  gulp.parallel(sassTask, preBuildTask),
+  gulp.parallel(plSassTask, preBuildTask),
   gulp.parallel(plWatchSassTask, plServeSgTask)
 );
 plServeTask.displayName = taskNamePrefix + 'serve';
@@ -239,7 +232,8 @@ module.exports = {
   // Generated file paths
   generatedFileGlobs,
 
-  // Export Pattern Lab server, so other
-  // tasks can trigger reloads
-  plServer: patternlab.server
+  // Export Pattern Lab server reload functions, so
+  // other tasks can trigger reloads
+  plServerReload: () => patternlab.server.reload(),
+  plServerRefreshCss: () => patternlab.server.refreshCSS(),
 }
diff --git a/gulp/ui-lib.js b/gulp/ui-lib.js
@@ -10,7 +10,7 @@ const eyeglass = require('eyeglass');
 const chalk = require('chalk');
 
 const paths = require('./paths.js');
-const plServer = require('./patternlab.js').plServer;
+const { plServerReload, plServerRefreshCss } = require('./patternlab.js');
 
 const taskNamePrefix = 'ui-lib:';
 
@@ -140,20 +140,20 @@ function watchTask() {
     {
       name: 'SASS',
       paths: [paths.normalizePath(paths.srcSassDir, '**', '*.scss')],
-      config: { awaitWriteFinish: true },
-      tasks: gulp.series(sassBuildTask, plServer.refreshCSS)
+      config: {},
+      tasks: gulp.series(sassBuildTask, plServerRefreshCss)
     },
     {
       name: 'SVG Sprites',
       paths: [paths.normalizePath(paths.srcSymbolsDir, '**', '*.svg')],
-      config: { awaitWriteFinish: true },
+      config: {},
       tasks: svgSymbolsTask
     },
     {
       name: 'JS',
       paths: [paths.normalizePath(paths.srcJsDir, '**', '*.js')],
-      config: { awaitWriteFinish: true },
-      tasks: gulp.series(copyJsTask, plServer.reload)
+      config: {},
+      tasks: gulp.series(copyJsTask, plServerReload)
     }
   ];