many misc bug fix

web/modules/custom/gulpfile.mjs

@@ -15,12 +15,25 @@ import minimist from 'minimist';
 
 // var es = require('event-stream');
 
-var modules = ['edlp_corpus', 'edlp_studio', 'edlp_search'];
+var modules = [
+  {
+    modname:'edlp_studio',
+    srcjs:['./edlp_studio/assets/scripts/edlp_studio.js']
+  }, 
+  {
+    modname:'edlp_search',
+    srcjs:['./edlp_search/assets/scripts/edlp_search.js']
+  },
+  {
+    modname:'edlp_corpus',
+    srcjs:['./edlp_corpus/assets/scripts/corpus.js', './edlp_corpus/assets/scripts/physics.js'],
+    srccss:['./edlp_corpus/assets/styles/corpus.scss']
+  }]; 
 
 // to get minified assets run `gulp --env=prod`
 var argv = minimist(process.argv.slice(2));
 console.dir(argv);
-var prod = argv.env == 'prod' ? true : false;
+var prod = argv.env === 'prod' ? true : false;
 
 function handleError(err) {
   console.log(err.toString());
@@ -29,46 +42,70 @@ function handleError(err) {
 function scripts() {
   return new Promise(function(resolve, reject) {
     modules.map(function(module) {
-      src('./'+module+'/assets/scripts/*.js')
+      // console.log('module', module);
+      
+      src(module.srcjs, {allowEmpty: true})
+        .on('data', function(file) {
+          console.log('File src:', file.path);
+        })
         .pipe(gulpif(prod, stripDebug()))
         .pipe(gulpif(prod, jsmin()))
         .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('./'+module+'/assets/dist/scripts/'));
+        .pipe(dest(`./${module.modname}/assets/dist/scripts/`));
+        // .on('data', function(file) {
+        //   console.log('File dest:', file.path);
+        // });
     });
     resolve();
   });
+  // return src(['./edlp_studio/assets/scripts/edlp_studio.js'])
+  //       .pipe(gulpif(prod, stripDebug()))
+  //       .pipe(gulpif(prod, jsmin()))
+  //       .pipe(rename({suffix: '.min'}))
+  //       .pipe(dest('./edlp_studio/assets/dist/scripts/'));
 };
 
 function styles() {
   return new Promise(function(resolve, reject) {
     modules.map(function(module) {
-      src('./'+module+'/assets/styles/*.scss')
-        .pipe(sass().on('error', sass.logError))
-        .pipe(autoprefixer({
-            cascade: false
-        })).on('error', handleError)
-        .pipe(gulpif(prod, cssmin()))
-        // .pipe(cssmin())
-        .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('./'+module+'/assets/dist/styles/'));
+      if (module.srccss) {
+        src(module.srccss, {allowEmpty: true})
+          .pipe(sass().on('error', sass.logError))
+          .pipe(autoprefixer({
+              cascade: false
+          })).on('error', handleError)
+          .pipe(gulpif(prod, cssmin()))
+          // .pipe(cssmin())
+          .pipe(rename({suffix: '.min'}))
+          .pipe(dest('./'+module.modname+'/assets/dist/styles/'));
+      }
     });
     resolve();
   });
+  // return src('./edlp_studio/assets/styles/*.scss')
+  //       .pipe(sass().on('error', sass.logError))
+  //       .pipe(autoprefixer({
+  //           cascade: false
+  //       })).on('error', handleError)
+  //       .pipe(gulpif(prod, cssmin()))
+  //       // .pipe(cssmin())
+  //       .pipe(rename({suffix: '.min'}))
+  //       .pipe(dest('./edlp_studio/assets/dist/styles/'));
 };
 
 // default gulp task
 function devwatch () {
   // series(scripts, styles, done => {
     for (var i = 0; i < modules.length; i++) {
-      watch('./'+modules[i]+'/assets/styles/*.scss', styles);
-      watch('./'+modules[i]+'/assets/scripts/*.js', scripts);
+      watch('./'+modules[i].modname+'/assets/styles/*.scss', styles);
+      watch('./'+modules[i].modname+'/assets/scripts/*.js', scripts);
     }
   //   done()
   // })
 };
 
 
-export default series(scripts, styles);
+export default series(scripts, styles); //
 export { devwatch }