From f5609361a3599124297f76673d5215ea3d814b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 1 Nov 2021 11:53:13 +0000 Subject: [PATCH 1/5] fix: omit duplicate functions from list of bundled files --- .../build/src/plugins_core/functions/utils.js | 5 +- .../netlify/functions/function_one.js | 3 ++ .../netlify/functions/function_one.ts | 3 ++ .../build/tests/core/snapshots/tests.js.md | 50 ++++++++++++++++++ .../build/tests/core/snapshots/tests.js.snap | Bin 6524 -> 6600 bytes packages/build/tests/core/tests.js | 4 ++ 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js create mode 100644 packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts diff --git a/packages/build/src/plugins_core/functions/utils.js b/packages/build/src/plugins_core/functions/utils.js index a88f1e8cda..1ac7eaaaaf 100644 --- a/packages/build/src/plugins_core/functions/utils.js +++ b/packages/build/src/plugins_core/functions/utils.js @@ -21,7 +21,10 @@ const getRelativeFunctionMainFiles = async function ({ featureFlags, functionsSr const zisiFeatureFlags = getZisiFeatureFlags(featureFlags) const functions = await listFunctions(functionsSrc, { featureFlags: zisiFeatureFlags }) - return functions.map(({ mainFile }) => relative(functionsSrc, mainFile)) + const dedupedFunctions = new Map(functions.map((func) => [func.name, func])) + const relativeMainFiles = [...dedupedFunctions.values()].map(({ mainFile }) => relative(functionsSrc, mainFile)) + + return relativeMainFiles } const getUserAndInternalFunctions = ({ diff --git a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js new file mode 100644 index 0000000000..710c8b9fd4 --- /dev/null +++ b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js @@ -0,0 +1,3 @@ +'use strict' + +module.exports = true diff --git a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts new file mode 100644 index 0000000000..cdd6992b75 --- /dev/null +++ b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts @@ -0,0 +1,3 @@ +const handler = () => true + +export default handler diff --git a/packages/build/tests/core/snapshots/tests.js.md b/packages/build/tests/core/snapshots/tests.js.md index 047a657ae1..0ce68aa205 100644 --- a/packages/build/tests/core/snapshots/tests.js.md +++ b/packages/build/tests/core/snapshots/tests.js.md @@ -2245,6 +2245,56 @@ Generated by [AVA](https://avajs.dev). ␊ (Netlify Build completed in 1ms)` +## Removes duplicate function names from the list of processed functions + +> Snapshot 1 + + `␊ + ────────────────────────────────────────────────────────────────␊ + Netlify Build ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + > Version␊ + @netlify/build 1.0.0␊ + ␊ + > Flags␊ + debug: true␊ + repositoryRoot: packages/build/tests/core/fixtures/functions_duplicate_names␊ + testOpts:␊ + pluginsListUrl: test␊ + silentLingeringProcesses: true␊ + ␊ + > Current directory␊ + packages/build/tests/core/fixtures/functions_duplicate_names␊ + ␊ + > Config file␊ + No config file was defined: using default values.␊ + ␊ + > Resolved config␊ + build:␊ + publish: packages/build/tests/core/fixtures/functions_duplicate_names␊ + publishOrigin: default␊ + functionsDirectory: packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions␊ + ␊ + > Context␊ + production␊ + ␊ + ────────────────────────────────────────────────────────────────␊ + 1. Functions bundling ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + Packaging Functions from netlify/functions directory:␊ + - function_one.js␊ + ␊ + ␊ + (Functions bundling completed in 1ms)␊ + ␊ + ────────────────────────────────────────────────────────────────␊ + Netlify Build Complete ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + (Netlify Build completed in 1ms)` + ## Generates a `manifest.json` file when running outside of buildbot > Snapshot 1 diff --git a/packages/build/tests/core/snapshots/tests.js.snap b/packages/build/tests/core/snapshots/tests.js.snap index 44413dfba3b7d990a3775b64f4391731183479ac..dc79342437304ef558f068ed101ea7d842fd3922 100644 GIT binary patch literal 6600 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 GUjYDnu+jGb literal 6524 zcmV-?8H46QRzVirY zCU2AVf^iZryIwHhu-r$C*%u6nxxp-W2{<8Sc`>)wCYvmq#xbaUN`_ReE$EzxL3kI-WqEpT=>2)wkxZLwEl3#@eIK z@3}yHdp}R0-L)Kd{J7uDdpTiLHwK=1_=9&}`H&~jnmY8mW%1v?erVRtKi${7@ANSj zjOGb6Jdfk19eA<%fzPgjw_bnCmCI_{TX+I}w~6C?vkzAvyLzg-o6i$y$4ZWy z>pyybHX`k-tg(uUre6C6X>ES$F)y8 zZPl~;yKm?L4ZB-zxP1{%pcl#<*U9xhd-#FnAh!Lj8xB9e=whBgxgL&Nwol%+;jyu! z+NR$2#&>`FraX#3|7RopU33-4UH0WMbGAIbVJbCXmFTFNl(M@0H33T%hI4*kB)yM38Xv!yV zJv#YYOQ!$p=RASV{uk6E-~8(K@fY<>zvbUTr#$)bsXyik^vSz8PW=7ZD`y`3)xq;? zMtv!4ziu;6pq-C!oIGdU-j^@mK6MXxZR+u3ufLHe(B?fHr;3U8HO&wF^`g2Hued^lu%x_o=%- z;0bi%n;iG;U)TTP@mJ2;chB$kfAW`GC;TT*pl==IxNDEwvhGBpBetzrsF8|gGoGh_vr^V ze>>Lr(c@dsxn|3k>v#%%2yy8rGbQQ0|9$`3wiAM(i5>69DD+Vzv(G&DP){Iq?OQu9 zd;7?n!L9^_u0NaSUfy(M{@0#(`?${=U;C=_@WZ{OB9A#tq#o(JzZd;ilHzci6T!?SqqodXT~zqd3N{lVx5_n&j;T|cAH z*leEr`0wJI8lGRY?wKPme*VILePbns?yBdx-|w0GvzHDWIP(xZa*O=8-`qr@-&n|V zUv@9QYr#olwg+a6tzLGhcOr$p-^z1e-MZzp^?RmmFit(=7mr*r<#7rPbn@J2ZamRa z{8(_$>Y#Mgqxr=8DMltq82NFrvVd%6J5J1BDU69HPXiEa6RU2LRBJ0SjTcO z@`XBmST`u~gamb1LBo1lDhI+Q2O>a}L2X={o}$XRe98qiMr52Pz%M8 z@{pib28ui@S^22(Y=}yy#B*>nLv=@BR4^pWL;HsG`t?lo--h5NSD70t;(ZTT`&LWx~5cC+(71B2P z%uof~B4RoHRoO5$Qk$gV_XN2QIE^Hh5R9u^)E!O+P?49B6_>4l0O~LNVwa#n2Q+Jo zG#&d8W`lZDUB3)B!Vi|>enhmY5WNR`U_OmSlc;pW{jl6gV5+MHz`{(<3`A^J!dy2% zFi;1f(q!0yZUg&YIo#%y1_%kUSNJsV%!!zV4Sa zV1d=LB?t~$8V7|t1z`jxB&9Ej(n8os;233Tx`^m}M@v$5eaWf~Q>WE_Xc;O39iYyd zq@P=py{a5dRRuX5OFryOj$-<#L~TWeW+wg5ry^?#ut`N~7JUcEKZ7%Y=!bq}4$(No zJ{huC35^&<#n6!rgkgig(IANrKw%V_-@*Agsa8csWDrYY{y42l8+wKuNYEw90-_i} z(ZI6IM3?1X#041*HaU`&K66$%0P&XQPpfc1_UcfAaindnqD?Z<0yelrJX4}k!d6=U2lC}YBk*w5dP{(~f5Xh`W?wz0*Rc% zWwM1*)N>(B@g<)fKk~h27ML2^z*JZW$6zF6M`Q|)NY!9kY6^%+rBaknFe(LuyC{^Y zOzQv)#}w`~hgjG@|Lf#(XQ&Yvu`oC&gDqC25 z$dkSADn4{ITWs<|pXYDWt=T~x2q0qsRauY%3G_Wbb5G)iA&fJGk%SBxPt?m`B`ODD z`I!Igs7kjQm6NCatVfv)rj_~7$VaX}V&aC4=9ELpbTjO>*8zWkzE74GaybffL8~G} z@btl~tcq0Scy}HVy-e%t2{VJ73`bMJG)3-EA=N)<@+a%ly{>ZL`UDz)B!po_6x!N@ z08Nes2?U##1Ve4@jZLAB`e3skEJTxM%X6RRb0gG|WHA?Vmi%{1Y$q zdAWp3%p&C&Fv&?;J|UA_$VwM9>4&o=3!7Lw?I;!>=_9w{lPoxLg;DT|yj3}}THbM& zvhZNA@s*L!fdb+x+4#odD_*x{uKX9@xRKvt=D!r+zeMn~J^xrsnH&(!ejK#;@syP9 z8rimK7@}*>#AKoSof&g8bsZ)J_c7j2A4j#IF&|abINf!OK3z$BsR0er&D9Yltbv%W zC$zdipj*^qMi<@^5J-`usw%RTQN~~OIwz@&R%T3{J?%QdRjyxPiwp14e*or&3S;gvU zA(3$3kZl0>LQ9nPjie}RHPEdnWaoOHV$1}1qiTAmqG!o2HTQm2rPz*jEX6=&+m1Z! z1&k;3zA`Wvl#YC+uH?R0r9L_2!|B|+4Jf;uyWN*0*OQv z+3}s8cR=5*zbF(}(I~1IJ_y0YN4-=ip>an3q&TRwBMcje$Wom4R}8>K^RIy5FbyF_ zeuxXpB+QQVJqaOpi#-B5n7qb494JWl8<~)~3cH)LENaRdZ8)F|cM6fY$o9g+)LO z<!@aHdqaIOD#E^9dJUHbheVJ% zmbSK{!FS2hrX|G~8sx~9S%a-5O%C$kOJ~3T-g#~1$s|VG#dZHm$ zktF`mFmKH>#ExVNUHJ5=224V%0%o0#%ni2V>}Qi)FK7=}liWULF}%>{!<@$y`zU2( zFj5I49#oN%ncDc=84mnL0jv#}{4F#!YLfZ_tx(dhWp-$AI*Hk#{_T*)7Q4LA=Oc5m ztKb|LY`LrKK1>6<)WB<)2KGXq52*&Ouvh8fxWvJMLkSX5&74Jco=FJOzUM^>x z$dgbq)!A?>=Tv&~@sU$7mxJt=`ZmBfkmu{Xt|vp^@3um(r&d(1}#@CXZuJ;783w z|DT6`kK@Np;m6jis?f*t)?bq*P2%_}j^{akBG1pZUK*>Q{|)qe6Z-uM{Z{iPf^qF# zYmnaMN7;W)o;;c3kKy<+96t$_8Ff5A8hIL1_%U5dq|f}qr9B&O?gqBLw+Z1eOz43A z=Yw)sA({x^35HbL74*P9Qf@K~TYu_kT>6l;=+u6sROe-?lP$lc{(*np~26}1()FNusYEq#}ai#8OIo`Z5W`-#TEf&|1xwo(kRy%SK zR@fcPPE!S!hDlD!&9 z0dt5+F>~Fr{Io0#q0im;F7(Q`20Il)mR%cWW(C{dV7L0QTm44XhwbTL zxB4+RV9;&=OV#IzJ|CG|I#{Yc4_aTQf8FTcTUiL%3w=IpX|^@kgELK)fi|`%$wwcX z?-nwbvKv^OiByuW#g8FdtxZM)i?zO=_u_u;m3^<~61P9Dl8W1(tl7mumIUJ<&m80S z$5pa%`;$l3@r<^S^yBuWAn$CtnLs;;z$8U3|CVh7MIiD#XO486$N}d6!%g(86rw3C zGfrO^l~pB3?5-U(@@+NqR)%ZAo7%2WZ5cQ#S%@lZq1!?;6pP#rJ`Tn?p;gt)sHrpE z1}o@KuRMz*CqaUm^$>dnHMUUTJl3KtsC_s1_9KE6*Gd+IlXUqk7Ph(V(B&8Q4Y(o-?k4l)c0=%alMEYbQ zE{4&(0jEmU2!36$Jav$C)O|#A(Ba_&^Axo^AjpaygQ|JOF#z*nSim^ROSZEQFkM;e z5s-GN(P=MR<@yvu1^7Z6s3Ihqqt#t~)-c2u4v^SKT7#jdoeTZL$* zhZmG6ZNqA(!dh)=DMO{fL(HK%%rXZCqDHb#-@qKOvYK+gdM2pO;C=NfjB1&POottX zm37GkphE)Zo+rDyx}C3p&7-9S-OrdrUeU~0h^-GlZ=cGh8jm)vsl4NHdCk& zonCNol6id1%XVwr#bY>0n zKCdE&bcQmBQgfDrL^F(1Q^YvREEY$p3{6^^OSNE&LtI3%kW;`p}c&1D~RaIS`k3dzJdb?yFq4gj#N}ZAOmW1M`7>_(8Q-{( z-(u#^3~l7ZoN$L!NEMM5>J?PEJOU@VY0GC3Hz&5zt>xyf(!`R@yGhARoyF^@2h~Z0 z)zn|hTpvh^0wSI)Aeh8h11teLkeNqv*-~ z3%=u#rS@l=c|AS8S!#b~(FbYKUtp>Iz0l{wJR3Bp6=h)EbJJFw*`SGSC})FKl?BWO zhh0L8J;a$>?_aG?V`|+CeeUYwHlhOtfAvVJ3QIQ&CDr4BA-|6$P^ohvrZ(NE%>>)) z;e|fW-y4oX0V^Bw(7I-Wyx67aA*fk9s6)wp*9GkeNn$Jm*EuU$g&l-TA{vULa4Fm@ z<$e%Hv)BfZiqI$pCeyS9hHcGY?niF-gZvV|+A z$p_Hn|HtNOUg&dI^E9&6muj*OG`Y_bLrR&-vAx`EFZT%huxTCJ%gvmCK|2Avm=oZI zJ|Eg^U-728GO*;7jv?9>nALJO+WSK?47ee>Hr^IrE7fS*`YLI(t${5h5?&v|Q?p7| z+E-@6D?**SG2#4JqT$)p-g{z@zg5Sndvi?i^IC>gOTNE-70E@nrY%{6Jo#JmE zrQg_Q(MlNVt~ZNffnhsCnO~55YX1ydsr5pi5A!i?p{s09X`7@K=a4ouz&#u8l)D++dnWW_7{?J!T=k(ZIa=#iqH&dbE#Y)_f3-BRC1z$ZWM-??rPZXjL z?RVINc&H)E0ZAh1h!WO7OxF`yT_Dhn%!AQ|7d`_i!a{C&G-RCn8mu;-P;{%29g-vf z*Tb-(V~nC^))SSKUi{uWTfaY$px!r7fg1^)?|>#uJLVSt(yD}M)6f_4eCt4Hb`4Zu z8z#6VN}C}m%32L{D+;l{eTp#?sD_-;e)KHadPt$EXEoO`U0T_?lx_bh!F;ij_wg`a z){QTFJJY{j=yO+RFnS|{(jv)qfg#MY=z^|%6tDTNJJs7IXwW6c-05q!0>c#cU={X- iOksPW&pi-)C{T^F&;tuS(9h6?9{wNGoM~3+RsjHaoWz&_ diff --git a/packages/build/tests/core/tests.js b/packages/build/tests/core/tests.js index 9a3093bbbd..8e6059ec79 100644 --- a/packages/build/tests/core/tests.js +++ b/packages/build/tests/core/tests.js @@ -447,6 +447,10 @@ test('Bundles functions from the `.netlify/functions-internal` directory even if await runFixture(t, 'functions_user_missing') }) +test('Removes duplicate function names from the list of processed functions', async (t) => { + await runFixture(t, 'functions_duplicate_names') +}) + // eslint-disable-next-line max-statements test.serial('`rustTargetDirectory` is passed to zip-it-and-ship-it only when running in buildbot', async (t) => { const fixtureWithConfig = 'functions_config_1' From 7ad45f25c9ba5640e9c6da0d67d244483661b92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 7 Mar 2022 10:58:43 +0000 Subject: [PATCH 2/5] chore: resolve merge conflicts --- package-lock.json | 3 -- .../build/tests/core/snapshots/tests.js.md | 50 ++++++++++++++++++ .../build/tests/core/snapshots/tests.js.snap | Bin 5892 -> 5979 bytes 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b249c648aa..f251197ed5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,6 @@ "workspaces": [ "packages/*" ], - "dependencies": { - "typescript": "^4.6.2" - }, "devDependencies": { "@netlify/eslint-config-node": "^5.1.6", "ava": "^4.0.0", diff --git a/packages/build/tests/core/snapshots/tests.js.md b/packages/build/tests/core/snapshots/tests.js.md index d245361e63..930cfdd061 100644 --- a/packages/build/tests/core/snapshots/tests.js.md +++ b/packages/build/tests/core/snapshots/tests.js.md @@ -2276,3 +2276,53 @@ Generated by [AVA](https://avajs.dev). ────────────────────────────────────────────────────────────────␊ ␊ (Netlify Build completed in 1ms)` + +## Removes duplicate function names from the list of processed functions + +> Snapshot 1 + + `␊ + ────────────────────────────────────────────────────────────────␊ + Netlify Build ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + > Version␊ + @netlify/build 1.0.0␊ + ␊ + > Flags␊ + debug: true␊ + repositoryRoot: packages/build/tests/core/fixtures/functions_duplicate_names␊ + testOpts:␊ + pluginsListUrl: test␊ + silentLingeringProcesses: true␊ + ␊ + > Current directory␊ + packages/build/tests/core/fixtures/functions_duplicate_names␊ + ␊ + > Config file␊ + No config file was defined: using default values.␊ + ␊ + > Resolved config␊ + build:␊ + publish: packages/build/tests/core/fixtures/functions_duplicate_names␊ + publishOrigin: default␊ + functionsDirectory: packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions␊ + ␊ + > Context␊ + production␊ + ␊ + ────────────────────────────────────────────────────────────────␊ + 1. Functions bundling ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + Packaging Functions from netlify/functions directory:␊ + - function_one.js␊ + ␊ + ␊ + (Functions bundling completed in 1ms)␊ + ␊ + ────────────────────────────────────────────────────────────────␊ + Netlify Build Complete ␊ + ────────────────────────────────────────────────────────────────␊ + ␊ + (Netlify Build completed in 1ms)` diff --git a/packages/build/tests/core/snapshots/tests.js.snap b/packages/build/tests/core/snapshots/tests.js.snap index 3655f52ca448dc503c4cacb1f3936955dcc690ad..abc45936ee85ee5a6128d0dad88835772624588b 100644 GIT binary patch delta 5943 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 From b6db1ec71c23a910b92e0cc23dfd86c928f7f39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 7 Mar 2022 11:00:55 +0000 Subject: [PATCH 3/5] chore: remove use strict --- .../functions_duplicate_names/netlify/functions/function_one.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js index 710c8b9fd4..eda1e7e901 100644 --- a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js +++ b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js @@ -1,3 +1,3 @@ -'use strict' + module.exports = true From d68b11d6c177e2c44723c3aff343c380c13d6855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 7 Mar 2022 11:02:39 +0000 Subject: [PATCH 4/5] chore: remove ESLint comment --- packages/build/tests/core/tests.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/build/tests/core/tests.js b/packages/build/tests/core/tests.js index 214a101d90..804a22778a 100644 --- a/packages/build/tests/core/tests.js +++ b/packages/build/tests/core/tests.js @@ -480,7 +480,6 @@ test('Removes duplicate function names from the list of processed functions', as await runFixture(t, 'functions_duplicate_names') }) -// eslint-disable-next-line max-statements test.serial('`rustTargetDirectory` is passed to zip-it-and-ship-it only when running in buildbot', async (t) => { const fixtureWithConfig = 'functions_config_1' const fixtureWithoutConfig = 'functions_internal_missing' From 6f3e7ec0660484ccfe30b9021b5c1017ee969914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Mon, 7 Mar 2022 11:05:15 +0000 Subject: [PATCH 5/5] chore: update fixtures to ESM --- .../netlify/functions/function_one.js | 4 +--- .../netlify/functions/function_one.ts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js index eda1e7e901..767df32b9c 100644 --- a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js +++ b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.js @@ -1,3 +1 @@ - - -module.exports = true +export const handler = () => true diff --git a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts index cdd6992b75..767df32b9c 100644 --- a/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts +++ b/packages/build/tests/core/fixtures/functions_duplicate_names/netlify/functions/function_one.ts @@ -1,3 +1 @@ -const handler = () => true - -export default handler +export const handler = () => true