From 7e9de98cdd09d1962cc096812188c0419804f27e Mon Sep 17 00:00:00 2001 From: Stanislaw Osinski Date: Tue, 19 Jan 2021 18:14:36 +0100 Subject: [PATCH 1/4] Upgrade to FoamTree 3.5.0, now available as an NPM package. (cherry picked from commit 7ae61c7d0b6281945563a80a46998af42820aa1a) --- .eslintignore | 3 - client/components/Treemap.jsx | 2 +- client/vendor/carrotsearch.foamtree.js | 256 ------------------------- package-lock.json | 6 + package.json | 1 + webpack.config.js | 3 +- 6 files changed, 9 insertions(+), 262 deletions(-) delete mode 100644 client/vendor/carrotsearch.foamtree.js diff --git a/.eslintignore b/.eslintignore index 3155489a..a245553e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,9 +5,6 @@ node_modules lib public -# Vendor code -client/vendor - # Test fixtures test/bundles test/stats diff --git a/client/components/Treemap.jsx b/client/components/Treemap.jsx index c3724db1..9c1613d4 100644 --- a/client/components/Treemap.jsx +++ b/client/components/Treemap.jsx @@ -1,5 +1,5 @@ import {Component} from 'preact'; -import FoamTree from 'carrotsearch.foamtree'; +import FoamTree from '@carrotsearch/foamtree'; export default class Treemap extends Component { diff --git a/client/vendor/carrotsearch.foamtree.js b/client/vendor/carrotsearch.foamtree.js deleted file mode 100644 index 2c7ef610..00000000 --- a/client/vendor/carrotsearch.foamtree.js +++ /dev/null @@ -1,256 +0,0 @@ -/** - * Carrot Search FoamTree HTML5 (demo variant) - * v3.4.5, 4fa198d722d767b68d0409e88290ea6de98d1eaa/4fa198d7, build FOAMTREE-SOFTWARE4-DIST-39, Jul 26, 2017 - * - * Carrot Search confidential. - * Copyright 2002-2017, Carrot Search s.c, All Rights Reserved. - */ -(function() {var v=function(){var a=window.navigator.userAgent,l;try{window.localStorage.setItem("ftap5caavc","ftap5caavc"),window.localStorage.removeItem("ftap5caavc"),l=!0}catch(k){l=!1}return{of:function(){return/webkit/i.test(a)},mf:function(){return/Mac/.test(a)},lf:function(){return/iPad|iPod|iPhone/.test(a)},hf:function(){return/Android/.test(a)},ii:function(){return"ontouchstart"in window||!!window.DocumentTouch&&document instanceof window.DocumentTouch},hi:function(){return l},gi:function(){var a=document.createElement("canvas"); -return!(!a.getContext||!a.getContext("2d"))},Dd:function(a,d){return[].forEach&&v.gi()?a&&a():d&&d()}}}();var aa=function(){function a(){return window.performance&&(window.performance.now||window.performance.mozNow||window.performance.msNow||window.performance.oNow||window.performance.webkitNow)||Date.now}var l=a();return{create:function(){return{now:function(){var k=a();return function(){return k.call(window.performance)}}()}},now:function(){return l.call(window.performance)}}}();function da(){function a(){if(!c)throw"AF0";var a=aa.now();0!==g&&(k.Kd=a-g);g=a;d=d.filter(function(a){return null!==a});k.frames++;for(var e=0;e=b.repeat&&(d[e]=null)))}d=d.filter(function(a){return null!==a});c=!1;l();a=aa.now()-a;0!==a&&(k.Jd=a);k.totalTime+=a;k.Oe=1E3*k.frames/k.totalTime;g=0===d.length?0:aa.now()}function l(){0b?16-b:0)}}()}(),d=[],c=!1,g=0;this.repeat=function(a,e,b){this.cancel(a);d.push({ye:a,Yg:b,repeat:e});l()};this.d=function(a,e){this.repeat(a, -1,e)};this.cancel=function(a){for(var e=0;e=c;c++)g=2*c*Math.PI/6,m.push({x:0+100*Math.sin(g),y:0+100*Math.cos(g)});c={polygonPlainFill:[l,function(a){a.fillStyle="rgb(255, 0, 0)";a.fill()}],polygonPlainStroke:[l,function(a){a.strokeStyle="rgb(128, 0, 0)";a.lineWidth=2;a.closePath();a.stroke()}], -polygonGradientFill:[l,function(a){var b=a.createRadialGradient(0,0,10,0,0,60);b.addColorStop(0,"rgb(255, 0, 0)");b.addColorStop(1,"rgb(255, 255, 0)");a.fillStyle=b;a.fill()}],polygonGradientStroke:[l,function(a){var b=a.createLinearGradient(-100,-100,100,100);b.addColorStop(0,"rgb(224, 0, 0)");b.addColorStop(1,"rgb(32, 0, 0)");a.strokeStyle=b;a.lineWidth=2;a.closePath();a.stroke()}],polygonExposureShadow:[l,function(a){a.shadowBlur=50;a.shadowColor="rgba(0, 0, 0, 1)";a.fillStyle="rgba(0, 0, 0, 1)"; -a.globalCompositeOperation="source-over";a.fill();a.shadowBlur=0;a.shadowColor="transparent";a.globalCompositeOperation="destination-out";a.fill()}],labelPlainFill:[function(a){a.fillStyle="#000";a.font="24px sans-serif";a.textAlign="center"},function(a){a.fillText("Some text",0,-16);a.fillText("for testing purposes",0,16)}]};var g=100/Object.keys(c).length,e=aa.now(),b={},h;for(h in c){var n=c[h],q=aa.now(),p,r=0;do{f.save();f.translate(Math.random()*d,Math.random()*k);p=3*Math.random()+0.5;f.scale(p, -p);for(p=0;pMath.abs(s))return!1;g.x=((a*d-b*c)*(e-k)-(a-c)*(e*h-f*k))/s;g.y=((a*d-b*c)*(f-h)-(b-d)*(e*h-f*k))/s;return!0}var d=1,c={x:0,y:0},g=1,m=1,e=1,b={x:0,y:0},h=1,n={x:0,y:0},q={x:0,y:0},p={x:0,y:0},r,s,w={x:0,y:0,f:0,i:0},t={x:0,y:0,f:0,i:0,scale:1},y=!0; -a.c.j("stage:initialized",function(a,b,c,d){r=c;s=d;w.x=0;w.y=0;w.f=c;w.i=d;t.x=0;t.y=0;t.f=c;t.i=d;t.scale=1});a.c.j("stage:resized",function(a,d,e,f){function k(a){a.x*=g;a.y*=m}function h(a){k(a);a.f*=g;a.i*=m}r=e;s=f;var g=e/a,m=f/d;k(c);k(n);k(b);k(q);k(p);h(w);h(t)});this.Yb=function(a,d){return l(d,function(){k(a,b)},!0)};this.Y=function(a,d){if(1===Math.round(1E4*d)/1E4){var c=w.x-n.x,e=w.y-n.y;l(1,function(){},!0);return this.d(-c,-e)}return l(d,function(){for(var d=!1;!d;)var d=Math.random(), -c=Math.random(),e=Math.random(),k=Math.random(),d=f(a.x+d*a.f,a.y+c*a.i,w.x+d*w.f,w.y+c*w.i,a.x+e*a.f,a.y+k*a.i,w.x+e*w.f,w.y+k*w.i,b)},!0)};this.sc=function(a,d){var c,e,k,g;c=a.f/a.i;e=r/s;ce?(k=a.f,g=a.f*s/r,c=a.x,e=a.y-0.5*(g-a.i)):(c=a.x,e=a.y,k=a.f,g=a.i);c-=k*d;e-=g*d;k*=1+2*d;if(f(c,e,n.x,n.y,c+k,e,n.x+r/h,n.y,b))return l(r/h/k,D.ta,!1);y=!1;return this.d(h*(n.x-c),h*(n.y-e))};this.d=function(a,b){var c=Math.round(1E4*a)/1E4,d=Math.round(1E4*b)/ -1E4;p.x+=c/h;p.y+=d/h;return 0!==c||0!==d};this.reset=function(a){a&&this.content(0,0,r,s);return this.Y({x:w.x+n.x,y:w.y+n.y,f:w.f/h,i:w.i/h},e/g)};this.Qb=function(a){e=Math.min(1,Math.round(1E4*(a||g))/1E4)};this.k=function(){return n.xw.x+w.f?-(n.x+r/h-w.x-w.f)*h:0};this.A=function(){return n.yw.y+w.i?-(n.y+s/h-w.y-w.i)*h:0};this.update=function(a){var e=Math.abs(Math.log(m));6>e?e=2:(e/=4,e+=3*e*(1c&&(c+=1);1c?b:c<2/3? -a+(b-a)*(2/3-c)*6:a}if("rgb"==a.model||"rgba"==a.model)return Math.sqrt(a.r*a.r*0.241+a.g*a.g*0.691+a.b*a.b*0.068)/255;var d,c;d=a.l/100;var g=a.s/100;c=a.h/360;if(0==a.Wj)d=a=c=d;else{var g=0.5>d?d*(1+g):d+g-d*g,m=2*d-g;d=f(m,g,c+1/3);a=f(m,g,c);c=f(m,g,c-1/3)}return Math.sqrt(65025*d*d*0.241+65025*a*a*0.691+65025*c*c*0.068)/255};this.Ng=function(a){if(D.Tc(a))return a;if(D.jc(a))switch(a.model){case "hsla":return S.Ig(a);case "hsl":return S.Ac(a);case "rgba":return S.Lg(a);case "rgb":return S.Kg(a); -default:return"#000"}else return"#000"};this.Lg=function(a){return"rgba("+(0.5+a.r|0)+","+(0.5+a.g|0)+","+(0.5+a.b|0)+","+a.a+")"};this.Kg=function(a){return"rgba("+(0.5+a.r|0)+","+(0.5+a.g|0)+","+(0.5+a.b|0)+")"};this.Ig=function(a){return"hsla("+(0.5+a.h|0)+","+(0.5+a.s|0)+"%,"+(0.5+a.l|0)+"%,"+a.a+")"};this.Ac=function(a){return"hsl("+(0.5+a.h|0)+","+(0.5+a.s|0)+"%,"+(0.5+a.l|0)+"%)"};this.Y=function(a,f,d){return"hsl("+(0.5+a|0)+","+(0.5+f|0)+"%,"+(0.5+d|0)+"%)"}};function V(){var a=!1,l,k=[],f=this,d=new function(){this.N=function(c){c&&(a?c.apply(f,l):k.push(c));return this};this.ih=function(a){f=a;return{then:this.N}}};this.J=function(){l=arguments;for(var c=0;cM.d(B,c)&&(window.clearTimeout(A),f(b,m),y=!0)},400)}}));c.addEventListener("mouseup",function(a){function c(a){var b={};b.x=a.pageX;b.y=a.pageY;return b}f(a,b);if(C){H&&f(a,s);window.clearTimeout(t);if(!y&&!H&&k(a)){var d=c(a);x&&100>M.d(d,x)?f(a,h):f(a,g);x=d;A=window.setTimeout(function(){x=null},350)}H=C=!1}});c.addEventListener("mousemove",function(a){var b=d(a,{});k(a)&&f(a,n,{type:"move"});B.x=b.x;B.y= -b.y;C&&!H&&100(c*=2)?0.5*Math.pow(c,a):1-0.5*Math.abs(Math.pow(2-c,a))}}function f(a){return function(c){for(var f=0;fa-l&&-1E-6a}}function d(a,b,c){this.jb=c;this.Ya=function(){a.call(b);return!1}}function e(a){var b;this.W=function(c,d){b=d+a};this.Ya=function(a,c){return c=c&&-1E-12<=c)&&(b=b-m,h=h-a,d=(b*n-d*h)/c,c=(b*f-e*h)/c,0<=c&&(g||1>=c)&&0<=d&&1>=d))return{x:m+e*d,y:a+f*d}};this.Jg=function(a,f,d,c){var g=a.x;a=a.y;var m=f.x-g;f=f.y-a;var e=d.x;d=d.y;var b=c.x-e;c=c.y- -d;var h=m*c-b*f;if(!(1E-12>=h&&-1E-12<=h)&&(c=((e-g)*c-b*(d-a))/h,0<=c&&1>=c))return{x:g+m*c,y:a+f*c}};this.Bc=function(a,f,d){for(var c=M.k(f,{}),g=M.k(d,{}),m,e=g.x-c.x,b=g.y-c.y,h=[],g=0;g(f.y-c.y)*(g.x-c.x)-(f.x-c.x)*(g.y-c.y))return!1}return!0};this.Mg=function(a,f,d){var c=a.x,g=f.x;a.x>f.x&&(c=f.x,g=a.x);g>d.x+d.f&&(g=d.x+d.f);cg)return!1;var m=a.y,e=f.y,b=f.x- -a.x;1E-7e&&(c=e,e=m,m=c);e>d.y+d.i&&(e=d.y+d.i);me?-1:0c?-1:0r*(h.x-k.x)+s*(h.y-k.y)+m*(h.z-k.z)&&a.d(b,h);c=d.kb;g=c.length;for(e=0;er*(h.x-k.x)+s*(h.y-k.y)+m*(h.z-k.z)&&a.d(b,h)}var m,e,b,h,n=c.length;for(m=0;mf*a.x+g*a.y+h*a.z?new l(a,c,d):new l(d,c,a)}function d(a,b,c,e){function f(a,b,c){a=a.ma;b=a[0]==b?0:a[1]==b?1:2;return a[(b+1)%3]!=c?(b+2)%3:b}b.C[f(b,c,e)]= -a;a.C[f(a,e,c)]=b}if(4>n)return 0;var e=c[0],f=c[1],g=c[2],h=c[3],k=b(e,f,g,h),m=b(e,g,h,f),r=b(e,f,h,g),s=b(f,g,h,e);d(k,m,g,e);d(k,r,e,f);d(k,s,f,g);d(m,r,h,e);d(m,s,g,h);d(r,s,h,f);q.push(k,m,r,s);for(e=4;eg;g++)h=q[g],k=h.ma[0],m=h.Oa,0>m.x*(f.x-k.x)+m.y*(f.y-k.y)+m.z*(f.z-k.z)&&a.d(h,f);return 4}())){for(;pe;e++)if(!0===w[e].visible){r= -h;s=e;break a}}h=[];var w=[],t=r,y=s;do if(h.push(t),w.push(y),y=(y+1)%3,!1===t.C[y].visible){do for(m=t.ma[y],t=t.C[y],e=0;3>e;e++)t.ma[e]==m&&(y=e);while(!1===t.C[y].visible&&(t!==r||y!==s))}while(t!==r||y!==s);var x=null,A=null;for(m=0;m(b.x-e.x)*(h.y-e.y)-(h.x-e.x)*(b.y-e.y))){d=void 0;break a}}c.shift();d=3>c.length?void 0:c}if(!d)a:{c=k.slice(0);for(d=0;d=-l&&(w=0);h.push(w);0w&&(n=!1)}if(p)c=[];else if(!n){s=[];for(r=0;rn||0>p&&0c.length){d=void 0;break a}}d=c}}return d};return this};var Ba=new function(){function a(a){for(var f=a[0].x,d=a[0].y,c=f,g=d,m=1;me.Oa.z))for(var f=e.C,g=0;gh.Oa.z)){var k=e.ma,r=k[(g+1)%3].index,k=k[g].index;2l)if(t.ub&&E.ub){var I=[],J=[];for(h=0;hl&&(w.push(q[h][0].ha),t.push(q[h][2]));r.o=w;r.C=t}r.o&&3>r.o.length&&(r.o=null,r.C=null)}}};this.zc=function(k,f){var d,c,g=!1,m=k.length;for(c=0;cn&&(r=n,e=h);b.Uj=e;b.vf=Math.sqrt(r)}for(c=0;cm&&(m=c,f=d);return f; -default:f=k[0];c=d=M.d(a,f);for(g=k.length-1;1<=g;g--)m=k[g],d=M.d(a,m),da.lineHeight&&(a.lineHeight=1);a=F.fontFamily;var T=F.fontStyle+" "+F.fontVariant+" "+F.fontWeight,N=F.sb,U=F.Zc,u=T+" "+a;F.Ne=u;var z={la:!1,mc:0,fontSize:0};e.save();e.font=T+" "+x+"px "+a;e.textBaseline="middle";e.textAlign="center";l(e,F);h=h.trim();t.text=h;d(r,s,p,y);if(/[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf\u3400-\u4dbf]/.test(h))f(t),k(e,t,u),c(F,t,y,U,N,!0,z);else if(k(e,t,u),c(F,t,y,U,N,!1, -z),!z.la&&(w&&(f(t),k(e,t,u)),P||w))P&&(z.ec=!0),c(F,t,y,U,U,!0,z);if(z.la){var L="",E=0,I=Number.MAX_VALUE,J=Number.MIN_VALUE;g(F,t,z.mc,z.fontSize,y,z.ec,function(a,c){0b&&(I=b);J>>1;for(d=0;d=m)h.la=!1;else{s=d;e=Math.min(e,m);p=Math.min(1,m/Math.max(20,b.md.length));do{var w=(s+e)/2,t=Math.min(n.length,Math.floor((m+w*(k-1-2*r))/(w*k))),y=void 0;if(0Y)break}while(1)}void 0!==y?s=q=w:e=w}while(e-s>p);void 0=== -q?(h.la=!1,h.fontSize=0):(h.la=!0,h.fontSize=q,h.mc=l,h.ec=f&&w===s)}}function g(a,c,d,f,g,k,m,n){var p=a.pb,l=f*(a.lineHeight-1),q=a.verticalAlign,t=Math.max(a.eb,0.001);a=e[a.Ne];var y=c.md;c=c.lg;var z=g.o,L=g.vd,E=g.tf,I=g.uf,J;switch(q){case "top":g=L.y+f/2+f*t;J=1;break;case "bottom":g=L.y-(f*d+l*(d-1))+f/2-f*t;J=-1;break;default:g=L.y-(f*(d-1)/2+l*(d-1)/2),J=1}q=g;for(t=0;t=d-p&&"\n"!=z)L+=R," "===$&&(L+=Y),m&&m(g,z);else{if(R>E&&(p!==d-1||!k))return!1;if(p+1>=d){if(k){d=E-L-J;if(d>J||R>J)d=Math.floor(g.length*d/R),0E&&(p!==d||!k))return!1}z=$}n&&n(p,q,void 0,void 0,L);return!0}var m={sb:72,Zc:0,lineHeight:1.05,pb:1,eb:0.5,tb:0.9,fontFamily:"sans-serif",fontStyle:"normal",fontWeight:"normal",fontVariant:"normal",verticalAlign:"center"}, -e={},b=" ",h="\u2026",n="\u2010",q="\u00ad",p="\u200b",r=[],s=[],w=[],t={text:"",md:void 0,lg:void 0},y={o:void 0,q:void 0,vd:void 0,tf:0,uf:0},x=100;return{Le:a,xe:function(b,c,d,e,f,g,h,k,m,r,s,n){var p,l=0,q=0;d=d.toString().trim();!n&&m.result&&d===m.sg&&Math.abs(r-m.ue)/r<=s&&(p=m.result,p.la&&(l=g.x-m.zg,q=g.y-m.Ag,s=m.jd,c.save(),c.translate(l,q),s.Ta(c),c.restore()));p||(s=m.jd,s.clear(),p=a(b,s,d,e,f,g,h,k),p.la&&s.Ta(c),m.ue=r,m.zg=g.x,m.Ag=g.y,m.result=p,m.sg=d);return p.la?{la:!0,mc:p.mc, -fontSize:p.fontSize,da:{x:p.da.x+l,y:p.da.y+q,f:p.da.f,i:p.da.i},ec:p.ec}:{la:!1}},yi:function(){return{ue:0,zg:0,Ag:0,result:void 0,jd:new ga,sg:void 0}},Ea:m}}();var Da=new function(){function a(a,d){return function(c,g,m,e){function b(a,c,e,f,g){if(0!=a.length){var r=a.shift(),s=k(r),n,p,l,q;if(d(f,g)){n=c;l=s/f;do{s=r.shift();p=s.vc;q=p/l;p=s;var P=e,F=l;p.x=n+q/2;p.y=P+F/2;m&&h(s,n,e,q,l);n+=q}while(0=h)if(a.uj)h=0.9*e;else continue;r=k(r,!0);r.T=h;r.index=f;r.parent=b;r.R=b.R+1;b.e.push(r);f++}}function k(a,b){var c=new Ga;f(a);c.id=a.__id;c.group=a;b&&(n[a.__id]=c);return c} -function f(a){D.Q(a,"__id")||(Object.defineProperty(a,"__id",{enumerable:!1,configurable:!1,writable:!1,value:h}),h++)}function d(a){for(var b=Number.MAX_VALUE,c=0;cd&&(b=d)}b===Number.MAX_VALUE&&(b=1);return b}function c(a){if(!a.empty()){a=a.e;var b=0,c;for(c=a.length-1;0<=c;c--){var d=a[c].T;bb.T?-1:a.index-b.index}); -for(var b=0;bc?1-p.ei/100*c:1;b.wa=0>c?1-p.fi/100*c:1;b.fa=0>c?1+0.5*c:1}function k(a){a=a.ka;return Math.max(0.001,0===a?1:1+a*(p.Xa-1))}function f(a,b){for(var c=a.reduce(function(a,b){a[b.id]=b;return a},{}),d=a.length-1;0<=d;d--)Z.F(a[d],function(a){c[a.id]=void 0});var e=[];D.Ga(c,function(a){a&&Z.Ge(a,function(a){a.open||e.push(a)})});var f=[];D.Ga(c,function(a){a&&a.open&&f.push(a)});d=[];0!==e.length&&d.push(x.Kb({e:e,Ia:!0,Ha:!0},b,!0)); -return pa(d)}function d(d,f,k,n){var l=m();if(0===d.length&&!l)return(new V).J().L();var q=d.reduce(function(a,b){a[b.id]=!0;return a},{}),s=[];d=[];if(A.reduce(function(a,b){return a||q[b.id]&&(!b.U||1!==b.ka)||!q[b.id]&&!b.parent.U&&(b.U||-1!==b.ka)},!1)){var x=[],C={};A.forEach(function(a){q[a.id]&&(a.U||s.push(a),a.U=!0,Z.Fa(a,function(a){x.push(b(a,1));C[a.id]=!0}))});0e&&(f=h,e=h.scale)}var k;f&&(k=b(a,f));return k|| -f}}return b(a,x)}function m(a,b){var c;if("flattened"==n.Ua)c=g(a);else{c=b||0;for(var d=u.length,e=void 0,f=0;fc&&!1===h.open&&h.ea&&I(h,a)&&(e=h,c=h.scale)}c=e}return c}function e(a){var b=void 0,c=0;Z.Kc(x,function(d){!0===d.open&&d.ea&&d.scale>c&&I(d,a)&&(b=d,c=d.scale)});return b}var b=v.mf(),h=this,n=a.options,q,p,r,s,w,t,y,x,A=!1,B,K,C,H,Q,O,P,F,T,N,U;a.c.j("stage:initialized",function(a,b,c,d){q=b;N=c;U=d;k()});a.c.j("stage:resized",function(a,b,c,d){N=c;U=d});a.c.j("stage:disposed", -function(){F.lb();E.lb();T.d()});a.c.j("expose:initialized",function(a){s=a});a.c.j("zoom:initialized",function(a){p=a});a.c.j("openclose:initialized",function(a){w=a});a.c.j("select:initialized",function(a){t=a});a.c.j("titlebar:initialized",function(a){y=a});a.c.j("timeline:initialized",function(a){r=a});var u;a.c.j("model:loaded",function(a,b){x=a;u=b});a.c.j("model:childrenAttached",function(a){u=a});this.H=function(){};this.Aa=d(c("mousedown",!1,function(){p.vi()}));this.Ba=d(c("mouseup",!1, -void 0));this.d=d(c("click",!0,function(a,b){if(!b.xb&&!b.shiftKey){var c=a.Ec;c&&(c.na?document.location.href=xa.kg("iuuq;..b`ssnurd`sbi/bnl.gn`lusdd"):t.select({e:[c],Ia:!c.selected,Ha:b.metaKey||b.ctrlKey},!0))}}));this.k=d(c("doubleclick",!0,function(b,c){var d,e;if(c.xb||c.shiftKey){if(d=b.Ec)d.parent.U&&(d=d.parent),e={e:d.parent!==x?[d.parent]:[],Ia:!0,Ha:!1},t.select(e,!0),s.fc(e,!0,!0,!1)}else if(d=b.Ec)e={e:[d],Ia:!0,Ha:!1},d.gb=!0,a.c.p("foamtree:attachChildren",[d]),s.fc(e,!0,!0,!1);d&& -r.D.m({}).fb(n.Wa/2).call(function(){w.Kb({e:Z.Mc(x,function(a){return a.Td&&!Z.ki(d,a)}),Ia:!1,Ha:!0},!0,!0);d.Td=!0;w.Kb({e:[d],Ia:!(c.xb||c.shiftKey),Ha:!0},!0,!0)}).start()}));this.ya=d(c("hold",!0,function(a,b){var c=!(b.metaKey||b.ctrlKey||b.shiftKey)&&!b.xb,d;(d=c?a.Ec:a.Wg)&&d!==x&&w.Kb({e:[d],Ia:c,Ha:!0},!0,!1)}));this.Y=d(c("dragstart",!1,function(a,b){B=b.x;K=b.y;C=Date.now();A=!0}));this.A=d(c("drag",!1,function(a,b){if(A){var c=Date.now();O=Math.min(1,c-C);C=c;var c=b.x-B,d=b.y-K;p.ti(c, -d);H=c;Q=d;B=b.x;K=b.y}}));this.S=d(c("dragend",!1,function(){if(A){A=!1;var a=Math.sqrt(H*H+Q*Q)/O;4<=a?p.ui(a,H,Q):p.wf()}}));this.Va=d(c("transformstart",!1,function(a,b){P=1;B=b.x;K=b.y}));var z=1,L=!1;this.Ja=d(c("transform",!1,function(a,b){var c=b.scale-0.01;p.Qg(b,c/P,b.x-B,b.y-K);P=c;B=b.x;K=b.y;z=P;L=L||2z?a.c.p("interaction:reset"):f();L=!1}));this.Pa=d(c("mousewheel",!1,function(){var a=D.ah(function(){f()},300);return function(c, -d){var e=n.Hj;1!==e&&(e=Math.pow(e,d.wd),b?(p.Rg(d,e),a()):p.Yb(d,e,n.wc,X.pa(n.xc)).N(f))}}()));this.za=d(function(){var b=void 0,d={},e=!1,f,g=c("hover",!1,function(){b&&(b.Eb=!1,b.I=!0);f&&(f.Eb=!0,f.I=!0);y.update(f);a.c.p("foamtree:dirty",!1)}),h=c("mousemove",!1,void 0);return function(a){if("out"===a.type)f=void 0,e=f!==b;else if(p.absolute(a,d),b&&!b.open&&I(b,d)){var c=m(d,b.scale);c&&c!=b?(e=!0,f=c):e=!1}else f=m(d),e=f!==b;e&&(g(a),b=f,e=!1);b&&h(a)}}());this.hb={click:l(this.d),doubleclick:l(this.k), -hold:l(this.ya),mouseup:l(this.Ba),mousedown:l(this.Aa),dragstart:l(this.Y),drag:l(this.A),dragend:l(this.S),transformstart:l(this.Va),transform:l(this.Ja),transformend:l(this.cb),hover:l(this.za),mousewheel:l(this.Pa)};var E=function(){function a(b,c){return function(a){a=a.gesture;var d=a.center,d=ra.Ie(q,d.pageX,d.pageY,{});d.scale=a.scale;d.xb=1=Math.max(k.Ve,5E-5)};this.yd=function(a,c){for(var b=Math.pow(k.Ra,a.R),d=k.mb*b, -b=k.Ad*b,f=a.e,l=f.length-1;0<=l;l--){var p=f[l];g.we(p,b);var r=p;r.aa=0a}function m(a){var b= -n.cc/(1+n.cc),c=M.q(a.u,{}),d={x:c.x,y:0},e=c.y,f=c.i,g=n.Ce*Math.pow(n.Ra,a.R-1),h=f*n.Be,k=n.Ic;"bottom"==k||0<=k&&180>k?(k=Math.PI,e+=f,f=-1):(k=0,f=1);for(var l,m=a.u,p=k,q=0,P=1,F=M.k(m,{}),T=F.ja,b=T*b,N=0;qN++;){var U=(q+P)/2;d.y=c.y+c.i*U;l=M.Wb(m,d,p);M.k(l[0],F);var u=F.ja-b;if(0.01>=Math.abs(u)/T)break;else 0<(0==p?1:-1)*u?P=U:q=U}M.q(l[0],c);if(c.ih)d.y=c.id.K.ja,k=0;!(g(c(d))||e&&32h?(f.i=g-c,a.u=M.A(f),f.y+=g-c,f.i=c,b()):(f.i=c,b(),f.y+=c,f.i=g-c,a.u=M.A(f))}var f;"stab"== -m.dc&&0c?a.unshift(f):a.push(f);break}}}var g,m=a.options,e={squarified:Da.te,ordered:Da.Xb}; -a.c.j("model:loaded",function(a){g=a});this.step=function(a,c,d){this.complete(a);c&&m.Sd(1,!0,d);return!0};this.complete=function(a){for(var c=[g];0=q&&(s=t,x=B,e())}function c(){function a(b,c,d){b.Cb=Math.floor(1E3*b.scale)-d*c;0Math.abs(b.scale-a.scale)&&(a.scale=Math.min(a.scale,b.scale))}});a(z,0,"flattened"==u.Ua?-1:1);e.sort(function(a,b){return a.Cb-b.Cb});if(g())b=e,c=null;else{var m={},p={},q="none"!=u.Cd&&u.mba?0:a}var d=[{type:"fill",qa:b("polygonPlainFill"),hd:function(b,c){c.fillStyle=S.Ac(a(b))}},{type:"fill",qa:b("polygonGradientFill"),hd:function(b,d){var e=b.K.Ob,f=a(b),e=d.createRadialGradient(b.x,b.y,0,b.x,b.y,e*u.th);e.addColorStop(0,S.Y((f.h+u.qh)%360,c(f.s+u.sh),c(f.l+u.rh)));e.addColorStop(1,S.Y((f.h+u.uh)%360,c(f.s+u.wh),c(f.l+u.vh)));b.ba.Ta(d);d.fillStyle=e}},{type:"stroke",qa:h(b("polygonPlainStroke"), -function(){return 0=u.Ph,!u.De&&a.description?a.rb=a.parent.rb:"auto"===a.Hd?(b=a.Qe,c=b.h+(b.s<<9)+(b.l<<16),a.zd!==c&&(a.rb=S.Cg(b)>(0>a.ka?u.di:u.Eh)?u.Fh:u.Oh,a.zd=c)):a.rb=a.Hd)}},{$a:["custom"],qa:h(b("contentDecoration"),function(){return u.Pc}),W:function(){},Da:function(){},d:function(){},ib:function(){},wb:function(a,b){!(0x&&(l=x);g.Db=x;g.Oc=1}for(f=0;fm.ka?t*(m.ka+1):t)*(1-m.Oc))*f(C,p,r,"l"),P=f(C,p,r,"a")):(O= -d.sa,H=O.h,Q=O.s,O=h(O.l,C,c.$i,c.aj),P=d.Pe.a);F.h=H;F.s=Q;F.l=O;F.a=P;H=m.sa;m.na?(H.h=0,H.s=0,H.l="light"==c.Tg?90:10,H.a=1):(H.h=F.h,H.s=F.s,H.l=F.l,H.a=F.a);w&&!m.na&&(e.groupColor=H,e.labelColor="auto",g.Dc(s,m,e,function(a){a.ratio=C}),m.sa=S.Ba(e.groupColor),m.sa.a=D.Q(e.groupColor,"a")?e.groupColor.a:1,"auto"!==e.labelColor&&(m.Hd=S.Ng(e.labelColor)))}d.Ma=!1}for(l=k.length-1;0<=l;l--)a(k[l])}}function h(a,b,c,d){var e=0>a+c*d?0:100a-c*(1-d)?0:100a.T?1:l.T=p||0>=r)){var s=a.Vc?a.ra.fontSize*a.scale*e.scale():0,w,t={titleBarText:a.Id,titleBarTextColor:g.ug,titleBarBackgroundColor:g.tg,titleBarMaxFontSize:g.ne,titleBarShown:sc/2,h={x:k,y:a?h:c-l+h,f:r,i:p},k=M.A(h),f.fillStyle=g.tg,f.fillRect(0,a?0:c-l,d,l),f.fillStyle=g.ug,G.Le({fontFamily:g.xj||g.Ih,fontStyle:g.Yj||g.Jh,fontWeight:g.$j||g.Lh,fontVariant:g.Zj||g.Kh,sb:g.ne,Zc:g.yj,pb:0,eb:0,tb:1},f,w,k,h,{x:h.x+h.f/2,y:h.y+h.i/2},!0,!0).la||f.clearRect(0,0,d,c))}}}};function cb(a){function l(a,b,c){t=!0;h&&h.stop();q&&q.stop();return g(e.reset(a),b,c).N(function(){t=!1})}function k(b){e.update(b);s.I=!0;a.c.p("foamtree:dirty",!0)}function f(a,b){return e.d((0!==e.k()?0.35:1)*a,(0!==e.A()?0.35:1)*b)}function d(){if(1===b.Pb){var a=Math.round(1E4*e.k())/1E4;0!==a&&(n.$d=a,h=w.D.tc(n).ia({duration:500,G:{x:{start:a,end:0,P:X.Rb}},ca:function(){e.d(n.x-n.$d,0);k(1);n.$d=n.x}}).start())}}function c(){if(1===b.Pb){var a=Math.round(1E4*e.A())/1E4;0!==a&&(p.ae=a,q=w.D.tc(p).ia({duration:500, -G:{y:{start:a,end:0,P:X.Rb}},ca:function(){e.d(0,p.y-p.ae);k(1);p.ae=p.y}}).start())}}function g(a,c,d){return a?w.D.tc(b).ia({duration:void 0===c?700:c,G:{Pb:{start:0,end:1,P:d||X.pg}},ca:function(){k(b.Pb)}}).bb():(new V).J().L()}function m(a){return function(){return t?(new V).J().L():a.apply(this,arguments)}}var e=new oa(a),b={Pb:1},h,n={Ee:0,x:0,$d:0},q,p={Fe:0,y:0,ae:0},r=this,s,w,t=!1;a.c.j("model:loaded",function(a){s=a;e.reset(!1);e.update(1)});a.c.j("timeline:initialized",function(a){w= -a});this.H=function(){a.c.p("zoom:initialized",this)};this.reset=function(a,b){e.Qb(1);return l(!0,a,b)};this.normalize=m(function(a,b){e.Hc(1)?l(!1,a,b):r.wf()});this.wf=function(){d();c()};this.k=m(function(a,b,c,d){return r.sc(a.q,b,c,d)});this.Yb=m(function(a,b,c,d){return g(e.Yb(a,b),c,d)});this.sc=m(function(a,b,c,d){return g(e.sc(a,b),c,d)});this.Bj=m(function(a,b){e.sc(a,b)&&k(1)});this.ti=m(function(a,c){1===b.Pb&&f(a,c)&&k(1)});this.Rg=m(function(a,b){e.Yb(a,b)&&k(1)});this.Qg=m(function(a, -b,c,d){a=0|e.Yb(a,b);(a|=f(c,d))&&k(1)});this.ui=m(function(a,g,l){1===b.Pb&&(h=w.D.tc(n).ia({duration:a/0.03,G:{Ee:{start:g,end:0,P:X.Rb}},ca:function(){e.d(n.Ee,0)&&k(1);d()}}).start(),q=w.D.tc(p).ia({duration:a/0.03,G:{Fe:{start:l,end:0,P:X.Rb}},ca:function(){f(0,p.Fe)&&k(1);c()}}).start())});this.vi=function(){h&&0===e.k()&&h.stop();q&&0===e.A()&&q.stop()};this.Jc=function(a,b){e.Jc(a,b)};this.Qb=function(a){return e.Qb(a)};this.Hc=function(a){return e.Hc(a)};this.Rd=function(){return e.Rd()}; -this.absolute=function(a,b){return e.absolute(a,b)};this.nd=function(a,b){return e.nd(a,b)};this.scale=function(){return e.scale()};this.d=function(a){return e.S(a)};this.content=function(a,b,c,d){e.content(a,b,c,d)}};function db(a,l,k){function f(a){var b=[];Z.F(q,function(c){a(c)&&b.push(c.group)});return{groups:b}}function d(a,b){var c=n.options,d=c.kj,e=c.jj,c=c.fe,f=0l.hj,b=A.step(function(b){b.Ca=!0;J.df(b);E.d();H.d(b).N(E.k);E.d();d(b,function(){this.Qa=!0;a()}).N(E.k)},!0,b)||b;c(!0);b&&(f=!1,E.k());return b}var f=!1,g;return{xi:function(){A.complete(J.qb)},gd:a,dg:b,Gb:function(){return!E.A()},stop:function(){p.cancel(e);f=!1;E.clear()}}}(),J=function(){function a(b){var c=!b.empty();b.Ca= -!0;if(c){for(var d=b.e,e=d.length-1;0<=e;e--){var f=d[e];f.f=f.rc}b.La=!0}return c}var b=[];return{df:function(c){var d=n.options,e=d.zh;0f&&(f=g.x);g.y>d&&(d=g.y)}return{x:l,y:k,w:f-l,h:d-k}}}}())},function(){window.CarrotSearchFoamTree=function(){window.console.error("FoamTree is not supported on this browser.")};window.CarrotSearchFoamTree.Xj= -!1});})(); - diff --git a/package-lock.json b/package-lock.json index 16415e6d..f9a21f9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1245,6 +1245,12 @@ "to-fast-properties": "^2.0.0" } }, + "@carrotsearch/foamtree": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@carrotsearch/foamtree/-/foamtree-3.5.0.tgz", + "integrity": "sha512-cDql5T3eS4Y5jzrDj25QNpU0pHgLFJ96MaoMAkJX8ceL2yat4u7EbIuqLoTbQLiTy1KxDRFbxHIKLzTUT64Duw==", + "dev": true + }, "@nodelib/fs.scandir": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", diff --git a/package.json b/package.json index 53c815cf..cbb32680 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "@babel/preset-react": "7.12.5", "@babel/register": "7.12.1", "@babel/runtime": "7.12.5", + "@carrotsearch/foamtree": "3.5.0", "autoprefixer": "10.0.1", "babel-eslint": "10.1.0", "babel-loader": "8.1.0", diff --git a/webpack.config.js b/webpack.config.js index 24ad66f2..a6090c2e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -23,7 +23,6 @@ module.exports = opts => { resolve: { modules: [ - `${__dirname}/client/vendor`, 'node_modules' ], extensions: ['.js', '.jsx'], @@ -60,7 +59,7 @@ module.exports = opts => { rules: [ { test: /\.jsx?$/u, - exclude: /(node_modules|client\/vendor)/u, + exclude: /(node_modules)/u, loader: 'babel-loader', options: { babelrc: false, From 8c3496ba995d46e85d58734c47e609ac23a2a534 Mon Sep 17 00:00:00 2001 From: Stanislaw Osinski Date: Wed, 20 Jan 2021 10:08:16 +0100 Subject: [PATCH 2/4] Changelog entry. --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 567a6bee..75877e3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,10 @@ _Note: Gaps between patch versions are faulty, broken or test releases._ ## UNRELEASED - - +* **Internal** + * Upgrade FoamTree to version 3.5.0, replace vendor dependency with an NPM package ([#412](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/412) by [@ + stanislawosinski](https://github.com/stanislawosinski)) + ## 4.3.0 * **Improvement** From 5924372e823fe173f032e9a3c16d3a6082971c2f Mon Sep 17 00:00:00 2001 From: Stanislaw Osinski Date: Wed, 20 Jan 2021 14:05:43 +0100 Subject: [PATCH 3/4] Remove unnecessary parentheses from regexp. Co-authored-by: Yuriy Grunin --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index a6090c2e..236621d6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -59,7 +59,7 @@ module.exports = opts => { rules: [ { test: /\.jsx?$/u, - exclude: /(node_modules)/u, + exclude: /node_modules/u, loader: 'babel-loader', options: { babelrc: false, From 98de72b4a8a226870ca851bb0fad1da72f70dd1e Mon Sep 17 00:00:00 2001 From: Stanislaw Osinski Date: Wed, 20 Jan 2021 14:06:44 +0100 Subject: [PATCH 4/4] Remove module resolution entry. --- webpack.config.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 236621d6..8ffda36b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,9 +22,6 @@ module.exports = opts => { }, resolve: { - modules: [ - 'node_modules' - ], extensions: ['.js', '.jsx'], alias: { react: 'preact/compat',