-+vn3-=g03>3VsHC^OB`RLM!8A+!{?
zn`BASiN)p1u(}NXz7-yS45r@W%-*?X*z^v(`L^@C$HdtU;k32n79>RVA^7FR*tQE=TlMmMOL27}j(0`&=4A;8rOB$jI(L@XK3UJ9iUs9e+$e4E$El4A>
z=}H=RC?{$?DprugYT%kH?xZ%?fES`)j3r17=_f8X*a&oskT44adJgb-S?;=~9jQmw
z4KqOw1Ao%yPMS5C?EcnMpxiP*P25dp0#(Ta0Wh>}?c^t#0n_>*J!Qf)0ZUQwO=)a`
zA@Qn{2jOZ;JWDLWq~0RL-&it$Y=Bj))~A$ZJ5U0cCML#1pZ~qoz$iZ3s)E`f?Nh3
zBbg&q+~*|lEoAHx!fL|KN#L8nd5ho~DJ7ILxym+ZLB?pm)f4Te
zv{eERk`^TvEy&nZ+Bw-tj^R$=ev&ESM?cNTnApzbahmj5iEN^H!l9k(ffLAB*!pIK
zP?3eZAK7m7BL%jSm5+d_*tlmzqbe=>H1g?4#UGFBkiIL)L{pik-ilOd{vN3@_jLg&
z%|0LLyApI14k!oi1a@e!?H6_+eN>(ot*es5F=R8b1zcZGVa-UN?n6^5pw7}7L1d}2
z0NLp>nb+vskv?+bAur{B%uGqu1Iz^%x#
zu@QqndLxDhGd
znT2c~AF8zcIdBDuCu;;6kkTP_KsB%r_{>G$E%SdS-__M{uKgGQ0000W#VPIE6S@7T!4+p>tiSIb`
zARc*-K7avw?vyVE1G_G2ibn~+z9C08_CW3f=yNnqE3lPJ$%C^hIdaN~#C`A4LC+mA
zu*rtB=0SRpkWV!P&;ig&3%tn&mb_>^VUTWux0UqBn@nIUnVJ_(Um%_8dQrE-z?vOR
zYhFa%2TKgvnjXAU2G$%<8vtH2pBo2jO#n^X!L=7y1~rx7+6OFynrd+E0k)EHJb%g_
zHC}M*=(#NhHeOh(UPL%x#-wQIf!k+bqu>5pNN;*dwLSo7m~0cW2E$qh&7(7{>hv3c
zfp_khebzA;Q|Do+7N7|(T1lEN&~t0a0+wLyb0&bHHQy32tZC3|&+1tYEW^ss
zS{7lO3@bxx2e5SDJitmPv^Becr93OcnqGaD1#SFU0y^G|1xmfIye84BStF
zTgerAl^VTQzTp3CG6IHu;JQP{pjL0wnXiv}$D)&X0A0BVnb{Fb%~ld%u)jR$g=NO;-;
zjzVM;zgz(CYbwve5Iwh~6WBg@b?bKJ3qbqd-JW|l^dT0}c$JPD!13?lUtc}6AJB8_
z>Vc(N$Um6IfPV5_jH&6HtA_x8Us$#qVRZVEUQ3-`?%HK$H(=Qcgwxw5@anf^AGv49
z>AM>OzbakzG6v;mLy!EP?D&Q)hBbr^SHN&w0QMaEzrzv@%ARR*S5J#{47bYG79N0_
z`ZeT7Sk4NBSI=D@TpbtI!@UUcQ$@vYpH5U~4FKSWu(M!KLc%JRxv-){*G-X346qhe
zEYs^e^Zv|BXyUl%=r}tq(DqZ(EI}RI@-m!?E3U^)$nnOoPY)3RbB+&hr6vbpHF|+c
zrW$7Rkl<6Z{uV+knGrUK?x!?c)ouWn*5B|#eSk2v1PvZRP1eDWtew>!z>k3>}22
zoec&oMOQA!4y&BAJZQQb#`_+(0~*9d(R`*l54#*?16Fhejj#=-&%o#^)Q)(0{?cwM
z_Ji8Z?Z9$$-CfVh@%z_R>a}){+;_w1z{jI{kSH4@!g6#qX~4Bk@5`haVd#6*KQj+~=rl|wwLfo8x$0!yTG-qi;G
zx=D6Gx~LbZWJ>E+CS=(TDDtm%!lN%^5X!^SV2f80MA73?!O1wDHCyRWHSC~^y=xNe
zfW6vZH~7kiC7i{;>Ws446?UKmE+LHHzv?S4u~k23${eqGM}S}dd9%UDq8fq7Ff0e>|ae&c@wZaSs(*gj<6DdrS93R
zD9Sm@D_Db;`?1!J3Kr8_PuRciIH(d{HRt$IHRr63xaa+c)?hyMI}>vB4H{)T4D2T5
z3lBT69F}(Lg|)Zu*A=X5MI`DBM02;BzKOM}I#m+D`mKs8nJLm-PM9wcn8h+hPu)%vD`eT*4r#v-$!^Z0_HP6t~?p?QL=()}!u<2>=mUF1B
z`p9OTuSM{tM?awFj-D)dgyculUm67Kp5@Nx`A_tij0xP!W*VYy0l+AmcwqAd
z>iysTm-_$jCCH}d52#IidqkgcamScsW(vM#2^^yiP29G{NPTe;UC>dqh^R*?Sf#$V
zPoMMXHPAi_7IDQOGs-zuA7Q_FSl5U{Dwcs)b-LYc)0Ye2&&Kkylbl1ZvC9S(NztZl
zjp8`R8Z!lE0Go4wcdcM2@v$yH03YlA#dz1UxnF9$y1Alrb32Id9P85=1mO+aMGueK46a<_9pJrtfSYfS5+udR?EBQ9GYoj*{OG}lmVNB*`_orf3Uhx
zU6Cblv;fPpTa}uQcXhJRF)gdn1F>R~o(QYS60jYxUz+yCRSzsjS5^c)QT~pm6jaP-
zeod)ZUnL4beyr*(nwih&xE5C%EFN2m2dx?R2z{tt-rdt&YjgR5ibFPidGZC|tfM|x
zeBA}kYnzWPN?kylU#eHi$LnWVZ68*b&ficW$F@j683DhRsA5T#KAixK>h@#1pVIHO
z&-9%~O{;yg0Mx&;u1+YQPRIs?(fgX3-U44P!tY4fZm9i28E_4=0Mwhxu+YSzo2%Wo
zsFc0=+GMed9T
zhzzPU8Arc`$&4sbSHG%WJ*%;pTaSkoCs~#MierEv%d_1Lqo?}rr|Oy}x6ib;SJLBQ
z7r&`0PPEDWtK!N_tH^JExzM}wchBwX1vc!4zASzEa$&^I-`RCrBr1oteI_qI8^?5T
zPEwLQu3iGNic#h>pz+ECSck$A0KiQ9SEt>e?a*ap51ze<4xFr#$T(_CckQeg#9tp5
zOlgTUT?Ez)lXpLrw?sQCa5C#ZqprS?wR+=zYEm-
zN7=(tI=b6Dim=HCc5i>TwMe3Gf^40(!hfN1j+$dLL;Xcy`>FWI&wm0Mo#0@IcJC@m
z`JNW(y@DQFzCgd9o|VS~^E|97Xg>}%d(xak%g{f5RaU6W^VZda|bMY`+nnMT{0&_@XfMjSN%{gu*o0)StE0%v<(K9x4AS&H-=n`p1T5A
znxdWYNn#lmVILHlWY>jWtr2!UV_38Yjw@3zl!~0Q_Num%Z-FpPoE@>Hqz>p{(r`j6F(G$>opHR8}k<1^I*zT+R%_pO@GXfft-L2X)TK2v{=H*4*O&+hUhE!N=E
ziM-cewLE1qqLrdQe@E{vvwy;Mm%1t*7uL5elDVc#_YQ|4*jsH0{9EM+CX^h0^O`Mr
z<$#|~wl|B*Il!|r)ubMlc3Z7F8Pk_R)Vc=QHT!K--nOLYZ%mu0>7wUWcLla?#NbO6
zv^Q52Rl^QE#P;m~u;=&@d$Ev5Z0#OK#WKMvYh{6XumZr##piu?(}uj?+|;%^7>6q)Bd>mWR_irlZr2AEkSzc!T>4p@_;tnhh_
zj{03y#NbKnKr`RqQ4dSxZ3U$Hg1U8ULU%*p_o~TDkhVtGFuE^zwNbXWl(@Bs#kur@^5#c2DsnU;Q2>(xF3
zE}N!J2&~e#o&)g$OVHK;e753(70YH7vZ#{olw5di%)3SdmY^K~u%|~(TEMjrQ~0ZH!Cl4zCiigN=mUIcdpD$n|6k1{v~vnI(25Q$L0biI
znV8$_VTr(1HR}}Qc0cUX?Akw_B=sDd0VsJj*9w6pXj=f1nLk=AAv`R}@5L&%!xUwQ
zw~1}pyOR}&3s?uHwCPk8g~jyho&$VeSl+g1u|`%*-!4i_OX0o-6PhBkOwrI|A~r=IbS)3U%CK?jmL+45wR65zg(VP?wh!P9U$4}|
zT8Sgiw=p=DUD1J;L@Q(no?Of{_Xvjpq22Q}ET`j)j0*0QYBm3hDtv?b6MOZ$BN
ztkYo4%bTaKVgC>O#^CmiZCZkF*Y`4H8c;TpWw+c#u
zu}z5Y_TMli1CTsmeQ-Gi7ENO>qIPUMa65s0=x^%`ZYWS2stZ;a*ky2Q9=L23R%-~L
zX)~zF0rnxhH4k1MoRPX7sQsjTpkx8-gIn?JmOBBjX^u|3;;|$KnFHVlQOV&MdZ@LPf7rsEzg>IP?9)e
b?xg<%;9rZ(OEzCJ00000NkvXXu0mjfUU1L%
literal 0
HcmV?d00001
From 235f878dbacfb53f5d7f4b79b2c58240b8dac51f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Jan 2022 03:59:52 +0000
Subject: [PATCH 180/488] Bump node-fetch from 2.6.1 to 2.6.7
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)
---
updated-dependencies:
- dependency-name: node-fetch
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 66 ++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 60 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4e6e641c8..f8995abb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9390,11 +9390,41 @@
}
},
"node_modules/node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+ "dependencies": {
+ "whatwg-url": "^5.0.0"
+ },
"engines": {
"node": "4.x || >=6.0.0"
+ },
+ "peerDependencies": {
+ "encoding": "^0.1.0"
+ },
+ "peerDependenciesMeta": {
+ "encoding": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/node-fetch/node_modules/tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+ },
+ "node_modules/node-fetch/node_modules/webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+ },
+ "node_modules/node-fetch/node_modules/whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+ "dependencies": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
}
},
"node_modules/node-forge": {
@@ -19938,9 +19968,33 @@
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
"node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+ "requires": {
+ "whatwg-url": "^5.0.0"
+ },
+ "dependencies": {
+ "tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+ },
+ "webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+ },
+ "whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+ "requires": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ }
+ }
},
"node-forge": {
"version": "0.10.0",
From 56fc23f23a9ea6fa8e930e2bf4be969bcaaf6ebd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Jan 2022 14:36:29 +0000
Subject: [PATCH 181/488] Bump cached-path-relative from 1.0.2 to 1.1.0
Bumps [cached-path-relative](https://github.com/ashaffer/cached-path-relative) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/ashaffer/cached-path-relative/releases)
- [Commits](https://github.com/ashaffer/cached-path-relative/commits)
---
updated-dependencies:
- dependency-name: cached-path-relative
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 80 ++++-------------------------------------------
1 file changed, 6 insertions(+), 74 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f89e03a32..b5b6d114f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2658,25 +2658,6 @@
"node": ">= 0.6"
}
},
- "node_modules/accepts/node_modules/mime-db": {
- "version": "1.43.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
- "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/accepts/node_modules/mime-types": {
- "version": "2.1.26",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
- "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
- "dependencies": {
- "mime-db": "1.43.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -3757,9 +3738,9 @@
}
},
"node_modules/cached-path-relative": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
- "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="
},
"node_modules/call-bind": {
"version": "1.0.2",
@@ -12118,25 +12099,6 @@
"node": ">= 0.6"
}
},
- "node_modules/type-is/node_modules/mime-db": {
- "version": "1.43.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
- "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/type-is/node_modules/mime-types": {
- "version": "2.1.26",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
- "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
- "dependencies": {
- "mime-db": "1.43.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -14893,21 +14855,6 @@
"requires": {
"mime-types": "~2.1.24",
"negotiator": "0.6.2"
- },
- "dependencies": {
- "mime-db": {
- "version": "1.43.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
- "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
- },
- "mime-types": {
- "version": "2.1.26",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
- "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
- "requires": {
- "mime-db": "1.43.0"
- }
- }
}
},
"acorn": {
@@ -15782,9 +15729,9 @@
}
},
"cached-path-relative": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
- "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="
},
"call-bind": {
"version": "1.0.2",
@@ -22279,21 +22226,6 @@
"requires": {
"media-typer": "0.3.0",
"mime-types": "~2.1.24"
- },
- "dependencies": {
- "mime-db": {
- "version": "1.43.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
- "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
- },
- "mime-types": {
- "version": "2.1.26",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
- "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
- "requires": {
- "mime-db": "1.43.0"
- }
- }
}
},
"typedarray": {
From 041abf12204ecc86ece5c4fe3ff61e15a0784aa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 03:00:41 +0000
Subject: [PATCH 182/488] Bump marked from 4.0.11 to 4.0.12
Bumps [marked](https://github.com/markedjs/marked) from 4.0.11 to 4.0.12.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v4.0.11...v4.0.12)
---
updated-dependencies:
- dependency-name: marked
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 14 +++++++-------
package.json | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f89e03a32..d8078ef51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
"jwt-simple": "^0.5.6",
"less": "^3.13.1",
"lodash": "^4.17.21",
- "marked": "4.0.11",
+ "marked": "4.0.12",
"marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1",
@@ -8891,9 +8891,9 @@
}
},
"node_modules/marked": {
- "version": "4.0.11",
- "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.11.tgz",
- "integrity": "sha512-xL2aJ5JDggqToKOqKHJWIDXaYk24XoGm1mNlhSPFP+0OKRCcKx+/hH7hlAr5LYqBKUzqCANylALgwNstVRgtCw==",
+ "version": "4.0.12",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz",
+ "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==",
"bin": {
"marked": "bin/marked.js"
},
@@ -19726,9 +19726,9 @@
}
},
"marked": {
- "version": "4.0.11",
- "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.11.tgz",
- "integrity": "sha512-xL2aJ5JDggqToKOqKHJWIDXaYk24XoGm1mNlhSPFP+0OKRCcKx+/hH7hlAr5LYqBKUzqCANylALgwNstVRgtCw=="
+ "version": "4.0.12",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz",
+ "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="
},
"marked-extended-tables": {
"version": "1.0.3",
diff --git a/package.json b/package.json
index f0bad7dda..eb5dfedf1 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
"jwt-simple": "^0.5.6",
"less": "^3.13.1",
"lodash": "^4.17.21",
- "marked": "4.0.11",
+ "marked": "4.0.12",
"marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1",
From 039e4dd4e597f316e9ec9c70ff3b0c2c1e551412 Mon Sep 17 00:00:00 2001
From: Trevor Buckner
Date: Fri, 28 Jan 2022 00:38:00 -0500
Subject: [PATCH 183/488] Revert extraneous Config changes
Looks like these were part of something else? In any case it conflicts with #1981 so just undoing these changes.
---
server.js | 2 +-
server/app.js | 2 +-
server/googleActions.js | 2 +-
server/token.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server.js b/server.js
index 22db8a63b..c9ce63c8f 100644
--- a/server.js
+++ b/server.js
@@ -4,7 +4,7 @@ const server = require('./server/app.js');
const config = require('nconf')
.argv()
.env({ lowerCase: true })
- .file('environment', { file: `${__dirname}/config/${process.env.NODE_ENV}.json` })
+ .file('environment', { file: `config/${process.env.NODE_ENV}.json` })
.file('defaults', { file: 'config/default.json' });
DB.connect(config).then(()=>{
diff --git a/server/app.js b/server/app.js
index 0c41e7d06..c36533b9b 100644
--- a/server/app.js
+++ b/server/app.js
@@ -75,7 +75,7 @@ app.use(require('./forcessl.mw.js'));
const config = require('nconf')
.argv()
.env({ lowerCase: true })
- .file('environment', { file: `${__dirname}/../config/${process.env.NODE_ENV}.json` })
+ .file('environment', { file: `config/${process.env.NODE_ENV}.json` })
.file('defaults', { file: 'config/default.json' });
//Account Middleware
diff --git a/server/googleActions.js b/server/googleActions.js
index c075bae4b..0050cb81d 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -6,7 +6,7 @@ const token = require('./token.js');
const config = require('nconf')
.argv()
.env({ lowerCase: true }) // Load environment variables
- .file('environment', { file: `${__dirname}/../config/${process.env.NODE_ENV}.json` })
+ .file('environment', { file: `config/${process.env.NODE_ENV}.json` })
.file('defaults', { file: 'config/default.json' });
//let oAuth2Client;
diff --git a/server/token.js b/server/token.js
index 8baf60e06..40d76a484 100644
--- a/server/token.js
+++ b/server/token.js
@@ -4,7 +4,7 @@ const jwt = require('jwt-simple');
const config = require('nconf')
.argv()
.env({ lowerCase: true }) // Load environment variables
- .file('environment', { file: `${__dirname}/../config/${process.env.NODE_ENV}.json` })
+ .file('environment', { file: `config/${process.env.NODE_ENV}.json` })
.file('defaults', { file: 'config/default.json' });
// Generate an Access Token for the given User ID
From 4c08f4a6e1e4ab117265e7bbec292f3bc15cf921 Mon Sep 17 00:00:00 2001
From: Trevor Buckner
Date: Fri, 28 Jan 2022 09:44:43 -0500
Subject: [PATCH 184/488] Condense v3_preview to fit on two pages again.
---
.../homebrew/pages/homePage/welcome_msg_v3.md | 29 +++++++------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/client/homebrew/pages/homePage/welcome_msg_v3.md b/client/homebrew/pages/homePage/welcome_msg_v3.md
index 76dfa134a..704c566f2 100644
--- a/client/homebrew/pages/homePage/welcome_msg_v3.md
+++ b/client/homebrew/pages/homePage/welcome_msg_v3.md
@@ -47,9 +47,9 @@ If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,
\column
## New in V3.0.0
-With the latest major update to *The Homebrewery* we've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew, and going forward, raw HTML will no longer receive debugging support (*but can still be used if you insist*).
+We've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew (*but can still be used if you insist*).
-Much of the syntax and styling has changed in V3. Code in one version may be broken in the other, and updating an older brew to V3 will require more than just a copy and paste. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
+Much of the syntax and styling has changed in V3, so converting a Legacy brew to V3 (or vice-versa) will require tweaking your document. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
Scroll down to the next page for a brief summary of the changes and new features available in V3!
@@ -76,12 +76,12 @@ If you wish to sell or in some way gain profit for what's created on this site,
#### Crediting Me
If you'd like to credit me in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
-\page
-
### More Homebrew Resources
If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The Discord of Many Things is another great resource to connect with fellow homebrewers for help and feedback.
+\page
+
## Markdown+
The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
@@ -119,22 +119,20 @@ A blank line can be achieved with a run of one or more `:` alone on a line. More
Much nicer than `
`
-\column
-
### Definition Lists
-V3 uses HTML *definition lists* to create "lists" with hanging indents.
-
-**Senses** :: Here is some text that is long and overflows into a second line, creating a "hanging indent".
+**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
### Column Breaks
Column and page breaks with `\column` and `\page`.
+\column
+
### Tables
Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
-Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.
+Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.
These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
@@ -150,9 +148,9 @@ These can be combined to span a cell across both columns and rows. Cells must ha
| 6A | 6B ^| 6C |
## Images
-Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*. Images can be included using Markdown-style images.
+Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
-Using *Curly Injection* you can assign an id, classes, or specific inline CSS properties to the image.
+Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
 {width:100px,border:"2px solid",border-radius:10px}
@@ -161,13 +159,8 @@ Using *Curly Injection* you can assign an id, classes, or specific inline CSS pr
## Snippets
Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible. Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
-{{pageNumber 2}}
-{{footnote PART 2 | BORING STUFF}}
-
-\page
-
## Style Editor Panel
{{fa,fa-paint-brush}} Technically released prior to v3 but still new to many users, check out the new **Style Editor** located on the right side of the Snippet bar. This editor accepts CSS for styling without requiring `