@salla.sa/twilight 1.6.15 → 2.0.0

package/package.json

@@ -1,65 +1,55 @@
 {
-    "name": "@salla.sa/twilight",
-    "version": "1.6.15",
-    "description": "Salla Theme Toolkit, Webcomponents, Events, Requests, Utils",
-    "main": "dist/cjs",
-    "module": "dist/esm",
-    "types": "types/index.d.ts",
-    "scripts": {
-        "build": "npx rollup --config --preserveSymlinks=true",
-        "watch": "npx rollup --watch --config --preserveSymlinks=true"
-    },
-    "keywords": [
-        "salla",
-        "theme",
-        "utils",
-        "events",
-        "requests"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/SallaApp/twilight.git"
-    },
-    "author": "Salla.sa",
-    "license": "MIT",
-    "files": [
-        "dist",
-        "types",
-        "watcher.js",
-        "package.json",
-        "postInstall.js"
-    ],
-    "homepage": "https://salla.dev",
-    "dependencies": {
-        "@salla.sa/base": "^1.6.15",
-        "@salla.sa/twilight-tailwind-theme": "^1.6.15",
-        "axios": "^0.27.2",
-        "infinite-scroll": "^4.0.1",
-        "jwt-decode": "^3.1.2",
-        "lang.js": "^1.1.14",
-        "websocket": "^1.0.34"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.18.10",
-        "@babel/preset-env": "^7.18.10",
-        "@rollup/plugin-babel": "^5.3.1",
-        "@rollup/plugin-commonjs": "^22.0.2",
-        "@rollup/plugin-node-resolve": "^13.1.3",
-        "babel-loader": "^8.2.5",
-        "rollup-plugin-analyzer": "^4.0.0",
-        "rollup-plugin-cleaner": "^1.0.0",
-        "rollup-plugin-exclude-dependencies-from-bundle": "^1.1.22",
-        "rollup-plugin-node-polyfills": "^0.2.1",
-        "rollup-plugin-serve": "^2.0.1",
-        "rollup-plugin-terser": "^7.0.2",
-        "rollup-plugin-version-injector": "^1.3.3",
-        "rollup-plugin-watch": "^1.0.1",
-        "webpack": "^5.74.0",
-        "webpack-build-notifier": "^2.3.0",
-        "webpack-cli": "^4.10.0"
-    },
-    "peerDependencies": {
-        "webpack": "^4 || ^5"
-    },
-    "gitHead": "4785838b20f24f09a8ce69951dd26fb159800d1b"
+  "name": "@salla.sa/twilight",
+  "version": "2.0.0",
+  "description": "Salla Theme Toolkit, Webcomponents, Events, Requests, Utils",
+  "main": "dist/twilight.js",
+  "scripts": {
+    "prod": "webpack --mode production",
+    "watch": "webpack --mode development --watch",
+    "postinstall": "node ./postInstall.js"
+  },
+  "keywords": [
+    "salla",
+    "theme",
+    "utils",
+    "events",
+    "requests"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SallaApp/twilight-js.git"
+  },
+  "author": "Salla.sa",
+  "license": "MIT",
+  "files": [
+    "dist",
+    "watcher.js",
+    "tailwind.js",
+    "package.json",
+    "components.js",
+    "postInstall.js",
+    "components/dist",
+    "components/loader",
+    "tailwind_css_list.js"
+  ],
+  "homepage": "https://salla.dev",
+  "dependencies": {
+    "@salla.sa/applepay": "~1.0",
+    "axios": "^0.23.0",
+    "eventemitter2": "^6.4.5",
+    "infinite-scroll": "^4.0.1",
+    "lang.js": "^1.1.14",
+    "store": "^2.0.12"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "babel-loader": "^8.2.3",
+    "glob": "^7.2.0",
+    "webpack": "^5.64.2",
+    "webpack-build-notifier": "^2.3.0",
+    "webpack-cli": "^4.9.1"
+  },
+  "peerDependencies": {
+    "webpack": "^4 || ^5"
+  }
 }

