wip

1 files changed, 16 insertions, 5 deletions

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 54d200b14..06e995d07 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -42,10 +42,18 @@ const paths = {
     src: 'src/**/*.js',
     dest: 'build/',
     watch: [
-      'packages/**/*.js',
+      // 'packages/**/*.js',
       'src/**/*.js',
     ],
   },
+  packages: {
+    watch: 'packages/**/*',
+    // dest: 'build/',
+    // watch: [
+    //   // 'packages/**/*.js',
+    //   'src/**/*.js',
+    // ],
+  },
 };
 
 function _shell(cmd, cb) {
@@ -77,8 +85,9 @@ export function mvSrc() {
     [
       `${paths.src}/*`,
       `${paths.src}/*/**`,
-      `!${paths.scripts.watch}`,
+      `!${paths.scripts.watch[1]}`,
       `!${paths.src}/styles/**`,
+      `!${paths.src}/**/*.js`,
     ], { since: gulp.lastRun(mvSrc) },
   )
     .pipe(gulp.dest(paths.dest));
@@ -93,7 +102,7 @@ export function mvPackageJson() {
     .pipe(gulp.dest(paths.dest));
 }
 
-export function mvPackages() {
+export function mvLernaPackages() {
   return gulp.src(
     [
       'packages/**',
@@ -130,7 +139,7 @@ export function scripts() {
 }
 
 export function watch() {
-  gulp.watch(paths.scripts.watch, scripts);
+  gulp.watch(paths.packages.watch, mvLernaPackages);
   gulp.watch(paths.styles.watch, styles);
 
   gulp.watch([
@@ -138,6 +147,8 @@ export function watch() {
     `${paths.scripts.src}`,
     `${paths.styles.src}`,
   ], mvSrc);
+
+  gulp.watch(paths.scripts.watch, scripts);
 }
 
 export function webserver() {
@@ -173,7 +184,7 @@ export function sign(done) {
 
 const build = gulp.series(
   clean,
-  gulp.parallel(mvSrc, mvPackageJson, mvPackages),
+  gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages),
   gulp.parallel(html, scripts, styles),
   dictionaries,
 );