From ae22334645ef16471fe056bd70d7f495fadc7a27 Mon Sep 17 00:00:00 2001 From: henrygd Date: Thu, 13 Mar 2025 02:15:03 -0400 Subject: [PATCH] pass hub version through html and update dependencies - Changed Vite configuration to replace version during development. --- beszel/internal/hub/hub.go | 1 + beszel/site/bun.lockb | Bin 218032 -> 217013 bytes beszel/site/index.html | 7 +- beszel/site/package-lock.json | 486 +++++++++----------------- beszel/site/package.json | 11 +- beszel/site/src/components/router.tsx | 2 +- beszel/site/src/types.d.ts | 3 +- beszel/site/vite.config.ts | 8 + 8 files changed, 195 insertions(+), 323 deletions(-) diff --git a/beszel/internal/hub/hub.go b/beszel/internal/hub/hub.go index ee7d147..9836b04 100644 --- a/beszel/internal/hub/hub.go +++ b/beszel/internal/hub/hub.go @@ -172,6 +172,7 @@ func (h *Hub) startServer(se *core.ServeEvent) error { basePath := strings.TrimSuffix(parsedURL.Path, "/") + "/" indexFile, _ := fs.ReadFile(site.DistDirFS, "index.html") indexContent := strings.ReplaceAll(string(indexFile), "./", basePath) + indexContent = strings.Replace(indexContent, "{{V}}", beszel.Version, 1) // set up static asset serving staticPaths := [2]string{"/static/", "/assets/"} serveStatic := apis.Static(site.DistDirFS, false) diff --git a/beszel/site/bun.lockb b/beszel/site/bun.lockb index 4c89164e6ce910aba470334662aaee4c5e624c08..8bf618b76e89520bc4c12d6d4f33643e8fb7e589 100755 GIT binary patch delta 37538 zcmeHwcYGDq+V#vN2Xbf$Jt3jj0O{of5_0IB(4>T(N=`@*EwlurH-P~*9YPOHv4E%u zA}Xk;V5JHwNzE)xuBP;Yup3Z{f`>{GP36hlU z7@a`p*q9VYZ2D;FLwHn{q`ZaDl?4xRmZa+7^Mp40-1Ih>Di;9lP*{! zsXXM%NTm!oEha795id!{AX_2l#H6M$ofZh^mJ3BQBf^>nXC-8(r;JUI2DnI4ZTR;9 zGa@^f2`9y5r;kgMq{WDh3H@AJ_s?)7<}l)~Ay;cpNq+xHC@DOC`QxmdACIm{7 zneblql3d**%T=$hAU8=u0(rS$sPgjFic0Oe-74yFm#-vAaOTCN<)p@pj!ViO6PFc} zogn$Cy_M>@6;M7FWpq+P8cTf#4M16jo>fu{GDB2)LtdCD6FMqcyU)YbL<)ss%OTfB*}!1~Ba zh)ase8lC+LWQNX4h>07GRCd+ZiyhuT*KdMM|3KB-xwc$e?c!WJ*Qc=_$Eb!n#|Qbu zrKhB4Rf3+jkQ3O#L*UOgh%)T#hTOlo?ui$-tW-UzPw@o2zj8~0C`}ZtLfY) zuSYYz%B)bZDjwF;Gab=f?*xHhwux3KA4m2%$ZRtV>d`qF3DQT98KIl6-hmsdEiAQj zccLm7D&OE`;BpL=8b1m(BQ5sVD{?%T75hlmN9UOUNkZf1B|?uj$Xkekf;!I|2!D3T zmce=|UxJy7(b<@m5MQehJs0mmj}DNV_aYpuhpC}@J&recHS}y*KO+JwxDn(BHc6@j z{$obW4BiUD)Cm8xU}oenm_1`Nm>GT+%#6B(OHw^4SIUcqqB0aIU?w;jHNXgxz|7de z2))F;A=BTCz)aB0$b?qi0 zFlT`XBO|$OB?;p(uLuL3{T1jb--C>*&imM~J7DP9M7b=v z*+xd26g7$21VvSdfUJ>OV2sziS)KKam~Gw~dX}&Om{nZ~%z~JGONPt>{ephL9(<`Q z>Ytr$Oj=gVI4GmL=?Odrb4*<|6gH?TL)&n%m=ex#)D}W3#MI^A=|+0(sd1e1u(;-8fo7y??JR4 z!4)tgI0a?|hrl%40cJwW4gWmDKgEy-MXO!Q*2*>a9_CiT+-sOCwYl<6L%Qq_MgH;n zT=)r?lgLpp{dXE1m8fUOl-odNZTf(jUBkX|9(Fo0DKYU0#RlsAvW;@h@|*Qy)`MA0 zvp8lk&H6X%-K= zpuhf={;c<7On!g0BmZd!Hu`TVhdyFo#xSmd46ZVGD%b<^D6rP^z|3F>^_=`_!ofMC z6u3J0##miG17;I`0_OU36wIba57j0!q^rp_Ch2oZd&sog0+~}s4;Zk^G@Gp3T`}}n zwzQsm8~R*Em^eib7!79M;hvT}!r&cXPFm&`$jQ+E274xOI?ou=U>0EQRJ{iFL1z4& z(5X38u=7Y6g~UIDTmdq+!MQ$(DKR5|LPX4QO2XKLG#Eq~5!afo>#KlSvOQo{T|!n? zdX^8iM>F&ctc9K#ybak6+68cyg-k}ccD6=f^Wdq=k#o@0JFa4gPDt|;IiOxU{;IEV%`6idb)xw_tX-7 z#%QeS+8i*g9cf7kS&q@!v11Yw6SA!3+yA~6Glr95T3dE4tm&C&btK#6TD(X{Pj|GqpNSOxq~-%?&gl& z+@Z(Ej85=LOv}EGDq)>{2WGn37BgFt;*!!wIpSlou(^wmcVuN$=%)87v$L3YW&2m_ zo#9i2XQ#N{Rom@&=52(684X#hCr|_I330WgnyF355?9TM2w~ut` z-nPo-brEG}WQI+PSvjCz#joeCdj90;8VfCN=9i9M)#1U0UT^fM_NZQmL(hM@aKZjg zgW_gYFI||lE_B;_bE^f68?qyMQPZzp8egNAv;ShhK?@qa(yE0uJ>uP~y;r@y>4OzH z>yuA8R$RH^JvJmf&p&7ErcTd~+Iio8EGpA$)_dv(j}fX{4S)4F_wjBEPtS9`w`rH6 zxZe1@|B(ytsu>=2UbjZ?@`P-!6Zt zI_lf44K0!sj7o7*_cpRwqaj5>a#l0z+vIJkcLTe8O?BYcM=ikbIJFSJJ5}$7cKNdE zXlS=o#VvUo_4@h<7dYA@Xeo7X1Dkafqz;f=)qwgo#l=NUZWJkxRSO!~E$48vAEEB9 z7cRT2-i__nq3F!afxmap-B&z`pZI+9WVB08M_ENo@*sa~mND|gD<`0Rify5;B zykCSAStQlMNTXCrE6EVm;cb`Ks0H43>sRoJ(Bfc5>!Rl~Jw?lQ93;c9o=x7a7Bsb6 zzkyD#p-gX^wGO&GElR6-UZ^^J?eb@80e&m1 zh4_tDz5VR+V!ExzF{GIjEgefO^!Ki+Pm^#tN%i)(%kQZU{I*jI@Vitk#P9p6cYxjM zQAN*#tlsjqS>qsKI%a(~wOLmd`2{qwS-*tDdU9sDWe?R6$bM9S-yhV%K)ba|HAxDC ze`&2WQ&mTh-SP%>&#?8ZZdm?U3s!Y6(us!D5t3Ht%I@lFa{Wl_EyDzfH@C^1)xu!A zbuN~F26NH6Mih1nMb&FnA+aI!{&w1s^oFQf1C<6pbQ2^u4pM(edN(-%iPi3+b@;NF zVJJDPxBS9fAQbfld86vE*{v6#W1=o>KdZZ!+4_{8F{DyzfGx}g0@Ku*(|Q3Cn?uq% zYCX(nOvS3+YG#v1sNOB?)^*U~CJDI;XkoKHFf35LUBg^z>E@+X_PBgVfiTp^$EQUS z$EyVstWlGY20~)~^@6T~#1?^sSWZD=Ikfgu%GFVKgh$Hj)xvPQd|UO7uv-UW3hk^ihH*1R^|ssP1FFMrx8yWL8PwfvB3$6myCy6C2dWX= zNzDwjS(`M{gQJ2_&{#-@ALk)R#o<0N{Iu!K8s1pXw6oT9H`q-yyN` zoYY$b!d#k|QPOY}B)gs!818`7N|!K7eo(#J*{#9erVdfbnQ8%aFF=Q7nr-7_vy^Fy zI8-11aBCO1jPQtUCiR*XyU06`SjT7+KbzIstf+%w_86)P zAPwt;<`|2bUncB-P#qoZas#!Xqun~pNAGRuxGij!HIPEp)Cm!)qmx~(uNHK&TeHyY z?7sTodI3@kNLstfg{q^o-BR06lKj=(-r;gjwXm~Yp09d$vCGF*M;E&#)L--S3AY}G zivv+_^=bk7T#i`)eRnCOj+$RUqc9f;x*==7J9PU8<|@g+AFM zSYN#qZ8m!hiMiHR63&C&?bcNxMRka%EwHK?KiQ^vbvNU{ zBI@XEmq)7wz3rBh5t7tN-Q8PThWps9E79-t7;mAw+=Ha&G7}Zm1@&kY2f2I>(hxJx zmTQo@s;RbcO9=XESM_?caO)MgSbKVl)oWc;M#Pm-B;9Hq<^n-)0j~C?+GtrqFB+

5;uDY<1J>DgHp?YQQL0b(aBBiGV1z*) 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 gcv@SgV-WFad#A1?fgPPLR4C7 Beszel - +

diff --git a/beszel/site/package-lock.json b/beszel/site/package-lock.json index 8569d6e..3325126 100644 --- a/beszel/site/package-lock.json +++ b/beszel/site/package-lock.json @@ -1,17 +1,18 @@ { "name": "beszel", - "version": "0.0.0", + "version": "0.10.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "beszel", - "version": "0.0.0", + "version": "0.10.1", "dependencies": { "@henrygd/queue": "^1.0.7", - "@lingui/detect-locale": "^4.14.1", - "@lingui/macro": "^4.14.1", - "@lingui/react": "^4.14.1", + "@henrygd/semaphore": "^0.0.2", + "@lingui/detect-locale": "^5.2.0", + "@lingui/macro": "^5.2.0", + "@lingui/react": "^5.2.0", "@nanostores/react": "^0.7.3", "@nanostores/router": "^0.11.0", "@radix-ui/react-alert-dialog": "^1.1.6", @@ -45,7 +46,7 @@ }, "devDependencies": { "@lingui/cli": "^5.2.0", - "@lingui/swc-plugin": "^5.4.0", + "@lingui/swc-plugin": "^5.5.0", "@lingui/vite-plugin": "^5.2.0", "@types/bun": "^1.2.4", "@types/react": "^18.3.1", @@ -78,7 +79,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, + "devOptional": true, "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -89,12 +90,14 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "devOptional": true, "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -105,7 +108,7 @@ "version": "7.25.4", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -115,7 +118,7 @@ "version": "7.25.2", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -146,7 +149,7 @@ "version": "7.25.6", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/types": "^7.25.6", @@ -162,7 +165,7 @@ "version": "7.25.2", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.25.2", @@ -179,7 +182,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", @@ -193,7 +196,7 @@ "version": "7.25.2", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", @@ -212,7 +215,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", @@ -223,18 +226,20 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -244,49 +249,34 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", - "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", - "dev": true, + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", + "devOptional": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.0", - "@babel/types": "^7.25.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", - "dev": true, + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", + "devOptional": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.26.10" }, "bin": { "parser": "bin/babel-parser.js" @@ -296,9 +286,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", - "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", + "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -308,15 +298,15 @@ } }, "node_modules/@babel/template": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", - "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", - "dev": true, + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "devOptional": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" @@ -326,7 +316,7 @@ "version": "7.25.6", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", @@ -342,14 +332,14 @@ } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", + "devOptional": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -823,6 +813,12 @@ "integrity": "sha512-Jmt/iO6yDlz9UYGILkm/Qzi/ckkEiTNZcqDvt3QFLE4OThPeiCj6tKsynHFm/ppl8RumWXAx1dZPBPiRPaaGig==", "license": "MIT" }, + "node_modules/@henrygd/semaphore": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@henrygd/semaphore/-/semaphore-0.0.2.tgz", + "integrity": "sha512-N3W7MKwTRmAxOjeG0NAT18oe2Xn3KdjkpMR6crbkF1UDamMGPjyigqEsefiv+qTaxibtc1a+zXCVzb9YXANVqw==", + "license": "MIT" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -844,6 +840,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "devOptional": true, "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" @@ -856,6 +853,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "devOptional": true, "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", @@ -873,6 +871,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "devOptional": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -888,6 +887,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "devOptional": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -904,6 +904,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "devOptional": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -916,12 +917,14 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "devOptional": true, "license": "MIT" }, "node_modules/@jest/types/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -931,6 +934,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "devOptional": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -1001,7 +1005,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-lingui-macro/-/babel-plugin-lingui-macro-5.2.0.tgz", "integrity": "sha512-IEpEfKW2WoGiK30dbovwXaPj69dKUP+GEAk00/6KUMB0sonaBWO4NO3Bj9G6NSdA6fB1lm9BtvuPqJQ2DvjF5g==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/core": "^7.20.12", @@ -1027,7 +1031,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-5.2.0.tgz", "integrity": "sha512-3biQJxGntCP+EnOe9jjlquGCBfk6ogq+I8ZduHwmBceY5aQ0OR7V23ItDrMz0NBy8dFNk5YoeHun3CYKYOS/Jg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.20.13", @@ -1048,7 +1052,7 @@ "bundleDependencies": [ "@messageformat/date-skeleton" ], - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@messageformat/parser": "^5.0.0", @@ -1062,7 +1066,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -1078,7 +1082,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -1095,7 +1099,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -1108,14 +1112,14 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@lingui/babel-plugin-lingui-macro/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -1125,7 +1129,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -1430,98 +1434,10 @@ "node": ">=8" } }, - "node_modules/@lingui/conf": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-4.14.1.tgz", - "integrity": "sha512-LE/1RrVoMebQK+u4y6VQJdSwjOsMu4go/VR8m1eH0THn8vfkuLOYlPTIAHTWcoO+Ogi15p5TqHPfJcgVBy/NpA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "chalk": "^4.1.0", - "cosmiconfig": "^8.0.0", - "jest-validate": "^29.4.3", - "jiti": "^1.17.1", - "lodash.get": "^4.4.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@lingui/conf/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@lingui/conf/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@lingui/conf/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@lingui/conf/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/@lingui/conf/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lingui/conf/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@lingui/core": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.2.0.tgz", "integrity": "sha512-cz35uKDxIGb/CPvgwn7BM/QYpxtARmQm7n+mHUoNJdNKSrg9R7vKkLRG7k9dukZwix2Mdjh+2dPIJnAkor2CiA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.20.13", @@ -1551,7 +1467,6 @@ "bundleDependencies": [ "@messageformat/date-skeleton" ], - "dev": true, "license": "MIT", "dependencies": { "@messageformat/parser": "^5.0.0", @@ -1562,12 +1477,12 @@ } }, "node_modules/@lingui/detect-locale": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-4.14.1.tgz", - "integrity": "sha512-w3sS+tVcZ8uDVJxLjHYArTjzUFK0NyMh2wukVGU52UO1WYjCCujf1DPboooIm5zeMquuTpa5XK017lnPJzB21w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-5.2.0.tgz", + "integrity": "sha512-kwdUba3uheqb4J/U+Cqn7UdNvSJSKYV3GUqR1KYRWakFZojHPgGdxQwGqjli1/BrIa98D2YRm5+fNrsEtxUkjw==", "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" } }, "node_modules/@lingui/format-po": { @@ -1698,86 +1613,60 @@ } }, "node_modules/@lingui/macro": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-4.14.1.tgz", - "integrity": "sha512-kVAe78Sj4a74GJTOOqoAzxZgsgqPfcBFQC1akXMlAv9r4bX7zvbMov2cQVWjvix0waetwxo3oVqlSozsa8UPAw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-5.2.0.tgz", + "integrity": "sha512-zWrVDxRqlyc4Eirb5sUuL+4bxH2T/pEg5eZGwibLUcZhyRQmIJkarGrpGe6WzzQa5IZH4Y+2lzOM973jQ/IPMA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.20.13", - "@babel/types": "^7.20.7", - "@lingui/conf": "4.14.1", - "@lingui/core": "4.14.1", - "@lingui/message-utils": "4.14.1" + "@lingui/core": "5.2.0", + "@lingui/react": "5.2.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "@lingui/react": "^4.0.0", + "@lingui/babel-plugin-lingui-macro": "5.2.0", "babel-plugin-macros": "2 || 3" - } - }, - "node_modules/@lingui/macro/node_modules/@lingui/core": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/core/-/core-4.14.1.tgz", - "integrity": "sha512-3O6bnNzApWjb+jIdXa7G2VbrP6jZ5nfCeYSVloEYg6YFIfsQ3GunccK6I2nL80mWgr2qGP4VilGD+ODCeXHITA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@lingui/message-utils": "4.14.1", - "unraw": "^3.0.0" }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@lingui/message-utils": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-4.14.1.tgz", - "integrity": "sha512-J6MzyTLNCzEnyR1Da188G81cRcQMbk/lyYnLWMzQjIELDX8bBBwNea91Sf5Zm+BB+ADWmmGTdUqRPAjDqT9Y5w==", - "license": "MIT", - "dependencies": { - "@messageformat/parser": "^5.0.0", - "js-sha256": "^0.10.1" - }, - "engines": { - "node": ">=16.0.0" + "peerDependenciesMeta": { + "@lingui/babel-plugin-lingui-macro": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } } }, "node_modules/@lingui/react": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/react/-/react-4.14.1.tgz", - "integrity": "sha512-oZ9Rw+vOXJuaZvI1o4ASAIbCSe7AchCxsKGc0Y3csduTEOisvhsLgh8UDA8LW1mRgVPh5yZYB+VbfDMDQSzHpg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@lingui/react/-/react-5.2.0.tgz", + "integrity": "sha512-Ok9ZsA3hPPzeTXpp1woFk0Bgqv6shMB8AzbSQCixudLdbuAPkBu/EKlwTGBs0yYlq5cUXeDYrKKHF1R5BcX5HA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.20.13", - "@lingui/core": "4.14.1" + "@lingui/core": "5.2.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/@lingui/react/node_modules/@lingui/core": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@lingui/core/-/core-4.14.1.tgz", - "integrity": "sha512-3O6bnNzApWjb+jIdXa7G2VbrP6jZ5nfCeYSVloEYg6YFIfsQ3GunccK6I2nL80mWgr2qGP4VilGD+ODCeXHITA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@lingui/message-utils": "4.14.1", - "unraw": "^3.0.0" + "@lingui/babel-plugin-lingui-macro": "5.2.0", + "babel-plugin-macros": "2 || 3", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, - "engines": { - "node": ">=16.0.0" + "peerDependenciesMeta": { + "@lingui/babel-plugin-lingui-macro": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } } }, "node_modules/@lingui/swc-plugin": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@lingui/swc-plugin/-/swc-plugin-5.4.0.tgz", - "integrity": "sha512-xn3na6sA+wQPhw6oxIZvDvL51XkLZtyCMSdrUZDMf5/j18JJI8QRewlfn13Ai+Ze8qw8tCbCKnry7a6Dlq38yw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@lingui/swc-plugin/-/swc-plugin-5.5.0.tgz", + "integrity": "sha512-dj3njulVYeIpC1zofCQHNrzOR1F7HFSHC4fccYeFZVAvQ1o0ptLFBpbS4/zko8AhpuJuU92gWZQMBH0urY/98A==", "dev": true, "license": "MIT", "peerDependencies": { @@ -3165,6 +3054,7 @@ "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "devOptional": true, "license": "MIT" }, "node_modules/@swc/core": { @@ -3510,12 +3400,14 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "devOptional": true, "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "devOptional": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" @@ -3525,6 +3417,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "devOptional": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" @@ -3534,6 +3427,7 @@ "version": "20.12.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.14.tgz", "integrity": "sha512-scnD59RpYD91xngrQQLGkE+6UrHUPzeKZWhhjBSa3HSkwjbQc38+q3RoIVEwxQGRw3M+j5hpNAM+lgV3cVormg==", + "devOptional": true, "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -3543,6 +3437,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "devOptional": true, "license": "MIT" }, "node_modules/@types/prop-types": { @@ -3587,6 +3482,7 @@ "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "devOptional": true, "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -3596,6 +3492,7 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "devOptional": true, "license": "MIT" }, "node_modules/@vitejs/plugin-react-swc": { @@ -3639,18 +3536,6 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -3680,6 +3565,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "devOptional": true, "license": "Python-2.0" }, "node_modules/aria-hidden": { @@ -3736,6 +3622,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", + "devOptional": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", @@ -3751,6 +3638,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "devOptional": true, "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", @@ -3767,6 +3655,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "devOptional": true, "license": "ISC", "engines": { "node": ">= 6" @@ -3848,7 +3737,7 @@ "version": "4.23.3", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", - "dev": true, + "devOptional": true, "funding": [ { "type": "opencollective", @@ -3917,6 +3806,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" @@ -3926,6 +3816,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=10" @@ -3947,7 +3838,7 @@ "version": "1.0.30001647", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001647.tgz", "integrity": "sha512-n83xdNiyeNcHpzWY+1aFbqCK7LuLfBricc4+alSQL2Xb6OR3XpnQAmlDG+pQcdTfiHRuLcQ96VOfrPSGiNJYSg==", - "dev": true, + "devOptional": true, "funding": [ { "type": "opencollective", @@ -3964,20 +3855,6 @@ ], "license": "CC-BY-4.0" }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", @@ -4116,21 +3993,6 @@ "react-dom": "^18 || ^19 || ^19.0.0-rc" } }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "license": "MIT" - }, "node_modules/colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -4154,13 +4016,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/cosmiconfig": { "version": "8.3.6", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "devOptional": true, "license": "MIT", "dependencies": { "import-fresh": "^3.3.0", @@ -4351,7 +4214,7 @@ "version": "4.3.5", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -4422,7 +4285,7 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", - "dev": true, + "devOptional": true, "license": "ISC" }, "node_modules/emoji-regex": { @@ -4435,6 +4298,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "devOptional": true, "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" @@ -4483,7 +4347,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" @@ -4493,6 +4357,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.8.0" @@ -4663,7 +4528,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -4717,16 +4582,7 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -4782,6 +4638,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "devOptional": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -4960,6 +4817,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "devOptional": true, "license": "MIT" }, "node_modules/is-binary-path": { @@ -5079,6 +4937,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "devOptional": true, "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -5088,6 +4947,7 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "devOptional": true, "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", @@ -5105,6 +4965,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "devOptional": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -5120,6 +4981,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "devOptional": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -5136,6 +4998,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "devOptional": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -5148,12 +5011,14 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "devOptional": true, "license": "MIT" }, "node_modules/jest-validate/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -5163,6 +5028,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "devOptional": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5196,6 +5062,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "devOptional": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -5208,7 +5075,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -5221,13 +5088,14 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "devOptional": true, "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -5240,6 +5108,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6" @@ -5287,6 +5156,7 @@ "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "devOptional": true, "license": "MIT" }, "node_modules/lodash.sortby": { @@ -5405,7 +5275,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -5486,7 +5356,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/mute-stream": { @@ -5544,7 +5414,7 @@ "version": "2.0.18", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/normalize-path": { @@ -5782,6 +5652,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "devOptional": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -5794,6 +5665,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "devOptional": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", @@ -5862,6 +5734,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -6083,6 +5956,7 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "devOptional": true, "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", @@ -6097,6 +5971,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=10" @@ -6404,6 +6279,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -6573,7 +6449,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, + "devOptional": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -6762,18 +6638,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -6896,15 +6760,6 @@ "node": ">=0.6.0" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6970,6 +6825,7 @@ "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "devOptional": true, "license": "MIT" }, "node_modules/unraw": { @@ -6982,7 +6838,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", - "dev": true, + "devOptional": true, "funding": [ { "type": "opencollective", @@ -7776,7 +7632,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, + "devOptional": true, "license": "ISC" }, "node_modules/yaml": { diff --git a/beszel/site/package.json b/beszel/site/package.json index df9d776..b48a8db 100644 --- a/beszel/site/package.json +++ b/beszel/site/package.json @@ -1,7 +1,7 @@ { "name": "beszel", "private": true, - "version": "0.0.0", + "version": "0.10.1", "type": "module", "scripts": { "dev": "vite", @@ -12,9 +12,10 @@ }, "dependencies": { "@henrygd/queue": "^1.0.7", - "@lingui/detect-locale": "^4.14.1", - "@lingui/macro": "^4.14.1", - "@lingui/react": "^4.14.1", + "@henrygd/semaphore": "^0.0.2", + "@lingui/detect-locale": "^5.2.0", + "@lingui/macro": "^5.2.0", + "@lingui/react": "^5.2.0", "@nanostores/react": "^0.7.3", "@nanostores/router": "^0.11.0", "@radix-ui/react-alert-dialog": "^1.1.6", @@ -48,7 +49,7 @@ }, "devDependencies": { "@lingui/cli": "^5.2.0", - "@lingui/swc-plugin": "^5.4.0", + "@lingui/swc-plugin": "^5.5.0", "@lingui/vite-plugin": "^5.2.0", "@types/bun": "^1.2.4", "@types/react": "^18.3.1", diff --git a/beszel/site/src/components/router.tsx b/beszel/site/src/components/router.tsx index 968bc45..2138348 100644 --- a/beszel/site/src/components/router.tsx +++ b/beszel/site/src/components/router.tsx @@ -11,7 +11,7 @@ const routes = { * The base path of the application. * This is used to prepend the base path to all routes. */ -export const basePath = window.BASE_PATH || "" +export const basePath = globalThis.BESZEL.BASE_PATH || "" /** * Prepends the base path to the given path. diff --git a/beszel/site/src/types.d.ts b/beszel/site/src/types.d.ts index 48bb67b..10d4b5b 100644 --- a/beszel/site/src/types.d.ts +++ b/beszel/site/src/types.d.ts @@ -2,8 +2,9 @@ import { RecordModel } from "pocketbase" // global window properties declare global { - interface Window { + var BESZEL: { BASE_PATH: string + HUB_VERSION: string } } diff --git a/beszel/site/vite.config.ts b/beszel/site/vite.config.ts index 51fa339..dd9dd02 100644 --- a/beszel/site/vite.config.ts +++ b/beszel/site/vite.config.ts @@ -2,6 +2,7 @@ import { defineConfig } from "vite" import path from "path" import react from "@vitejs/plugin-react-swc" import { lingui } from "@lingui/vite-plugin" +import { version } from "./package.json" export default defineConfig({ base: "./", @@ -10,6 +11,13 @@ export default defineConfig({ plugins: [["@lingui/swc-plugin", {}]], }), lingui(), + { + name: "replace version in index.html during dev", + apply: "serve", + transformIndexHtml(html) { + return html.replace("{{V}}", version) + }, + }, ], esbuild: { legalComments: "external",