From f40da2467ea55b330c33f31e10b5e4058f5e7e11 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 17:57:55 +0900 Subject: [PATCH 1/7] Remove deno task minify. --- deno.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deno.json b/deno.json index 7bd8b315e..abc2255c0 100644 --- a/deno.json +++ b/deno.json @@ -71,7 +71,6 @@ "npm-pack:dhkem-x448": "cd npm-packages/x/dhkem-x448 && npm pack --dry-run", "npm-pack:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && npm pack --dry-run", "npm-pack:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && npm pack --dry-run", - "npm-pack:hpke-js": "cd npm-packages/x/hpke-js && npm pack --dry-run", - "minify": "esbuild npm/esm/mod.js --bundle --format=esm --minify" + "npm-pack:hpke-js": "cd npm-packages/x/hpke-js && npm pack --dry-run" } } From 0ff6b32f176c3de4e6446da6ef758cc1c41a751b Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:00:59 +0900 Subject: [PATCH 2/7] Add deno task bun-link. --- deno.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/deno.json b/deno.json index abc2255c0..9159baee4 100644 --- a/deno.json +++ b/deno.json @@ -71,6 +71,14 @@ "npm-pack:dhkem-x448": "cd npm-packages/x/dhkem-x448 && npm pack --dry-run", "npm-pack:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && npm pack --dry-run", "npm-pack:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && npm pack --dry-run", - "npm-pack:hpke-js": "cd npm-packages/x/hpke-js && npm pack --dry-run" + "npm-pack:hpke-js": "cd npm-packages/x/hpke-js && npm pack --dry-run", + "bun-link": "deno task bun-link:core && deno task bun-link:chacha20poly1305 && deno task bun-link:dhkem-x25519 && deno task bun-link:dhkem-x448 && deno task bun-link:dhkem-secp256k1 && deno task bun-link:hybridkem-x25519-kyber768 && deno task bun-link:hpke-js", + "bun-link:core": "cd npm-packages/x/core && bun link", + "bun-link:chacha20poly1305": "cd npm-packages/x/chacha20poly1305 && bun link", + "bun-link:dhkem-x25519": "cd npm-packages/x/dhkem-x25519 && bun link", + "bun-link:dhkem-x448": "cd npm-packages/x/dhkem-x448 && bun link", + "bun-link:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && bun link", + "bun-link:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && bun link", + "bun-link:hpke-js": "cd npm-packages/x/hpke-js && bun link", } } From df715c77ac973885484fe11e868330d53a899747 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:08:25 +0900 Subject: [PATCH 3/7] Use bun link for bun test. --- .../test/runtimes/bun/bun.lockb | Bin 4251 -> 3774 bytes .../test/runtimes/bun/package.json | 4 ++-- x/core/test/runtimes/bun/bun.lockb | Bin 3476 -> 3437 bytes x/core/test/runtimes/bun/package.json | 2 +- x/dhkem-secp256k1/test/runtimes/bun/bun.lockb | Bin 4613 -> 3772 bytes .../test/runtimes/bun/package.json | 4 ++-- x/dhkem-x25519/test/runtimes/bun/bun.lockb | Bin 4636 -> 3766 bytes x/dhkem-x25519/test/runtimes/bun/package.json | 4 ++-- x/dhkem-x448/test/runtimes/bun/bun.lockb | Bin 4598 -> 3762 bytes x/dhkem-x448/test/runtimes/bun/package.json | 4 ++-- x/hpke-js/test/runtimes/bun/bun.lockb | Bin 4581 -> 3424 bytes x/hpke-js/test/runtimes/bun/package.json | 2 +- .../test/runtimes/bun/bun.lockb | Bin 4643 -> 3792 bytes .../test/runtimes/bun/package.json | 4 ++-- 14 files changed, 12 insertions(+), 12 deletions(-) diff --git a/x/chacha20poly1305/test/runtimes/bun/bun.lockb b/x/chacha20poly1305/test/runtimes/bun/bun.lockb index 4b6d5ba101db8883569599c69762c4b0c370a509..e0710b02a9281a036a048935a8706a093bed2129 100755 GIT binary patch delta 795 zcmb7CO=uHQ5Pt6^oBhddDpIthh*WSjIc&1glr(4>K@loq1z}Z6Y1LqDV-i{dtpUlw zLodZ9bFvi=9whc?5rx(tJQNW<_f{f;*dIX#sDR+9l_kCnYo1D3C9enZA3b3ZA6=(19jJjpG2u^{myZa!4vmY|`d3{cp#h@J

}r!=>OaJE%)!w)(CV81)>H~BU7q*MJNq;^c|#C^HzS@?ElptKgw3h4w!+A!j7 zxU_Zk-Sp1QeS+JTZN<77TV>F%cXZb=kyc-cT%0iZalV delta 1193 zcmdldJ6myrp5~!lzZepBS8O+N?O%1u?ZK?GFRqqO+z%?;k z-Y1C*!eL-YD$N5kwSXj0ut5Y!ivj5!K$;IogA{_qEf^UXIDvF4kmd%`r+_pMkgj2z zxJ!*g=eA{1>MO@p6CV^zzQD-AYXa0|29yOVVql&u$fyk#%>wfL&_xB00YzDPEVzgs&WSlI;WXCjtadH%s9pkmhGnwp}#F-}F0*Zw*O_pNzGGzj4 zV*}|20uT+dmK}&e;y_1(`5=#g0Eh<3b5EYgEKR1)o6NyYz)`*j!xIpQM|u;YEbj$*dC6>BGpe~ZhdXvqwkb^ZdUHipLuK|vlb^Un*RC0 z?8&_>;`JmIw>1Fp7#Y5K5@Q-6YzEyYn$$p?$7#aTY{{zy@An!o|3%ma=g~mrKyv0y z9zN+e6JwmAp0S<*1A`V&G0-IqtG@cjRNvFeAs}Onwn}3=J4s87J#;OW48k z6KB57u~&h!b^{fd>KU2onE(|)a@<7ys9v?Lww6qcAXkF{FNAX7o!r9hF!=Q#h@^dN;jSWm8D)dUys~qz3lX8H%GYc|Oi;5?&;+2s_5dmq2$mxOu N2573<<{dn2OaS)WD{}w< diff --git a/x/chacha20poly1305/test/runtimes/bun/package.json b/x/chacha20poly1305/test/runtimes/bun/package.json index c875f1444..58b96ce34 100644 --- a/x/chacha20poly1305/test/runtimes/bun/package.json +++ b/x/chacha20poly1305/test/runtimes/bun/package.json @@ -9,7 +9,7 @@ "typescript": "^5.0.0" }, "dependencies": { - "@hpke/chacha20poly1305": "^1.3.0", - "@hpke/core": "^1.3.0" + "@hpke/chacha20poly1305": "link:@hpke/chacha20poly1305", + "@hpke/core": "link:@hpke/core" } } diff --git a/x/core/test/runtimes/bun/bun.lockb b/x/core/test/runtimes/bun/bun.lockb index 9405022d2ce5e0dc2eedd65286e5e7d96087200b..4a24dc2dd832d0a0bb39af0acba5942086e24545 100755 GIT binary patch delta 321 zcmbOt{Z?v%p3;|>!2xS4A6YjAdkeo=$qVazFs4X)+_D!DI(U4o2O{os9O3 z*^^HK$z78QvT^fCCS}ISK5UMgby-B1Hw&<K>J|ssD6`vwnON(5)-4Lo}r$R83V(z$sai-8P`wd=8}|#xsEg6 z=Gd#iS-Y7S>r8=)^h_AmPqycpDOt)0aea%0=^4ffzJC%xFM+_-$sf6_`ExS!vaK94 W3bIr6lk5>p#R;6DLZ%7-r(k2 z`-z*4;hNsj>3TYf_g7C1YTg{%!?9ST`bo^KukCyEopR63%DwqBk4KR=kg zS(inGd2<3g2jgS`M)}Pd93hORFb}Ny>K{{mPb-IsG0srWSkHig0p^wJH|b|PgkCE# zF&gR_>KOqYe|GXmPD#dVlexJhrC}cA%(prADsa|rCdN8bpdvjJhHI1Uxn@evfd)W} zh3Of_3ci05z)%5!Ka)RlSx>g+Ruju8$WGNy&M!*U*9B9$VEZSB@~CZ2=VoI904{`j AIRF3v diff --git a/x/core/test/runtimes/bun/package.json b/x/core/test/runtimes/bun/package.json index 1ff5a3c7b..aabebe521 100644 --- a/x/core/test/runtimes/bun/package.json +++ b/x/core/test/runtimes/bun/package.json @@ -9,6 +9,6 @@ "typescript": "^5.0.0" }, "dependencies": { - "@hpke/core": "^1.3.0" + "@hpke/core": "link:@hpke/core" } } diff --git a/x/dhkem-secp256k1/test/runtimes/bun/bun.lockb b/x/dhkem-secp256k1/test/runtimes/bun/bun.lockb index bbdc4df33756dc657dfbf1516f510d7753416ebd..cbaad81bb246fb584f62a95794249b950ef0c07e 100755 GIT binary patch delta 799 zcmbVKOK1~e5dQx^uia#KV||vz2WWh>m~FN;H3TiK1UwWG!IDb^r7q@CZEUtsQ!Hf<=5>go39WRHW4&yolCA>P(td&weob{j>AU?9M-PH8j0t z+-P}!Vsdu*$MMA{E0s+4TiBjxl5SnU^!ZWCr^NpA?!N3^jnyHSlG_rNyy`G!TLqiW zhtW1LHns!VkBnC55;BU%s>lI~bH)_pc~*M0we)jjO*aMzP604^Gi zhryQ3iY@Qv{s)aqo|YjKIH=cFR^j~cLL)5sL05LcQb5tEPwLT&Mm@%83W!u)Vo;kd zG`a$6m*gaKQi#VJDa8O3l~$NgIvq9S!!+7E8JkB1EyTUow=dkyzRL)HIc7u+Gs3D2Zm7+hoehx( z56pczR(^(pC}tWRBzUei`(NT75hMjZs0rAkMfCgF4sF$ySo94a(P}Yt2q6uIwD`V( q%(+~=JDty2ZT*8o*5A`Vfz#=nbv9hE`t$A4&YTI4HM6oDRK#x}Wutun delta 1441 zcmb_cdrVVj6u;kXd+FmAt;5MG2qHQ}xP90XMT^Xgz3c+*wsa6Sop49xRYF^%5^WX8 zSOR9v2LZ}9?1&rS$da)wQJJqyx((eF-NX`69GS%FmTi(f)9rk1?<7n1-%fJ!yXQN< zbM86cJ?D-jH>bbGtqz#}R9X)5N4?cl=dI+q4S79-BOSB*hQ2Xp{nA*rU*%R&5mEST zDbH?IL=B2^@lF?cUIx0DqP(quNtyFCeLMEkv7v1woVutI(RrX*XCKVy9x^RCRg&DLm8Q zc{svf0O2|R&O#R;971_?Bf@Grj~++31R#;det=>chXA^1tQKu9fKn+2ln6mmO&l>m z2ohTgN_eDSVha~Vkk~Bti5~c$GF=rp9}%}N{j`4ODQ3F#p@EV%x2bY0WC^Z3*SO-+ z?M{AM%h(guS3a{nc1Zng0h8Cf(f#;N!`)A=?|&xPefpjSzkO3)gxkbRJYt*m$*;;U zS_8p%X9BmTrY%d@0c%I%$*HQ{nsMs-d-3&4=0BuO8AEF(Gkade zOTSM(eytW-LsWP{7*GUV3L<{`NbtSS->*9rz-P63o2%U5sJ!w9Huk2RN!u}fz_a?` zrmhc~Q`P-nZgM2uy!WO#{f^7rUVN%$&>G6U+@00q#3o6i+4Owz%F~6{rpu2W+dH9% zANonbP+xOrJGrdo*N=2q8;4(LmG&hx%#?=aUK!DBuKB`WbM?1cCc)pg{jJWQZ}iNo zPJ(|F+wiXvC4Nq_1;ycj#D@DBC6+K-kPKTG8rt7~vx6VR?V- zOO7b8LuN{ib{PIED#RjRd^Sc}$l_6%K8*~87*qmE1_K5^Ld%DVCsIdft8z&sp%5yW z5psiMhJ<+|VI&nvLGVy4d_sv|mS^I2xz;1B+2CAZX~R@zHH}`>acep4{l%Oe6>WPk z-QP}=tPv4bR9H3|={N(Y2VW~FSz=)wqaH~1U!L{g5;nWxPR03_Mc<{7ARVWNg*yRF zk)7`w>)PF0IlhBN`_^$rPN$`U2y=?WJmDuGb8H;FZSfxmf)OG)0}!IW37@82A5x?Zf5bBM-x-T{8~^|S diff --git a/x/dhkem-secp256k1/test/runtimes/bun/package.json b/x/dhkem-secp256k1/test/runtimes/bun/package.json index 12fa835c2..077a1a651 100644 --- a/x/dhkem-secp256k1/test/runtimes/bun/package.json +++ b/x/dhkem-secp256k1/test/runtimes/bun/package.json @@ -9,7 +9,7 @@ "typescript": "^5.0.0" }, "dependencies": { - "@hpke/core": "^1.3.0", - "@hpke/dhkem-secp256k1": "^1.3.0" + "@hpke/core": "link:@hpke/core", + "@hpke/dhkem-secp256k1": "link:@hpke/dhkem-secp256k1" } } diff --git a/x/dhkem-x25519/test/runtimes/bun/bun.lockb b/x/dhkem-x25519/test/runtimes/bun/bun.lockb index 35ea1647521bf92f97484d9c0a824e8df7208be4..f4b3de4f81d650622f16c870cf4bfbcdc10fd728 100755 GIT binary patch delta 776 zcmbQEvQ2h^o@Viym@A#0@>b?cx7yU$?Ywp4$I1=&JkH;@J@Zny!Yxq-ASBLf2ukUq~a@s!-e z9~A-)KnW0l88F$9(Eu(8GYup-xqy*_DU4xq6_Xv)6o$#WfYf7#$-jV=V z#>rJcY8B(;UCd6BATwD&1Q38|puG&NK+H5bmPLND3yS~&6?0e$Cf9H{PWELL2hlu0 z{frF%`2PWE=E;d{;gdPocqboa^JZk7EXW={c?XbJ%I?j`KKUS!m%+|ES(W4QWCPC9 z$t9eIn@c#=8M#(K18ooI8gJwrVsGX{q9Koy|K zU3_{*<@~HmnM{mz7J8<7h6W5b7$&ddm9T@wHfO%gu~&h!b^{fd0(I({02M&e!$ke4 zUbU^ZmQ0LVKoJl)0Zb+!z`-+_g|9??9?)l?1k+++dWNxr@1F&b0|Ii;^vGpXYGJ2f zIC%n(YOZdDk*TSn<>YI8dYc6Vc$fhB CE2Fpo delta 1409 zcmdlcJ4a=Lo@S4}n{434EI}RpzB8AM-=1p9XTRhYp>DM^%z?dVt(0kxAOje1PYjn2 ziRXrJ7#K=Yi%URkIUp8dU}$It(!4;r3`&atX)Yiih{1FrBLf2`kiQQ|0}W|lW@2FA z0n%F;C+?CHFgvtg<~IAUrnP(H-`2X$Upnzd#pDZ&9J~fV-EKftKurwHlLZ;I!J-p@ zJZq>Z3rtk-G_oj=%>_E&gc`viPEYRT~A25L21oQzIfM^h(ck)DLVUpC}WG;4O zIXu0rR(~ZclTPS#si8sJg=r)3|e@6&69=C?>!6@=UEvvRbv0W>`MJh zEXxINv!wg~3s-*7ayHfA;+)Gqzd2eo)@t9@n%y~B`kn0VyLmtlFf#n({|BT&K867n z-_^(0pW0M#VBzGW21el}DJJ<@*XK?)oiBe#Df3}dy=I^Nj4iDSQY+5e=gU0$GS5fl zO^MHx$O9d#f^Jz|nW;0oc(N_4gpX}Rr0PNcyAM-#?y9}P&A0XwHygt>y`$6hbQJHe zo*LA=Iktymu}Jlkm|I`l_vkz2o|~0>^JgBL$gIUli>7~mFdNBrtdl>ogirp#$~!rf z)tixh@hi0tPDqsc?YCeF;dJnjJ_d zNEr(dgHi&B28ALhwSX{8J18B2j0Djupho=Sot(xMR}afFtG@cjRNvFeVPcFk)HBut z<^fnHV`OO)u5XkUWCEE823YkN=~*%`z%n8%OEEDT>Y3;n0d>K$DlF4MWDJ6FO95qI z`M3H_`q>Vl*GeEwhI&T8Y_%2WT~N+me0oOZ{H#lvOpJ9FdZv1Y1`PWcC+l%b*ukL=$HrB1Hl(Q^XxQZlkrb9F0>Oic|f^>y`; zxw_zB)hkJ_a>&b1$^q&uEhCawYUVtb^>An28IS@Ak77&ff!7;18Jb*hATjt8%RqsGBEG}>C+4oPsvUE zQ6b;}lmG#k0h0|G4d8+>(?Eig3m7?=f*2-OG1)OqV3@oMNZn_c{0m5_GETN)wqr_T zoLmK@mN8D=#q4AXGLr>F00D>w+RMNS#7scU4&`$IX%GO>AbHNojx54t>YT|^Jh_I$ zak4L~IEdx}n#aiSkN+Q#W}ckL7CxDSjd$`h)0hQ+9nk>bmHu()Vj}*wC zAV0DJG02Y=pjZHc7_bsOkT;ou7!(8`?}C(rl)yviPSsD&FG@wQkR(zvvQu+)D@;r*CU4`@nfyVPGgpEiM7E<$zd#fuW%mNb>^e0w^s4q`826AO_Rfj0_B%K>iLO4K$?TFOcQ| z((4%~?vfKQJG5WsHv6xpwR_{=*1FDLI`KxuZH1xmiK~Pg;( z=FyjVJ}PfYe5OPm=vWnW%j(KZo!P~cZCNFJY$GC75BlGIn6h(M?G0|ewV$}z7_R9Z zovx>&cz^ZOpyti7JsgWgs-MK%`r5un-zoRptlXPF^VmdYElyfA{quv_NUmd@{E;Pm z@()(t$)T*?jO>#avW8Dy!Nxn8mCc)xb8;YCI3w5Om2B@PD==zIp21$aIen<(K7OI04XLW>PPjeZMC&zV$=e=oq<7v55maco7}?fGWi&{ zkyIVfYoM~E#lrLqV+G&88Bis0f|G@KthgL93bIr6lk|$VJVng!{IpDmsMhNE}J(a^W>du;gdPo zcqhxUdo!|5&SVdtyaUKP3*@m+mgKlS*?_Zja|x$9Bi9C~pO0`%&g6EI`u86KfEF{b z1Mvr_G!N%wDIT@SZ@4+6K#l`Bj1`F4fY<^UARrI{Qlg{<(!~VCAoqimf|S6NgXj*J za<0i$JlXcFB0w=v5W<4C`c3-T4x!gdOpJzlhI&S33=A`YDnNn0`1Fj*`B|4TnHcLV z^i1^(4Hy8kb%VlXTHs`SAny30~MG8b?TXb6dd4{;93ESKOlI)HTe;5nN$YQ sZ6GUKEKJWZR`C6k07fMUoZy*U#An5mlbM%o1&hFo0!o|j^RqDl04{KcBLDyZ delta 1383 zcmaDL^;CI+o>r-%Sh%)qyl-o3=9nsP}&Pf^8xu>KpKb}q8J$%IDzzX zAPqF6;SG@H0n+oJ;y`6!bq5;ntvq|r`brtgM7D=V9J$O6?U%XD{;O&2-uSn*+^+MN z>fE+WN`2+HYT|{0$qkGgydpr2Wq3$qdxT1~Oo>EVH~N6OaM&Gsroxzyi@AKG45#0MZ4+aNV+abx*Ej zE_P&@?;+u0m|AF+nkGK~=+^w{ytw$Xg{SM1t-QNhFg zX4jgRy>8916Lyg|?M!>|@qOfET^5P@@F35tDHnql9$)ih;q!YB1I2k(22GXNe=oaI z{}Rh`!P_k9{{O<2AGDlJHMltEvd?dh7LB#qx3y+>PL_TryZde)&^L?>|M>p_X^$9@%5)R6&zSN`KWEpFf7zs8)uSMutWuk}y1Ety;7>GXM>OG?RErsCg7u4A2S$r3(!1}pF6 zxh&p{?2})zgfntXc4Q4_N*$oFUI0?6W(Cp> zQUXd3Amt!!pjZcCP&xo<0~rT00z@x>YQModIf*m79;6HmynrMqf5EZ?6QhBish%-V z6qW3Q9O!SO^GO#=f%To{;1H3Y@d|Uk{{cMMj#%m>zCPO_VV3vbr-NmP8 zRL;-3l*zqTf5;Cwn&Y5p>>{Z~b-9QDVK%IIfAO#Lw5?mTUAAmpx z-{d5&GO1jk??7cji-qYK#tOcFGoaGGf|EaSSxxrgk#>d_H~PBzP?oNtp0S>RUP*eD zLtcJTPO5%#Wjuh07+`rLki0C4T_6PzTXn&a092v2If|Q&2>@KCdR_nk diff --git a/x/hpke-js/test/runtimes/bun/package.json b/x/hpke-js/test/runtimes/bun/package.json index 784368fb0..f4d30f4f5 100644 --- a/x/hpke-js/test/runtimes/bun/package.json +++ b/x/hpke-js/test/runtimes/bun/package.json @@ -9,6 +9,6 @@ "typescript": "^5.0.0" }, "dependencies": { - "hpke-js": "^1.3.0" + "hpke-js": "link:hpke-js" } } diff --git a/x/hybridkem-x25519-kyber768/test/runtimes/bun/bun.lockb b/x/hybridkem-x25519-kyber768/test/runtimes/bun/bun.lockb index 62035cea10911ae97f4091a7901a783d100d3e98..558dbfccee637f47b004a441369a8b98d1b01aa8 100755 GIT binary patch delta 786 zcmbV~O=uHQ5Xawp$!2$x-A(+!mQWkeTGOIyRvKM`mQ;HSBDt7@y-0~RZLy(EF{UCt z^dQAU!(7yZ3Z*DgikM4?9u!nWBNV}_2Yaz?4pIu&>fJxg{@(1&yxn>87Q0sW zE|@(%_4(yP(aO)@#pNsM=-rjIhWBwbz2_Vc@h9E9{vc^EM`}3}8O*BN4r7JvRDsrM zvNFHo zt5Q%8a{t5DAwN?g7dRPi{@#}R!(Uoq#SdYv8yW#EOnp+1J~ZmlrYWF?oD`GV^q|oZ zP`i{)X>JK|p;b}}KuPO``&!?qJA_By&JN9d>Kzx-ZcGf~5Z### Gr)r9j4r8PX zBTGmc`%L4~`x`qq_X%#9mU;9TW9zNR;=5Z{?~Q)Q34Yx++*QXT8ElOQM(2ZRfxR_OhHtjjT%QkO;K{RuOMQQU3!M1Si}poZ%DT= z|HO!PCh3pegP(2qX~&wrBfhC-n4o1UD@MPFUKm7)KuzbwcaNg=cw$#9?5c0wzl&=I znMdRPxfq`R?<`Cu4NLs>tQ3Q$2f=~3o|CDK3&u(w7|YmXc*3@QQmGp+iFT-O z1ny}<1-@D6ZH(+((6Q&{`E?~zuWwZxylTs&wBg=h*U3x!X1<3`@#0po)A97TRc9T6 zvG*2`%_0|>$e#u#qX+T#MPxS=d!uBGcM!VgJ0YKl(l6K=FI4O_P~;# zmma&=fTht?Y(WfBgjEV6E(wo)aQef>;{iBjG&{Xj7I)qGUdZc9JCRX4zq@t$TdVvZ zy_T*CeYMK1{qDCz_RQ;Edsq4K_5nw<@SC?+^mxE3Nwr&_Eq~*2<13LWw^) ztOU2*n$A}kyT=Q$$REF!a9YU1sN9@EnnH{!K_!iWjURU_#*Qb_NZhgtNhEP0uB1oE z4U!%b`i+EtS^Xx4e!;{&#u@(^%*r<>nxC@` z$rzF~F2aZk!^Y4i&cd0I8$cyPEQ}-1V6y*WRw5-#cFXnZGwq9h%pgG~&Wr#LirW$2v+TpnjKQdel;l&M9+BOrG_G5SMU_c3(H!${784*WCWGpz5-`q;XX zq4oGFBH772)+9rl@+lZqnl)i8jl3mo1$kf4&B-x;!lgqEi`YU%aZO{r%TVcVazP!N z1|e1p^{kFDkWah^2i}O}*FK%#e+=Px>nzp(;38UsEPmRk1!z%3(p5-?TxdwiL m(H71KpQzFkJRglbzlif@!awx)DF}&&;XjO2R^&7*W&Q$gkal1I diff --git a/x/hybridkem-x25519-kyber768/test/runtimes/bun/package.json b/x/hybridkem-x25519-kyber768/test/runtimes/bun/package.json index e342c170a..581862ef3 100644 --- a/x/hybridkem-x25519-kyber768/test/runtimes/bun/package.json +++ b/x/hybridkem-x25519-kyber768/test/runtimes/bun/package.json @@ -9,7 +9,7 @@ "typescript": "^5.0.0" }, "dependencies": { - "@hpke/core": "^1.3.0", - "@hpke/hybridkem-x25519-kyber768": "^1.3.0" + "@hpke/core": "link:@hpke/core", + "@hpke/hybridkem-x25519-kyber768": "link:@hpke/hybridkem-x25519-kyber768" } } From 9959915bb64afe70e7b1f3218c84b8b7df419b0c Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:13:28 +0900 Subject: [PATCH 4/7] Add bun-link to deno task npm. --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index 9159baee4..17d11a1bf 100644 --- a/deno.json +++ b/deno.json @@ -48,7 +48,7 @@ "test": "deno fmt && deno lint && deno test -A --fail-fast --doc --coverage=coverage --parallel --allow-read", "cov": "deno coverage ./coverage --lcov --exclude='test'", "dnt": "deno task dnt:core && deno task dnt:chacha20poly1305 && deno task dnt:dhkem-x25519 && deno task dnt:dhkem-x448 && deno task dnt:dhkem-secp256k1 && deno task dnt:hybridkem-x25519-kyber768 && deno task dnt:hpke-js", - "npm": "deno task dnt && deno task npm-link && deno task npm-pack", + "npm": "deno task dnt && deno task npm-link && deno task npm-pack && deno task bun-link", "dnt:core": "cd x/core && deno task dnt", "dnt:chacha20poly1305": "cd x/chacha20poly1305 && deno task dnt", "dnt:dhkem-x25519": "cd x/dhkem-x25519 && deno task dnt", From 2f66a75ad52aa1fed0203c81cf4fa5fc27c18903 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:14:12 +0900 Subject: [PATCH 5/7] Use bun link. --- .github/workflows/ci_bun.yml | 44 ++---------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci_bun.yml b/.github/workflows/ci_bun.yml index 3eac10acb..5e844b9c5 100644 --- a/.github/workflows/ci_bun.yml +++ b/.github/workflows/ci_bun.yml @@ -30,12 +30,8 @@ jobs: bun-version: latest - name: Install esbuild run: npm install -g esbuild - - name: Prepare test for ./x/core - working-directory: ./x/core - run: deno task dnt - - name: Run npm pack for ./x/core - working-directory: ./npm-packages/x/core - run: npm pack + - name: Prepare test + run: deno task npm - name: Run test for ./x/core working-directory: ./x/core/test/runtimes/bun run: | @@ -43,12 +39,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test core.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/chacha20poly1305 - working-directory: ./x/chacha20poly1305 - run: deno task dnt - - name: Run npm pack for ./x/chacha20poly1305 - working-directory: ./npm-packages/x/chacha20poly1305 - run: npm pack - name: Run test for ./x/chacha20poly1305 working-directory: ./x/chacha20poly1305/test/runtimes/bun run: | @@ -56,12 +46,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test chacha20poly1305.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/dhkem-x25519 - working-directory: ./x/dhkem-x25519 - run: deno task dnt - - name: Run npm pack for ./x/dhkem-x25519 - working-directory: ./npm-packages/x/dhkem-x25519 - run: npm pack - name: Run test for ./x/dhkem-x25519 working-directory: ./x/dhkem-x25519/test/runtimes/bun run: | @@ -69,12 +53,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test dhkem-x25519.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/dhkem-x448 - working-directory: ./x/dhkem-x448 - run: deno task dnt - - name: Run npm pack for ./x/dhkem-x448 - working-directory: ./npm-packages/x/dhkem-x448 - run: npm pack - name: Run test for ./x/dhkem-x448 working-directory: ./x/dhkem-x448/test/runtimes/bun run: | @@ -82,12 +60,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test dhkem-x448.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/dhkem-secp256k1 - working-directory: ./x/dhkem-secp256k1 - run: deno task dnt - - name: Run npm pack for ./x/dhkem-secp256k1 - working-directory: ./npm-packages/x/dhkem-secp256k1 - run: npm pack - name: Run test for ./x/dhkem-secp256k1 working-directory: ./x/dhkem-secp256k1/test/runtimes/bun run: | @@ -95,12 +67,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test dhkem-secp256k1.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/hybridkem-x25519-kyber768 - working-directory: ./x/hybridkem-x25519-kyber768 - run: deno task dnt - - name: Run npm pack for ./x/hybridkem-x25519-kyber768 - working-directory: ./npm-packages/x/hybridkem-x25519-kyber768 - run: npm pack - name: Run test for ./x/hybridkem-x25519-kyber768 working-directory: ./x/hybridkem-x25519-kyber768/test/runtimes/bun run: | @@ -108,12 +74,6 @@ jobs: nohup bun src/index.ts & sleep 3 deno test hybridkem-x25519-kyber768.spec.ts --allow-net --config ../../../deno.json - - name: Prepare test for ./x/hpke-js - working-directory: ./x/hpke-js - run: deno task dnt - - name: Run npm pack for ./x/hpke-js - working-directory: ./npm-packages/x/hpke-js - run: npm pack - name: Run test for ./x/hpke-js working-directory: ./x/hpke-js/test/runtimes/bun run: | From c6ad42b77a723e44d0fe37d2ad8435b838deb8e8 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:17:07 +0900 Subject: [PATCH 6/7] Fix lint error. --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index 17d11a1bf..b19b099da 100644 --- a/deno.json +++ b/deno.json @@ -79,6 +79,6 @@ "bun-link:dhkem-x448": "cd npm-packages/x/dhkem-x448 && bun link", "bun-link:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && bun link", "bun-link:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && bun link", - "bun-link:hpke-js": "cd npm-packages/x/hpke-js && bun link", + "bun-link:hpke-js": "cd npm-packages/x/hpke-js && bun link" } } From 4dc967da1fd09d33c27d550406925a3c36afc171 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Sun, 1 Sep 2024 18:24:42 +0900 Subject: [PATCH 7/7] Separate bun-link from deno task npm. --- .github/workflows/ci_bun.yml | 4 +++- deno.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_bun.yml b/.github/workflows/ci_bun.yml index 5e844b9c5..be04d47b7 100644 --- a/.github/workflows/ci_bun.yml +++ b/.github/workflows/ci_bun.yml @@ -31,7 +31,9 @@ jobs: - name: Install esbuild run: npm install -g esbuild - name: Prepare test - run: deno task npm + run: | + deno task npm + deno task bun-link - name: Run test for ./x/core working-directory: ./x/core/test/runtimes/bun run: | diff --git a/deno.json b/deno.json index b19b099da..4173ab439 100644 --- a/deno.json +++ b/deno.json @@ -48,7 +48,7 @@ "test": "deno fmt && deno lint && deno test -A --fail-fast --doc --coverage=coverage --parallel --allow-read", "cov": "deno coverage ./coverage --lcov --exclude='test'", "dnt": "deno task dnt:core && deno task dnt:chacha20poly1305 && deno task dnt:dhkem-x25519 && deno task dnt:dhkem-x448 && deno task dnt:dhkem-secp256k1 && deno task dnt:hybridkem-x25519-kyber768 && deno task dnt:hpke-js", - "npm": "deno task dnt && deno task npm-link && deno task npm-pack && deno task bun-link", + "npm": "deno task dnt && deno task npm-link && deno task npm-pack", "dnt:core": "cd x/core && deno task dnt", "dnt:chacha20poly1305": "cd x/chacha20poly1305 && deno task dnt", "dnt:dhkem-x25519": "cd x/dhkem-x25519 && deno task dnt",