minor fixes

Author: iliakan

edit

@@ -6,7 +6,9 @@
 : ${1?"Usage: $0 <tutorial language> [<server language>]"}
 
 
-export TUTORIAL_ROOT="../$1.javascript.info"
+if [ -z "$TUTORIAL_ROOT" ]; then
+  export TUTORIAL_ROOT="../$1.javascript.info"
+fi
 export NODE_LANG="${2:-en}"
 export TUTORIAL_LANG=$1
 export NODE_ENV=production

gulpfile.js

@@ -30,15 +30,18 @@ task("nodemon", lazyRequireTask('./tasks/nodemon', {
   watch:  ["modules"]
 }));
 
-task("livereload", lazyRequireTask("./tasks/livereload", {
+task('livereload', lazyRequireTask('./tasks/livereload', {
   // watch files *.*, not directories, no need to reload for new/removed files,
   // we're only interested in changes
 
+  base: `public/${config.lang}`,
   watch: [
-    "public/pack/**/*.*",
+    `public/${config.lang}/pack/**/*.*`,
+    // not using this file, using only styles.css (extracttextplugin)
+    `!public/${config.lang}/pack/styles.js`,
     // this file changes every time we update styles
     // don't watch it, so that the page won't reload fully on style change
-    "!public/pack/head.js"
+    `!public/${config.lang}/pack/head.js`
   ]
 }));
 

tasks/livereload.js

@@ -1,40 +1,32 @@
-let livereload = require('gulp-livereload');
-let gulp = require('gulp');
-let throttle = require('lodash/throttle');
+let livereloadServer = require('engine/livereloadServer')
 let chokidar = require('chokidar');
 
 // options.watch must NOT be www/**, because that breaks (why?!?) supervisor reloading
 // www/**/*.* is fine
 module.exports = async function(options) {
 
-  // listen to changes after the file events finish to arrive
-  // no one is going to livereload right now anyway
-  livereload.listen();
+  function onChokidarChange(changed) {
+    changed = changed.slice(options.base.length + 1);
+    // console.log("CHANGE", changed);
 
-  // reload once after all scripts are rebuit
-  livereload.changedSoon = throttle(livereload.changed, 1000, {leading: false});
-  //livereload.changedVerySoon = _.throttle(livereload.changed, 100, {leading: false});
+    if (!changed.match(/\.(jpg|css|png|gif|svg)/i)) {
+      changed = '/fullpage'; // make all requests that cause full-page reload be /fullpage
+      // otherwise we'll have many reloads (once per diffrent .js url)
+    }
+    livereloadServer.queueFlush(changed);
+  }
 
   setTimeout(function() {
-    console.log("livereload: listen on change " + options.watch);
+    // console.log("livereload: listen on change " + options.watch);
 
     chokidar.watch(options.watch, {
       awaitWriteFinish: {
         stabilityThreshold: 300,
-        pollInterval: 100
+        pollInterval:       100
       }
-    }).on('change', function(changed) {
-      if (changed.match(/\.(js|map)/)) {
-        // full page reload
-        livereload.changedSoon(changed);
-      } else {
-        livereload.changed(changed);
-      }
-    });
+    }).on('change', onChokidarChange);
 
   }, 1000);
 
   await new Promise(resolve => {});
 };
-
-