@salla.sa/twilight 2.6.10 → 2.6.12

package/package.json

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

package/watcher.js

@@ -1,11 +1,9 @@
 const path = require('path');
 const glob = require("glob");
 const color = {normal: "\x1b[0m", red: "\x1b[31m", green: "\x1b[32m", yellow: "\x1b[33m", cyan: "\x1b[36m",}
-const {spawnSync} = require("child_process");
+const {execSync} = require("child_process");
 const fs = require("fs");
 const WebSocketClient = require('websocket').client;
-const WebSocketServer = require("websocket").server;
-const http = require("http");
 //const webpack = require("webpack");
 /**
  * @callback HookCallback
@@ -68,8 +66,18 @@ class WatcherPlugin {
       this.upload_url = upload_url;
       this.store_id = store_id;
       this.draft_id = draft_id;
-      
-      this.startWebsocketServer(wsport);
+      // 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');
     
     }
   
@@ -100,16 +108,7 @@ class WatcherPlugin {
                 let changes = false;
                 files.map((file)=>{
                     if(file.toLowerCase().endsWith('.twig')){
-                        // https://github.com/vercel/pkg/issues/1292
-                        console.log(spawnSync("salla", [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,
-                          "--nohead"
-                        ]).stdout.toString());
+                        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'});
                         changes = true;
                     }
                 });
@@ -147,42 +146,6 @@ class WatcherPlugin {
 
         return !!this.theme_id;
     }
-    startWebsocketServer(wsport){
-      // start the live reload ws server
-      const wsServer = new WebSocketServer({
-        httpServer: http.createServer().listen(wsport),
-      });
-      let users = [];
-      wsServer.on("request", function (request) {
-        let connection = request.accept("echo-protocol", request.origin);
-        users.push(connection);
-    
-        connection.on("error", function (message) {
-          console.log("error", message);
-        });
-        connection.on("message", function (message) {
-          // mirror to all users
-          users.map((user) => {
-            // check user
-            if(user.connected) 
-              user.sendUTF(message.utf8Data);
-          });
-        });
-      });
-  
-      // 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');
-    }
 }
 
 module.exports = WatcherPlugin;