From 3420cfebff37ebe800ff09ed66b65dc9df0d6d58 Mon Sep 17 00:00:00 2001 From: Vinai Kopp Date: Tue, 7 Oct 2025 17:05:42 +0200 Subject: [PATCH 1/3] Give hyva_cms and hyva admin dashboard a nwe hotkey [m] --- bin/cache-clean.js | 2 +- export/watcher.js | 2 +- src/cache/hotkeys.cljs | 5 +++-- src/magento/watcher.cljs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/cache-clean.js b/bin/cache-clean.js index b9196fe..4c326e6 100755 --- a/bin/cache-clean.js +++ b/bin/cache-clean.js @@ -454,7 +454,7 @@ function lm(a,b){var c=gm(ok(a,zh));Vg(function(d){return Xj(c,d)},Z.b(function( function qm(a){var b=new W(null,7,5,Y,[[B.a(a),"Converter"].join(""),[B.a(a),"InterfaceFactory"].join(""),[B.a(a),"\\Interceptor"].join(""),[B.a(a),"\\Logger"].join(""),[B.a(a),"Mapper"].join(""),[B.a(a),"Persistor"].join(""),[B.a(a),"\\Proxy"].join("")],null);if(N.b("Interface",ge(a,R(a)-9))){var c=R(a)-9;a=a.substring(0,c)}else a=null;return w(a)?hf.b(b,new W(null,3,5,Y,[[a,"Extension"].join(""),[a,"ExtensionInterface"].join(""),[a,"\\Repository"].join("")],null)):b} function rm(a,b){var c=pm(a);return w(c)?ff(Qi,Z.b(function(d){return[B.a(c),[Di(d,"\\","/"),".php"].join("")].join("")},qm(b))):null}function sm(a,b){try{var c=Wi(b,2048),d=nm(c),e=wd(Dg(/^\s*class\s+(\w+)/mi,B.a(c)));var f=w(e)?e:om(c);var h=w(w(d)?f:d)?["\\",B.a(d),"\\",B.a(f)].join(""):null}catch(l){h=null}return w(h)?rm(a,h):null}function tm(a){a=pm(a);return w(a)?ff(function(b){return La(b,"Extension.php")||La(b,"ExtensionInterface.php")},aj(a)):null} function um(a){try{return Xi(a)}catch(b){return!1}}function vm(a,b){b=sm(a,b);return M(b)?(wj.g("Removing generated code from",S([[B.a(a),":\n"].join(""),Fe(B,cf(", ",Z.b(function(c){return ge(c,R(a))},b)))])),Vg(um,b)):null}function wm(a){var b=tm(a);return M(b)?(wj("Removing all generated extension attributes classes"),uj.g(["In base dir ",B.a(a),":\n"].join(""),S([Fe(B,cf(", ",Z.b(function(c){return ge(c,R(a))},b)))])),Vg(um,b)):null};function xm(a,b){return[[B.a(a),"pub/static/"].join(""),B.a(b)].join("")}function ym(a,b){return[[B.a(a),"var/view_preprocessed/pub/static/"].join(""),B.a(b)].join("")}function zm(a){a=hf.b(ff(Ri,Zi(xm(a,"frontend"))),ff(Ri,Zi(ym(a,"frontend"))));return ff(function(b){return N.b("js-translation.json",Ki.basename(b))},df(Yi,S([a])))}function Am(a){w(Ri(a))&&(ij(a),uj.g("Removed files in",S([a])))} -function Bm(a,b){wj.g("Removing static content area",S([b]));Am(xm(a,b));Am(ym(a,b));Am(ym(a,"app"));Am(ym(a,"vendor"))};function Cm(a){a=[B.a(a),"/dev/tests/integration/tmp"].join("");return w(Ri(a))?(wj.g("Removing integration-test sandbox directories from",S([a])),Vg(function(b){return hj(b)},ff(function(b){return Ma(b,"/dev/tests/integration/tmp/sandbox-")},Yi(a)))):wj.g("Integration test tmp directory",S([a,"not found"]))};var Dm=require("process"),Em=new lb(null,7,["c",new W(null,1,5,Y,["config"],null),"b",new W(null,3,5,Y,["block_html","hyva_cms","hyva_admin_dashboard"],null),"l",new W(null,1,5,Y,["layout"],null),"f",new W(null,1,5,Y,["full_page"],null),"a",yd,"v",new W(null,4,5,Y,["block_html","layout","full_page","translate"],null),"t",new W(null,1,5,Y,["translate"],null)],null),Fm=new lb(null,2,["F",new W(null,1,5,Y,["frontend"],null),"A",new W(null,1,5,Y,["adminhtml"],null)],null); +function Bm(a,b){wj.g("Removing static content area",S([b]));Am(xm(a,b));Am(ym(a,b));Am(ym(a,"app"));Am(ym(a,"vendor"))};function Cm(a){a=[B.a(a),"/dev/tests/integration/tmp"].join("");return w(Ri(a))?(wj.g("Removing integration-test sandbox directories from",S([a])),Vg(function(b){return hj(b)},ff(function(b){return Ma(b,"/dev/tests/integration/tmp/sandbox-")},Yi(a)))):wj.g("Integration test tmp directory",S([a,"not found"]))};var Dm=require("process"),Em=new lb(null,8,["c",new W(null,1,5,Y,["config"],null),"b",new W(null,1,5,Y,["block_html"],null),"l",new W(null,1,5,Y,["layout"],null),"f",new W(null,1,5,Y,["full_page"],null),"a",yd,"v",new W(null,4,5,Y,["block_html","layout","full_page","translate"],null),"t",new W(null,1,5,Y,["translate"],null),"m",new W(null,2,5,Y,["hyva_cms","hyva_admin_dashboard"],null)],null),Fm=new lb(null,2,["F",new W(null,1,5,Y,["frontend"],null),"A",new W(null,1,5,Y,["adminhtml"],null)],null); function Gm(a){a.resume();a.setEncoding("utf8");a.setRawMode(!0)}function Hm(a,b){Gm(a);a.on("data",function(c){c=Mk(b,c);return w(c)?Yb(c):!0});uj.g(gi,S(["Listening for hotkeys"]))} function Im(a,b){var c=Kl();jl(function(){var d=function(){function f(h){var l=h[1];if(1===l)return h[2]=null,h[1]=2,Hh;if(2===l)return Al(h,4,b);if(3===l)return Bl(h,h[2]);if(4===l){l=h[2];uj.g("Key pressed:",S([l]));N.b(l,"")&&(wj.g(gi,S(["Bye!"])),Dm.exit());var k=Sc.b(Em,l);w(k)&&km(k);k=M(Sc.b(Fm,l));for(var m=null,n=0,q=0;;)if(qcachetypes {"c" ["config"] - "b" ["block_html" "hyva_cms" "hyva_admin_dashboard"] + "b" ["block_html"] "l" ["layout"] "f" ["full_page"] "a" [] ;; a for all "v" ["block_html" "layout" "full_page" "translate"] ;; v for view - "t" ["translate"]}) + "t" ["translate"] + "m" ["hyva_cms" "hyva_admin_dashboard"]}) (def key->static-content-areas {"F" ["frontend"] "A" ["adminhtml"]}) diff --git a/src/magento/watcher.cljs b/src/magento/watcher.cljs index 81999c5..d6da4e4 100644 --- a/src/magento/watcher.cljs +++ b/src/magento/watcher.cljs @@ -305,7 +305,7 @@ (defn show-hotkeys [] (log/notice :without-time "Hot-keys for manual cache cleaning:") - (log/notice :without-time "[c]onfig [b]lock_html [l]ayout [t]ranslate [f]ull_page [v]iew [a]ll\n") + (log/notice :without-time "[c]onfig [b]lock_html [l]ayout [t]ranslate [f]ull_page [v]iew [m]isc [a]ll\n") (log/notice :without-time "Clean generated code: [G]") (log/notice :without-time "Clean integration test sandboxes: [I]") (log/notice :without-time "Clean static content areas: [F]rontend [A]dminhtml\n")) From d925077cdc91be90ae2bcc986d6a21fec0e281d3 Mon Sep 17 00:00:00 2001 From: Vinai Kopp Date: Tue, 7 Oct 2025 17:06:15 +0200 Subject: [PATCH 2/3] Prep release 1.1.4 --- src/cache/core.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cache/core.cljs b/src/cache/core.cljs index dc4ade0..05f5056 100644 --- a/src/cache/core.cljs +++ b/src/cache/core.cljs @@ -7,7 +7,7 @@ (set! *warn-on-infer* true) -(defonce version "1.1.3") +(defonce version "1.1.4") (defn node-version-str [] (let [proc ^js/process (js/require "process")] From 48ffa69f53d1deb2a95a96248b370879f263ab28 Mon Sep 17 00:00:00 2001 From: Vinai Kopp Date: Tue, 7 Oct 2025 17:07:03 +0200 Subject: [PATCH 3/3] Build 1.1.4 --- bin/cache-clean.js | 4 ++-- export/watcher.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cache-clean.js b/bin/cache-clean.js index 4c326e6..c10bdd9 100755 --- a/bin/cache-clean.js +++ b/bin/cache-clean.js @@ -467,13 +467,13 @@ function cn(){var a=Kl();jl(function(){var b=function(){function d(e){var f=e[1] f),e[7]=f,e[1]=w(f)?7:8,Hh):6===f?(e[2]=e[2],e[1]=3,Hh):3===f?Bl(e,e[2]):2===f?(e[1]=4,Hh):9===f?(f=e[2],h=Jl(5),e[8]=f,Al(e,10,h)):5===f?(e[2]=null,e[1]=6,Hh):10===f?(e[9]=e[2],e[2]=null,e[1]=2,Hh):8===f?(e[2]=null,e[1]=9,Hh):null}return function(){function e(l){for(;;){a:try{for(;;){var k=d(l);if(!ke(k,Hh)){var m=k;break a}}}catch(n){if(n instanceof Object)l[5]=n,Cl(l),m=Hh;else throw n;}if(!ke(m,Hh))return m}}function f(){var l=[null,null,null,null,null,null,null,null,null,null];l[0]=h;l[1]=1; return l}var h=null;h=function(l){switch(arguments.length){case 0:return f.call(this);case 1:return e.call(this,l)}throw Error("Invalid arity: "+arguments.length);};h.m=f;h.a=e;return h}()}(),c=function(){var d=b.m?b.m():b.call(null);d[6]=a;return d}();return zl(c)})}function dn(a){return ff(function(b){return Dg(/\.php$/,b)},aj([B.a(a),"/Controller"].join("")))}function en(a){fj(a,bn);return uj.g(gi,S(["Watching theme",Ki.basename(a)]))} function fn(a){var b=Ki.basename(Ki.dirname(a));a=Ki.basename(a);return[B.a(b),"/",B.a(a)].join("")}function gn(a){return wj.g("Watching new module",S([fn(a)]))}function hn(a){return uj.g(gi,S(["Watching module",fn(a)]))}function jn(a){Vg(function(b){var c=Qi(b);c=w(c)?mb(bj(b)):c;w(c)?(fj(b,bn),We.f(Pm,hf,dn(b)),b=a.a?a.a(b):a.call(null,b)):b=null;return b},Qj("module"))} -function kn(){Sj(function(){uj.g(gi,S(["Checking for new modules..."]));jn(gn);return km(new W(null,1,5,Y,["config"],null))})}function ln(a){if(Wm(a)){We.G(Om,Cd,a,(new Date).getTime());He(tj,Fh,"Processing",S([a]));if(mb(Qi(a)))if(N.b("requirejs-config.js",Ki.basename(a))){var b=ff(Ri,Zi(xm(Yb(Rj),"frontend")));b=hf.f(vg,Z.a(Ui),b);a=Wd(b,Ki.dirname(a))}else a=null;else a=!1;return w(a)?km(new W(null,1,5,Y,["full_page"],null)):null}return null};var mn={};if("undefined"===typeof yj||"undefined"===typeof mn||"undefined"===typeof nn)var nn="1.1.3";function on(a,b){var c=xg("string"===typeof a?wg([a]):a);return sb(function(d,e){return w(c.a?c.a(e):c.call(null,e))?new hd(!0):null},null,b)}function pn(a,b){var c=xg("string"===typeof a?wg([a]):a);a=sb(function(d,e){return w(c.a?c.a(e):c.call(null,e))?!0:w(d)?new hd(e):null},null,b);return N.b(!0,a)?null:a} +function kn(){Sj(function(){uj.g(gi,S(["Checking for new modules..."]));jn(gn);return km(new W(null,1,5,Y,["config"],null))})}function ln(a){if(Wm(a)){We.G(Om,Cd,a,(new Date).getTime());He(tj,Fh,"Processing",S([a]));if(mb(Qi(a)))if(N.b("requirejs-config.js",Ki.basename(a))){var b=ff(Ri,Zi(xm(Yb(Rj),"frontend")));b=hf.f(vg,Z.a(Ui),b);a=Wd(b,Ki.dirname(a))}else a=null;else a=!1;return w(a)?km(new W(null,1,5,Y,["full_page"],null)):null}return null};var mn={};if("undefined"===typeof yj||"undefined"===typeof mn||"undefined"===typeof nn)var nn="1.1.4";function on(a,b){var c=xg("string"===typeof a?wg([a]):a);return sb(function(d,e){return w(c.a?c.a(e):c.call(null,e))?new hd(!0):null},null,b)}function pn(a,b){var c=xg("string"===typeof a?wg([a]):a);a=sb(function(d,e){return w(c.a?c.a(e):c.call(null,e))?!0:w(d)?new hd(e):null},null,b);return N.b(!0,a)?null:a} function qn(a){var b=pn(new W(null,1,5,Y,["--verbosity"],null),a);return w(b)?b:sb(ce,1,Z.b(function(c){switch(c){case "-v":case "--verbose":return 1;case "-vv":case "--debug":return 2;case "-s":case "--silent":return-1;default:return 0}},a))}function rn(a){return pn(new W(null,1,5,Y,["--file-list"],null),a)}var sn=function sn(a){for(var c=[],d=arguments.length,e=0;;)if(e