@salla.sa/twilight 2.6.15 → 2.6.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salla.sa/twilight",
-    "version": "2.6.15",
+    "version": "2.6.17",
     "description": "Salla Theme Toolkit, Webcomponents, Events, Requests, Utils",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",

package/watcher.js

@@ -66,19 +66,8 @@ class WatcherPlugin {
       this.upload_url = upload_url;
       this.store_id = store_id;
       this.draft_id = draft_id;
-      // connect to live reload server
-      let client = new WebSocketClient();
-      client.on('connectFailed', (error)=> {
-        console.error('[x] Oops! Hot reload is currently not working. Check the error message for details: ',error.toString());
-      });
-    
-      client.on('connect', (connection)=> {
-          this.connection = connection;
-          console.log(color.green, `✓ Performing hot reload on port ws://localhost:${wsport}`, color.normal);
-      });
-    
-      client.connect(`ws://localhost:${wsport}`, 'echo-protocol');
-    
+      this.wsport = wsport;
+      this.files = {};
     }
   
     /**
@@ -94,9 +83,19 @@ class WatcherPlugin {
 
         console.log(color.green, '✓ Listening to webpack watch.', color.normal);
         this.addFilesToWatcher(compiler);
+        this.connectToWsServer();
         this.watchingChangedFiles(compiler);
+        this.afterCompile(compiler);
+    }
+    
+    /**
+     * @param {Compiler} compiler
+     */  
+    afterCompile(compiler) {
+      compiler.hooks.afterCompile.tap('SallaAfterCompilePlugin', (compilation) => {
+        this.connection.sendUTF(JSON.stringify({ msg: "reload" }));
+      });
     }
-
     /**
      * @param {Compiler} compiler
      */
@@ -106,12 +105,9 @@ class WatcherPlugin {
                     ? Array.from(compiler_.modifiedFiles || [])
                     : Object.keys(compiler_.watchFileSystem.watcher.mtimes);
                
-                files.map((file)=>{
-                    if(file.toLowerCase().endsWith('.twig'))
-                        execSync(`${this.sallaCli} theme sync -f "${file}" -id ${this.theme_id}  -store_id ${this.store_id} -draft_id ${this.draft_id}  -upload_url ${this.upload_url}`, {stdio: 'inherit'});
+                files.map((file) => {
+                  if (file.toLowerCase().endsWith(".twig")) this.addToQ(file);
                 });
-          
-                if(this.connection ) this.connection.sendUTF(JSON.stringify({msg:"reload"}));
             }
         );
     }
@@ -138,13 +134,32 @@ class WatcherPlugin {
      * @return {boolean}
      */
     canWatch(options) {
-        if (options.mode !== 'development' || !options.watch) {
-            console.log(color.green, `✓ Skipping Watching Theme files in production.`, color.normal);
-            return false;
-        }
-
+        if (!options.watch) return false;
         return !!this.theme_id;
     }
+    connectToWsServer(){
+        // connect to live reload server
+        let client = new WebSocketClient();
+            client.on('connectFailed', (error)=> {
+            console.error('[x] Oops! Hot reload is currently not working. Check the error message for details: ',error.toString());
+        });
+
+        client.on('connect', (connection)=> {
+            this.connection = connection;
+            console.log(color.green, `✓ Performing hot reload on port ws://localhost:${this.wsport}`, color.normal);
+        });
+        client.connect(`ws://localhost:${this.wsport}`, 'echo-protocol');
+    }
+    addToQ(file) {
+        if (this.files[file]) clearTimeout(this.files[file]);
+        this.files[file] = setTimeout(() => {
+          execSync(
+            `${this.sallaCli} theme sync -f "${file}" -id ${this.theme_id}  -store_id ${this.store_id} -draft_id ${this.draft_id}  -upload_url ${this.upload_url}`,
+            { stdio: "inherit" }
+          );
+          delete this.files[file];
+        }, 700);
+    }
 }
 
 module.exports = WatcherPlugin;