From a784abc1b02cdf00548ebd1bc20205c3444ddae4 Mon Sep 17 00:00:00 2001 From: Miel Truyen Date: Sat, 20 May 2023 21:57:36 +0200 Subject: [PATCH] Build-fix: update snapshotting code to generate a predictable (A-Z) ordering of the snapshotted files --- test/basic/snapshots/test.js.md | 12 ++--- test/basic/snapshots/test.js.snap | Bin 1089 -> 1087 bytes test/multi-entry/snapshots/test.js.md | 58 ++++++++++++------------ test/multi-entry/snapshots/test.js.snap | Bin 1427 -> 1427 bytes test/util/test.js | 5 +- test/watch/snapshots/test.js.md | 24 +++++----- test/watch/snapshots/test.js.snap | Bin 776 -> 771 bytes 7 files changed, 51 insertions(+), 48 deletions(-) diff --git a/test/basic/snapshots/test.js.md b/test/basic/snapshots/test.js.md index 8e8f824..6d98cb5 100644 --- a/test/basic/snapshots/test.js.md +++ b/test/basic/snapshots/test.js.md @@ -58,12 +58,6 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 [ - { - code: undefined, - fileName: 'script.html.body.script.js-e3b82208.js.map', - map: undefined, - source: '{"version":3,"file":"script.html.body.script.js-e3b82208.js","sources":["../batman.js","../script.html.body.script.js"],"sourcesContent":["export const b = ()=>\'batman\';\\nconsole.log(b());\\n","\\n import {b} from \\"./batman.js\\";\\n document.body.appendChild(\\n document.createTextNode(`Inline script including ${b()}`)\\n );\\n "],"names":[],"mappings":"AAAO,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC;AAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;;ACCJ,QAAQ,CAAC,IAAI,CAAC,WAAW;AACrC,gBAAgB,QAAQ,CAAC,cAAc,CAAC,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzE,aAAa"}', - }, { code: undefined, fileName: 'script.html', @@ -83,4 +77,10 @@ Generated by [AVA](https://avajs.dev). ␊ `, }, + { + code: undefined, + fileName: 'script.html.body.script.js-e3b82208.js.map', + map: undefined, + source: '{"version":3,"file":"script.html.body.script.js-e3b82208.js","sources":["../batman.js","../script.html.body.script.js"],"sourcesContent":["export const b = ()=>\'batman\';\\nconsole.log(b());\\n","\\n import {b} from \\"./batman.js\\";\\n document.body.appendChild(\\n document.createTextNode(`Inline script including ${b()}`)\\n );\\n "],"names":[],"mappings":"AAAO,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC;AAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;;ACCJ,QAAQ,CAAC,IAAI,CAAC,WAAW;AACrC,gBAAgB,QAAQ,CAAC,cAAc,CAAC,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzE,aAAa"}', + }, ] diff --git a/test/basic/snapshots/test.js.snap b/test/basic/snapshots/test.js.snap index e34aabd048f2ae3d2a4605f061108cfe408c192f..9432e768e9bc7d8d350ff6da75b0af915f2a34cf 100644 GIT binary patch literal 1087 zcmV-F1i<@2RzVW~6Pku(( zTbZhUv>%HI00000000B6R?Tl4MHHX0y|&qYB%u|8+iF3ojW%|hqBg`IFfmb;LTa_4 zDg{@{evIP{`(f>_NkZgGz!}b*kczlci4#{OE^vi^0I3p3gw#_HAl~e*H@j=c32{gI z?Y^0L@6FqJ^X9jYx{6_|AG@D_OFi8)XxG)vzCm@@lKXDY_T0}NX`1ZG_wx_4sDN0* zMVxyB-YbB20ByhpoL|5kaU6LcEsH-|8fa2DY+7=IWTgY+ePV_*DA(YCE<|Re;Oxe0r@W*RjS@ z*Rhx*3qF;t0HPUW40<9V zjNt9}X+tz^Z2-Az)~kVj;DG1rRo@*fz?Nk7S@;G{?010Q0Zk5}y8sLD6&Kd&3!9^w z!P&7=&8PQ{ZP3&rN$%$;ucLvR&o8@vJ$}y})+6ViCx7_Y*l-~{ul~eev5E7^gPaPz z5LSxc&#^}_aVh5#mvRwjF60qjlkMQe;&q^dep_UQX`&$|VCQ`%bhPl6DJqFbsl(4csQ*A8Hj;Z`}}seAkL@`!|wyS--2;_D|5<+MruATyCsPqy$BmX%odXfMx?g(b0L#j^_k zs{S99G8DRwZ3-PR7FI{BCAE(}bVPfITpgye~30?nT<5d+$Q99z#u258q#Xr zJTwga_|iQ>?lC`3OWIx~WP3HHr4pjX-0i~r?&_h}m=ryjt54S?nGjhV{s(!&@f1f4 F000zG7JmQ$ literal 1089 zcmV-H1it%0RzVOdUGHw)k0i9J!~w}NNZm!wZkwVuWItfCL{$pu zstr{sY^C^PHtS%ISGJcXM5zRv;ZHy+;z|(*#1)AP+z|Z-IB`TsoRB#1#`bP(?`9K{ zjP$eL%)IyJdES?wb~Ve;~_OOGlQ^*a2DaS7{4D11NAw7Y<=WI%( zm=rmWa1P-a;K^L#A0o`*obDKOIH9`3JYUkJhEysynpZT{w^eqfCh~R1q7}>8ENP{3 zxh9HqyYINZv;NUSkx<9Ud2}XV##!nhp57ckz)AvEO4f})h3e0Y8^Eu25(V>!cgD=tsAJ|)KOn5-~vjxd+` z3+>7uQP(paCNEuAWPY5yB#$2=D{?65$x9!|l}a^a;X98;TP=tAl=++^^1}h1>##A` zbr@H~;8XbtK-!_lU?vkn9x7{uw3HTq+#=+bvP#IRvQEf)4VGSCR@#KLW819}_X;5^ z0ab$`@158KqR9-pUFrF@b zBl$ah+K_F>7=Z7Z^=il;DiFnbHBbi!@FRJC7QTdt{TlEb&=e554`6^VgeXtXtPgVr zXU9@CpT0YOK~s|?d7neS4i|2po_B+M{6^T%MVB^o&#)V`cr%W$I znG(!%{83C4J;jtymv^Y-=eQ{&OV7nqa5Bra={Y!| zdPe=pHkoBIIv)noc$*Riu{M>x3hx_$HxFx3nV=iJJ!(-;q80@m<2xXK0Q?4c37XB# z!~4>=&{Vz${0jINa53dR<#wSh%`)!dm=ZW@0Tq z+QC!mv%;qbYdO98t;iiF#RmN41ie_>le(^BOC338R!6QSxeZ4j*l>Di9ux`6j8@OI zj8c*>!K=Ge_368G+rI<8EN!d?kt;(g4g zKHVkcZdiMcUZhB?b$eeh)Dut-2zkKuxGiOKnUKxp7?)0n9#i)i_8%|rYmHH(2Uqp+ zilP#to Snapshot 1 [ + { + code: undefined, + fileName: 'admin/index.html', + map: undefined, + source: `␊ + ␊ + ␊ +
␊ + ␊ + ␊ + ␊ + `, + }, + { + code: undefined, + fileName: 'admin/index.html.body.script.js-15dfaff3.js.map', + map: undefined, + source: '{"version":3,"file":"index.html.body.script.js-15dfaff3.js","sources":["../../app/admin-deps.js","../../admin/index.html.body.script.js"],"sourcesContent":["export function adminDeps(){\\n return \\"robin!\\";\\n}\\n","\\n import {bootstrap} from \\"../app/app.js\\"\\n import {adminDeps} from \\"../app/admin-deps.js\\";\\n bootstrap(document.getElementById(\'root\'), adminDeps());\\n "],"names":[],"mappings":";;AAAO,SAAS,SAAS,EAAE;AAC3B,IAAI,OAAO,QAAQ,CAAC;AACpB;;ACCY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC"}', + }, { code: `const bootstrap = (el,deps = [])=>{␊ el.innerHtml = \`␊ @@ -41,18 +68,6 @@ Generated by [AVA](https://avajs.dev). }, source: undefined, }, - { - code: undefined, - fileName: 'index.html.body.script.js-45303f0f.js.map', - map: undefined, - source: '{"version":3,"file":"index.html.body.script.js-45303f0f.js","sources":["../index.html.body.script.js"],"sourcesContent":["\\n import {bootstrap} from \\"./app/app.js\\"\\n bootstrap(document.getElementById(\'root\'), \\"\\");\\n "],"names":[],"mappings":";;AAEY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC"}', - }, - { - code: undefined, - fileName: 'admin/index.html.body.script.js-15dfaff3.js.map', - map: undefined, - source: '{"version":3,"file":"index.html.body.script.js-15dfaff3.js","sources":["../../app/admin-deps.js","../../admin/index.html.body.script.js"],"sourcesContent":["export function adminDeps(){\\n return \\"robin!\\";\\n}\\n","\\n import {bootstrap} from \\"../app/app.js\\"\\n import {adminDeps} from \\"../app/admin-deps.js\\";\\n bootstrap(document.getElementById(\'root\'), adminDeps());\\n "],"names":[],"mappings":";;AAAO,SAAS,SAAS,EAAE;AAC3B,IAAI,OAAO,QAAQ,CAAC;AACpB;;ACCY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC"}', - }, { code: undefined, fileName: 'app-01141b67.js.map', @@ -78,23 +93,8 @@ Generated by [AVA](https://avajs.dev). }, { code: undefined, - fileName: 'admin/index.html', + fileName: 'index.html.body.script.js-45303f0f.js.map', map: undefined, - source: `␊ - ␊ - ␊ -
␊ - ␊ - ␊ - ␊ - `, + source: '{"version":3,"file":"index.html.body.script.js-45303f0f.js","sources":["../index.html.body.script.js"],"sourcesContent":["\\n import {bootstrap} from \\"./app/app.js\\"\\n bootstrap(document.getElementById(\'root\'), \\"\\");\\n "],"names":[],"mappings":";;AAEY,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC"}', }, ] diff --git a/test/multi-entry/snapshots/test.js.snap b/test/multi-entry/snapshots/test.js.snap index b9a63ee20954ed5a7b338fd7f941fe4117ac4ba9..010356908959422d65322175356b8ae3e55ee338 100644 GIT binary patch literal 1427 zcmV;E1#J33RzVJ@1=&AM@tTZ{CdeVWZx()H}|DPpGTAO?t;@H(h<1ny%f^9aCvJ`0(}uQ zIX7nVr-)E^9-*gzHi6XnfQdL}^7(m$z6AOK=nCva;R-2Tu<<6$Im}U{Dmok2TOL;Mu zdj@+6*@7T+^VXYhyjC1$HOr=-^`-@ZEw5hE8cL(F27DGWEEaN}%*%lYZJsa4Aj|2Q zS2-74~z&zVCu_6RJdx1L_;%NiuwQ|d{M zpAfk@@K&)*7Z#5>rS~|3CPG3seVCAYppZ#kHoLM3!+P@m)5qcfFFg>-q#t#w1!2fX zm<kfa-#3iL8bs|-e!%C4u+dWZ6iDoLuxZAsFW$1#^f=e&<}PXITdswk+I>A1cv zU&M>FnPF)HcJJm=vE*%O+RW;vN$qQZ2$0l9>P=}gZD699rqzKt6a4HU028Z-pd{BYbyS7rC`-Coe2tna#qPfDU(j*vai6vZekY28443HWD*2qe0*_6|13p=&|#}{^iep9rT$F%EBzJv?-e|Lyzixk$NL;#D&BqI>yGun z#RVVv1Q$k87syephkV|Su%GzIXM^a-XM?y9dIYY&PmO+Chy|5?28CY(O7Y+a2muM_ hStx@@6C>yPM4ixIX!?`=e|X0f{|4Z^*%&Jl007Mrx<3E_ literal 1427 zcmV;E1#J33RzV00000000BsSlw^iR2273nvc0_lWKiHh=+?oN-L#KOItQIAHoS`E21l- z0#WLTIQI4GEw+R0tjoFxjR*K25Il@0B;I&~7X%W5{{sOMAAbQ7;#}KtY$xr~b`kpRO0DTJdYtnTZHOY*a^imA-KG4TNzX469VT!ywi*M{k3q=?>DXqG)$(TLm3+ zl3|!V&A7$k=Z`qez_Mf$d`PfCh=LsxI|ODDn=lV3iA_vwS?U1GbA29PBZf?{bD-H+ z)!GD$1yCclSfG}gA-B5c|CUgmGxye@Uv z*w$ugfo8bMV!qxp=`akr7RRIP$?`H!BNF94N?=i#q!Vz4b6Zpr)vOK_b>x@T)8X=n|sAw zLD(%e1ffy9AqY1-P8I~&0GGxCI5xuwREHTq5qJ~yST9xaCOb@E&}GG-&5E?o zipMwFpwot1tvI&V4w~($x@|1DG40mVX!_66u@D3R?oqTfJd9iwgsUOkxSWebSKy9O zjw12CFBvLEJ$Ps>uGIx$t?p@Ef$=MiKzezzsDo7ZrLMPuY^6TD4+gK7;d%n-WrsEF zte{;$6>46q91uzI&Nh`&h^M77dM3h}Qsro=;A-&`lUG8q)9a8br<+O_9)Q}QZo#pL zo{a(k`{k?PJ^|q;qyPu2Q&cOzokBMqf99I_?7~(`p3GYj3-|8oVL#{&ojY6kc;7i| z&ffX=b2c_9RwwZ{GkFXDAHF8D{{a5QTgEFA0016ZpmG2J diff --git a/test/util/test.js b/test/util/test.js index ef3e693..1819db7 100644 --- a/test/util/test.js +++ b/test/util/test.js @@ -10,7 +10,10 @@ export const getCode = async (bundle, outputOptions, allFiles = false) => { const { output } = await bundle.generate(outputOptions || { format: 'cjs', exports: 'auto' }); if (allFiles) { - return output.map(({ code, fileName, source, map }) => { + return output.sort((a,b)=> { + if(a.fileName === b.fileName && a.source !== b.source){ return a.source b.fileName? 1 : 0); + }).map(({ code, fileName, source, map }) => { return { code, fileName, diff --git a/test/watch/snapshots/test.js.md b/test/watch/snapshots/test.js.md index 1ae170e..a1117bb 100644 --- a/test/watch/snapshots/test.js.md +++ b/test/watch/snapshots/test.js.md @@ -9,6 +9,18 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 [ + { + code: undefined, + fileName: 'index.html', + map: undefined, + source: `␊ + ␊ + ␊ + ␊ + ␊ + ␊ + `, + }, { code: `const a = 2; // If i show up as a changed file, then the watch test has gone wrong!␊ ␊ @@ -38,16 +50,4 @@ Generated by [AVA](https://avajs.dev). map: undefined, source: '{"version":3,"file":"watched-file-8c4729c5.js","sources":["../watched-file.js"],"sourcesContent":["\\n export const a = 2; // If i show up as a changed file, then the watch test has gone wrong!\\n "],"names":[],"mappings":"AACgB,MAAC,CAAC,GAAG,EAAE;;;;"}', }, - { - code: undefined, - fileName: 'index.html', - map: undefined, - source: `␊ - ␊ - ␊ - ␊ - ␊ - ␊ - `, - }, ] diff --git a/test/watch/snapshots/test.js.snap b/test/watch/snapshots/test.js.snap index 949ee1abeb321ac130d7bd1aeff08df458332586..8b1614a833d953b4b5710400749ce359425b6a62 100644 GIT binary patch literal 771 zcmV+e1N{6!RzV3ND{!92+wYk0MT@a@TR5H{b32T^K*ZZSu4@Z>N&AvR1tcF_#Q7;`D}cLzMZg8D zjbhb`BD;fe&nlHl2xe#>} z=bgZ1NvANBnJTXME%v}}v)+L2bC+$DJ<)DuTyt$ZJUoaN2Wyej5Am`p*)vs-+3t)^ z;HjGX>_*^rQZwnsPUMGz#F0~@NhO&(A(NW8PMrW#K z%1XoNdeuyV!e``%PuK%>RC$A(fX9N^q(&yEiD{C1E5s)tpLMbp5<7+&$Fq5pxkTn- z5aBT{UnEJ92nK8q{F(uWu_)lpab0H{VGs$j3GA(D-88R}bYm9mF!Xuz@x%MIqgGgk z&DBq;&BdeG2oGcYAupx4SF2-+BrEuzI=OP(O8!wfaI7}z3l_zGz-i^WL1k=OIa(G5 zP5CjcEYot?-0vvopYGzaN(R6Ed3ObPS<(E0^mP`!Hb}9hqQOl|~?-&cv z7*}GI2@Un;0IfQzn~2R}@J8R!h0t@_;4QCZojh>h8K*+_R{*#EIhjg7)AI*)cDQ3hKV6+c_&+8nRw)Yy007U@ BaWnt` literal 776 zcmV+j1NZzvRzVVka0%S{?!+DlO*f#!@Mwq)Cw}RfR;U1meK! z;Mm*PC0SechPJ9I)E|I2ap6|ZNE{FsPW%L}969g<5JCvJFzY03;yys2uJrBB?#?$m zp4nM%F4mi&`zYCX$wVNUj4eCD^@D^vQR0Up+1T_vM>u!2PdQQ`vOy8@6F627*ANSc zN>AkosrX)siZrQyMezsX6%g_n@e{gcwT1c; za|I|{;_&crN;#zvGK!c)v=Psg45hGx@;XPzTf_&%FT}}whEg1)3=zl^D4~vWLVk!k z0(m#|Sa+g4CvM0SK^ENZAa8eaL4r>-e4YG44TZO!e?A|Gz~Nr z4B0;FHA0SSamX9zbe*k4VJzqxve&0{%Q{b!upPT>-ie}sH}2fJQA_E}8eXi<2PaM&*KONZUrm*y||6G&=mmsN6ToWvgFN?myg8mHzM6v@cKQ7%k}-imlECz?os&GmWd}JPziJ?B;BH&YZRF*(q$s`hVv| z54gux%D!kd|1k^jq$=6dRi8QDv@U~Hwff|G=&g3dbegzv5DA*ZZf);GQL!4an$Zfq zHfD6XYIRs0GrC^2Qlof`JXn@|;S1j8?+8;RWC^i>c!7AQc1!=z?Ots`Zb$WN*$7IH z{-TTqW7|txZ((%bA<