package/postInstall.js

@@ -0,0 +1,2 @@
+const version = process.env.npm_package_version;
+console.log(`Salla Twilight =>  ${version}`)

package/tailwind.js

@@ -0,0 +1 @@
+module.exports = require('./components/src/plugins/tailwind-theme/index.js');

package/tailwind_css_list.js

@@ -0,0 +1 @@
+module.exports = require('path').resolve(__dirname, 'components/src/plugins/tailwind-theme/safe-list-css.txt');

package/watcher.js

@@ -2,8 +2,6 @@ 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 {execSync} = require("child_process");
-const fs = require("fs");
-const WebSocketClient = require('websocket').client;
 //const webpack = require("webpack");
 /**
  * @callback HookCallback
@@ -50,26 +48,10 @@ const WebSocketClient = require('websocket').client;
  * @property {boolean} isWin
  */
 class WatcherPlugin {
-    constructor(params = {}) {
-      try{
-        if(!params.theme_id){
-          // this is another way to get params from cli 
-          let cachePath = path.join(process.cwd(), "/node_modules/.salla-cli");
-          if(fs.existsSync(cachePath)) params = JSON.parse(fs.readFileSync(cachePath, 'utf8'));
-        }
-      }catch(err){}
-      
-      let {wsport = 8001, sallaCli = "salla", theme_id, upload_url, store_id, draft_id} = params;
-      
-      this.sallaCli = sallaCli;
-      this.theme_id = theme_id;
-      this.upload_url = upload_url;
-      this.store_id = store_id;
-      this.draft_id = draft_id;
-      this.wsport = wsport;
-      this.files = {};
+    constructor(sallaCli = 'salla') {
+        this.sallaCli = sallaCli;
     }
-  
+
     /**
      * @param {Compiler} compiler
      */
@@ -83,19 +65,9 @@ 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) => {
-        if(this.connection) this.connection.sendUTF(JSON.stringify({ msg: "reload" }));
-      });
     }
+
     /**
      * @param {Compiler} compiler
      */
@@ -104,10 +76,8 @@ class WatcherPlugin {
                 let files = this.isWebpack5
                     ? Array.from(compiler_.modifiedFiles || [])
                     : Object.keys(compiler_.watchFileSystem.watcher.mtimes);
-               
-                files.map((file) => {
-                  if (file.toLowerCase().endsWith(".twig")) this.addToQ(file);
-                });
+                files.filter(file => file.toLowerCase().endsWith('.twig'))
+                    .forEach(file => execSync(`${this.sallaCli} theme sync -f "${file}" -t ${this.draftId}`, {stdio: 'inherit'}));
             }
         );
     }
@@ -123,7 +93,7 @@ class WatcherPlugin {
     }
 
     getEntry() {
-        let viewsPath = path.join(process.cwd(), "src/views");
+        let viewsPath = path.join(process.cwd(), "views");
         return this.isWin && this.isWebpack5
             ? viewsPath
             : glob.sync(path.join(viewsPath, "**/*.twig"), {absolute: true});
@@ -134,31 +104,19 @@ class WatcherPlugin {
      * @return {boolean}
      */
     canWatch(options) {
-        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);
+        if (options.mode !== 'development' || !options.watch) {
+            console.log(color.green, `✓ Skipping Watching Theme files in production.`, color.normal);
+            return false;
+        }
+        //if theme id not existed go out
+        try {
+            this.draftId = require(path.resolve(process.cwd(), 'theme.json')).draft_id
+            return !!this.draftId;
+        } catch (e) {
+            let command = color.cyan + this.sallaCli + ' theme watch' + color.red
+            console.log(color.red, `X Theme files won't sync! if you want to sync them, run: ${command}`, color.normal);
+            return false;
+        }
     }
 }