From 1e058cd93a3258e354487112d925b17ed518c895 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 12:38:29 -0600 Subject: [PATCH 1/7] Reformat all files --- .../petstore-api.generated.ts | Bin 17892 -> 8569 bytes .../test/generateEndpoints.test.ts | 9 ++++----- .../rtk-query-codegen-openapi/tsconfig.json | 4 ++-- .../toolkit/src/query/core/buildInitiate.ts | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/virtual/petstore-api.generated/petstore-api.generated.ts b/docs/virtual/petstore-api.generated/petstore-api.generated.ts index a6c28e9804adccd7183c07e522ff8248c52f9d1c..c885323c48c65b98e7a536cddd7f583a1dc3f313 100644 GIT binary patch literal 8569 zcmcIpOLN;s48HqU;LsT*8IP5=H&2o_j+2h3c{cX+kjd05aV0aMNQPWG*0}ob1@?_4 zDN9M}3oYy}_WQ5^79jIgT{Q}BVIkH0>O{2iT_>A0Y+%t;E13M=$gI2h)J|1Z6`yl8 z{X)Z&gWRo~H&Q71w9fBXGR1jwH93$sdc%2Dwh9C;dkkL1z1stTnZt0LV7hm!$1a-U z7$#F(I=%jN0-O7XxJZfR`MQ?vF?{$)zh#-#RbDC-+?#cIk==*KPeAJj=;{n1zm@73 z^w`m=Q$poc`RKxpAfLZvTO&w$2(k2OvwULJ0BBp_4*H2Bb`$6b;^nlK>hcg)Qe9OU zLVkO3J~@P0m93A>N?dV-b1Vh$PmyIq;GSwRL*_-hz(TW_zZjku2AFT&BTg^x<8@=k z@&WcDF9~;hvVM=|?9lYay4pIAtil(`q?pe56r`sI?=-!K9XL)2m&0`Fzys8x5i10F z3$2Cgj`7F{VB;o_Gd&l}yLi%+tt{;+ck#n0Jf=V0dQcb%XW8b`M}afCkJi6)b@ifZRt}YqT6^d|Ox?s7=9W3%W%xb; z=QI#SJ`btjd8Js%C>hYt!~NYclZ714XQyr?HU-4eT@Gw0sCMFg`uyed^XE}AxsoE2 zjSf0d=l^_`aVkW~pAv5#XF%rw?%CBvC9)TJfhOzaZ8yY-UicL#{$Wg~2FTe;EM*jJ zJ0?)dr;cHqgfQvnbO(vzl~e*RC=oeEe{kGP7`|uawJcTDpmmb~_9M(r7{c+uprw+# ztwr^6n!AnqVOtksF5fhG+zy0~*SCI%p8oNR4nXMVbVlx9b_(1iKz%__%x*cxf7l%smLx88b?R zNkVYubx%_WUbF)~^GuhSG{jgi@wbrZP~-m2LaQ7-2i`pciIy&+mwAi9Rd@Yj)7mpo z;PYdicTYv`deYt%5>c5N%nt7U_K1_3vx9pU)iN*X;GApfD1P+PiDRA+OTYCvr+UYT zM7VE>Y;xy1(IFOuZTl62EXuo1G@fm7uc}jn^sGGP7sP`ElRQiCh!C#o=U7ZjwDZaO zwXP$QTpxxQ1WZh9WDrG?X^%%Qo7{ox9Kfrck3H28@Y!L6s(?ada+L zqg153F|Q%%a!8X~9N+kVVZrf`~4ujDvr=(Vh~Wuulr%!($&Ia%ilJYWXyKlm>)he(gTV) zX47iJwJ18-q9uhw^fCig!At_ZWy!G|LcyYHV38L}Hpa>Z&Tsf$LR^cy5VJx~;9r>3 z`06Atm-_#S)|aa1|g&AI8@AZ=$=%w zMR}(0+FMS8odr|J;hmjAwa_ku7#pd&ru4o{ZFJeKX0l1(ZR=MNWmkSKtFI-4FtlV8 ziSq?*ICO?izud}(fSCxTTg3C&x|(vnx4S)d>xs?|Ti1K%GbfiA#^g&pI(}?J28pKz zLkQhTrT|eP4h*BHI(i@=*HgY|2X3P$wt-)-2SX1+#iZ=dYIjr!eDnS z`lw7X^Em{Bsl~l4vU{@Y!$_0{Ai)7Nq>#^D4C}Y_n9cP?sppKQ7ZVzK^T-WH5(}R^ z1c)x_5l|+ab^;Zeox3ryxg3%i%7E%LsAiw!Tp5#);25X^OL9t3Hrizk-PB`ckKVz4 z%FtER7X1Obi91@`yQ|{HXMaz(p&SE>6$S+4VCQ&}WGA33uImEqFR%>LK1BmV*_{^o zZis3Lvj&&V3n>~<^2Q#4n-vlck0=BdTA+yPPry9I4b2$a_IZneFdOHv9Avrx; zbW6{xjEXpK3(8}`7St-YExzIoB5qfGvka20=}S(m`Aa8Cm8*3uYp?S96wMISgY7p_ zGO6hmai*IPQP)j%ZGYgw=hxKFOf-R2O$;>Nj>D(2~7OsN%vz9?Ilo0JrhQWV}%*!}<%fTcya%&Uz?W t5$@g50e;~p)9{8dZzp4X;o6C%>{f^eLdH&%8`u|k@?l_u4k_yV;6IYB;vN71 literal 17892 zcmds9TW=dh6rN`!{=+Kbp+%_X@&+vs8bB2-ZD}eVs*1Xale$gg5Zk3u>0bxFZ;p>= zcCNb{%c+p%$ljgHIp4X?IqUrU&(yp&XJ%&3&B8S19o`4{JTYT@pO{_To8sDgypM2w zhS81LG2h!Uhh}NsnwMs7Mi@QA>%_dm_yxZIiF*@_y1-{y?*P|#%s1v^^AW~`yB=Zm z0(-wOKVa`UzCB#8aJl_;&k1OCoF0JMQ|v>o$15&x;d9LWHK0P88@!%Jw0(`MCE7XL z&3g@9fX^_6Qe0XJy^$$Dax9g40BNva_9A>J=q+MS*6jNhUxZXF9 zR>-Dibivx`ywVgS9bY+uUQ+)>d*|>Q7obEmcDb?zU!R?%Z?0`j_xq``R!&+W$KBQu zdHQoVVGsU#%2!IZBls&pE<}vBlUn5rdVY@g>lLc>X!M-)4T`iwSMA6jLEDMfj%6BO zQCfW|?_=lV4MSf!OH}U;m*%nc%OXo^-yPU*7Ws`Mi1UtewE>AqVOi(cHy*A8+Q5DJot7C+31Y@kpl57&%5R zIW>RaOf-S7OUqWq{9;E8mo0t93A_VoU=Bh#*S!S2LO3fg-~8wgQ^F(YhU4!J?3!7_ z#GVjRGVE{n<=j^9rZpzzGbp`7>+9vjHHLKVfnvs8IjfDcT2!AoT)QM{-$Azh2GsDR z$v7k$oy)K#a>sM>`ctSg$}ueFKOw!a>2h_7~ZQYnpEmHQCqZRt!t=ZiHYzQSDm*ybc^ zlc6QMSbh^{l5liR!cBJURoL$cu|z4)$t9H?tEBbpOl%w;!pRM2hjVJwxh+ACoHb=?&Hx z;g0k|hS4Xo7OLDc3QC`EaqGChgOvb^5B1jVUW*>gU|Vv;nFUvs$xk0s#RZ%`$GzaR`SKbpjOrT}FHpAcNR(JI&pDFI}>?k9SY#zwxc33Ir6ENqP z;p;iiX1eEhHf!0zckay@W30}42%p*c8}A)!MSK>4^~7WE`W!p)IUIcksb(oDy!Npl zyWPVrXPeS(Q(Km-j#Zhp2wj*;dFf7PptEl}_Iq{g|80luEgIPJopV$5r6Ip-_8uA%A27{OFe-rB1!VY>u9 zukfD1gPvAAN!Oi*U=;cg@hr}ZEP@oqD`C9p4`f5Z5cz}QzJduE~pBv%%NQTVZ70rc|VP*p+rmI zshmAQ#tZIJ!b!EymypX>`^JX!PGyglr#OwjQk?f_zD4#!*S7}A{`hQ->$f&h$F;pa zQLpuAOFHA9Jo{US#D=b2)h=0eU-`dVp9P+H&o%g*Jhk~!|5#Gyt*t3F8_9Q0w~-yY z9$DEg@>I6D)zg>j-|++%?oz`<@O87cpZ&PK%ea&&O=FYt84j=1Ng<5#?kRpbCHPU^ ztu#DW@?(%gBJEGba{J^*rPaG5rssdhZx`hJSQq9;Zl&SK`KRu3ZLB|T`L)Za`SZy0 z66X>*N6wHzzr<($-lZKobPTOm`4CH}*{;8v&g|do>kF44ZE0>{y1{iY9&?Xe~= zo@BHVptzMJ)kmlDYnQPtVXBoisfL!~wE7HPEsc+Vdh+Sb_ZM{Ct{ny)-# zlV7_m8}-PFY8Sn~yp(EMd>j6k_Ht}v0;{a-YrR{a>{!PTuN$A@r~%5&P|qxN-)--z zRhnVE=I!AiKvPf&F&6Ji^v)2aXTX1k9FV_XmEQ~azQ|=W9N(^b3wG@hoO>1BijwDZ z+Qc3Vb-JWc+KbI;6mejWpFLH1ia$59ru**X)mQ({us@&JE87O2B4MwUk%(NCxSm53 zrqGAIl?LT_BKIj7vkoZFptHlIy{Iu(JcDMDNH)%Vx@3#nzVh`+U2te-6^p+}s$j-3Dn>GPFV?3$&LR%I^{L9(Ji}{Q2>}8+zRH1eW7h>1(?PS8;VW z&snO1*lic*2kZFx+`DP(j(oj(ud=lFW~82*SBQRBeJ UzC7nWte&|I{r_~;P31Z4KPHa{@c;k- diff --git a/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts b/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts index a51a5940a3..b91eba46c4 100644 --- a/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts +++ b/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts @@ -273,14 +273,13 @@ describe('import paths', () => { hooks: true, tag: true, }); - expect(await fs.promises.readFile('./test/tmp/out.ts', 'utf8')).toContain("import { api } from '../../fixtures/emptyApi'"); + expect(await fs.promises.readFile('./test/tmp/out.ts', 'utf8')).toContain( + "import { api } from '../../fixtures/emptyApi'" + ); }); test('should create paths relative to `outFile` when `apiFile` is relative (same folder)', async () => { - await fs.promises.writeFile( - './test/tmp/emptyApi.ts', - await fs.promises.readFile('./test/fixtures/emptyApi.ts') - ); + await fs.promises.writeFile('./test/tmp/emptyApi.ts', await fs.promises.readFile('./test/fixtures/emptyApi.ts')); await generateEndpoints({ unionUndefined: true, diff --git a/packages/rtk-query-codegen-openapi/tsconfig.json b/packages/rtk-query-codegen-openapi/tsconfig.json index a2d81b5bee..bc78ba4456 100644 --- a/packages/rtk-query-codegen-openapi/tsconfig.json +++ b/packages/rtk-query-codegen-openapi/tsconfig.json @@ -13,7 +13,7 @@ "types": ["vitest/globals", "vitest/importMeta"], "esModuleInterop": true, "skipLibCheck": true, - "forceConsistentCasingInFileNames": true + "forceConsistentCasingInFileNames": true, }, - "exclude": ["test", "lib", "vitest.config.mts"] + "exclude": ["test", "lib", "vitest.config.mts"], } diff --git a/packages/toolkit/src/query/core/buildInitiate.ts b/packages/toolkit/src/query/core/buildInitiate.ts index 9c92cb401d..f13ea57740 100644 --- a/packages/toolkit/src/query/core/buildInitiate.ts +++ b/packages/toolkit/src/query/core/buildInitiate.ts @@ -302,7 +302,7 @@ You must add the middleware for RTK-Query to function correctly!`, subscriptionOptions, [forceQueryFnSymbol]: forceQueryFn, ...rest - } = {} + } = {}, ) => (dispatch, getState) => { const queryCacheKey = serializeQueryArgs({ From 6cd1d69f6fb64e75f3aafdcd74b77081f3d829dc Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 13:06:58 -0600 Subject: [PATCH 2/7] Add `overrides` in prettier config for tsconfig files in CSB examples --- .prettierrc.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.prettierrc.json b/.prettierrc.json index 6ef9e41d05..ed6ecf7692 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,14 @@ { "semi": false, "singleQuote": true, - "endOfLine": "auto" + "endOfLine": "auto", + "overrides": [ + { + "files": [ + "examples/query/react/**/tsconfig*.json", + "examples/action-listener/counter/**/tsconfig*.json" + ], + "options": { "parser": "json" } + } + ] } From c979069b9f101d09b7cf3e336db54ce48b927c4d Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 13:08:31 -0600 Subject: [PATCH 3/7] Reformat files to remove trailing commas in tsconfig files --- examples/action-listener/counter/tsconfig.json | 4 ++-- examples/query/react/advanced/tsconfig.json | 4 ++-- .../react/authentication-with-extrareducers/tsconfig.json | 4 ++-- examples/query/react/authentication/tsconfig.json | 4 ++-- examples/query/react/basic/tsconfig.json | 4 ++-- examples/query/react/conditional-fetching/tsconfig.json | 4 ++-- examples/query/react/deduping-queries/tsconfig.json | 4 ++-- examples/query/react/graphql-codegen/tsconfig.json | 4 ++-- examples/query/react/graphql/tsconfig.json | 4 ++-- examples/query/react/kitchen-sink/tsconfig.json | 4 ++-- examples/query/react/mutations/tsconfig.json | 4 ++-- examples/query/react/optimistic-update/tsconfig.json | 4 ++-- examples/query/react/pagination/tsconfig.json | 4 ++-- examples/query/react/polling/tsconfig.json | 4 ++-- .../query/react/prefetching-automatic-waterfall/tsconfig.json | 4 ++-- examples/query/react/prefetching-automatic/tsconfig.json | 4 ++-- examples/query/react/prefetching/tsconfig.json | 4 ++-- examples/query/react/with-apiprovider/tsconfig.json | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/action-listener/counter/tsconfig.json b/examples/action-listener/counter/tsconfig.json index aca306ec8f..9d379a3c4a 100644 --- a/examples/action-listener/counter/tsconfig.json +++ b/examples/action-listener/counter/tsconfig.json @@ -14,7 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx", + "jsx": "react-jsx" }, - "include": ["src"], + "include": ["src"] } diff --git a/examples/query/react/advanced/tsconfig.json b/examples/query/react/advanced/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/advanced/tsconfig.json +++ b/examples/query/react/advanced/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/authentication-with-extrareducers/tsconfig.json b/examples/query/react/authentication-with-extrareducers/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/authentication-with-extrareducers/tsconfig.json +++ b/examples/query/react/authentication-with-extrareducers/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/authentication/tsconfig.json b/examples/query/react/authentication/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/authentication/tsconfig.json +++ b/examples/query/react/authentication/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/basic/tsconfig.json b/examples/query/react/basic/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/basic/tsconfig.json +++ b/examples/query/react/basic/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/conditional-fetching/tsconfig.json b/examples/query/react/conditional-fetching/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/conditional-fetching/tsconfig.json +++ b/examples/query/react/conditional-fetching/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/deduping-queries/tsconfig.json b/examples/query/react/deduping-queries/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/deduping-queries/tsconfig.json +++ b/examples/query/react/deduping-queries/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/graphql-codegen/tsconfig.json b/examples/query/react/graphql-codegen/tsconfig.json index 16a99dca49..4842cab6c4 100644 --- a/examples/query/react/graphql-codegen/tsconfig.json +++ b/examples/query/react/graphql-codegen/tsconfig.json @@ -16,6 +16,6 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "baseUrl": "src", - }, + "baseUrl": "src" + } } diff --git a/examples/query/react/graphql/tsconfig.json b/examples/query/react/graphql/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/graphql/tsconfig.json +++ b/examples/query/react/graphql/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/kitchen-sink/tsconfig.json b/examples/query/react/kitchen-sink/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/kitchen-sink/tsconfig.json +++ b/examples/query/react/kitchen-sink/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/mutations/tsconfig.json b/examples/query/react/mutations/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/mutations/tsconfig.json +++ b/examples/query/react/mutations/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/optimistic-update/tsconfig.json b/examples/query/react/optimistic-update/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/optimistic-update/tsconfig.json +++ b/examples/query/react/optimistic-update/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/pagination/tsconfig.json b/examples/query/react/pagination/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/pagination/tsconfig.json +++ b/examples/query/react/pagination/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/polling/tsconfig.json b/examples/query/react/polling/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/polling/tsconfig.json +++ b/examples/query/react/polling/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/prefetching-automatic-waterfall/tsconfig.json b/examples/query/react/prefetching-automatic-waterfall/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/prefetching-automatic-waterfall/tsconfig.json +++ b/examples/query/react/prefetching-automatic-waterfall/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/prefetching-automatic/tsconfig.json b/examples/query/react/prefetching-automatic/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/prefetching-automatic/tsconfig.json +++ b/examples/query/react/prefetching-automatic/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/prefetching/tsconfig.json b/examples/query/react/prefetching/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/prefetching/tsconfig.json +++ b/examples/query/react/prefetching/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } diff --git a/examples/query/react/with-apiprovider/tsconfig.json b/examples/query/react/with-apiprovider/tsconfig.json index 7f331f6806..2e7afa3896 100644 --- a/examples/query/react/with-apiprovider/tsconfig.json +++ b/examples/query/react/with-apiprovider/tsconfig.json @@ -15,6 +15,6 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "noEmit": true, - }, + "noEmit": true + } } From 554aac663da8e04b3c67b05b72f2baefa24b5dd9 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 14:04:39 -0600 Subject: [PATCH 4/7] Add `pool: "forks"` to vitest config of codegen --- packages/rtk-query-codegen-openapi/vitest.config.mts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rtk-query-codegen-openapi/vitest.config.mts b/packages/rtk-query-codegen-openapi/vitest.config.mts index 225267ad49..24b3f0d014 100644 --- a/packages/rtk-query-codegen-openapi/vitest.config.mts +++ b/packages/rtk-query-codegen-openapi/vitest.config.mts @@ -8,6 +8,7 @@ const __dirname = path.dirname(__filename); export default defineConfig({ test: { + pool: "forks", globals: true, setupFiles: ['./test/vitest.setup.ts'], alias: { From d09ab2116489f77fef3b3d15d01736af48b0422e Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 14:15:54 -0600 Subject: [PATCH 5/7] Change test timeout for codegen --- packages/rtk-query-codegen-openapi/vitest.config.mts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/rtk-query-codegen-openapi/vitest.config.mts b/packages/rtk-query-codegen-openapi/vitest.config.mts index 24b3f0d014..49b3f4931f 100644 --- a/packages/rtk-query-codegen-openapi/vitest.config.mts +++ b/packages/rtk-query-codegen-openapi/vitest.config.mts @@ -8,7 +8,8 @@ const __dirname = path.dirname(__filename); export default defineConfig({ test: { - pool: "forks", + testTimeout: 10_000, + pool: 'forks', globals: true, setupFiles: ['./test/vitest.setup.ts'], alias: { From 7a5b39aa14ec8ac37b152a4c7478aee141d22a09 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 14:17:59 -0600 Subject: [PATCH 6/7] Slightly modify prettier config --- .prettierrc.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.prettierrc.json b/.prettierrc.json index ed6ecf7692..9937006fdc 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -4,10 +4,7 @@ "endOfLine": "auto", "overrides": [ { - "files": [ - "examples/query/react/**/tsconfig*.json", - "examples/action-listener/counter/**/tsconfig*.json" - ], + "files": ["examples/**/tsconfig*.json"], "options": { "parser": "json" } } ] From 5aa2594ea4a2f7fcfe8caebdb5a60b5795a15eda Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Mon, 12 Feb 2024 14:18:46 -0600 Subject: [PATCH 7/7] Reformat all files one more time --- examples/publish-ci/cra4/tsconfig.json | 4 ++-- examples/publish-ci/cra5/tsconfig.json | 4 ++-- examples/publish-ci/next/tsconfig.json | 4 ++-- examples/publish-ci/vite/tsconfig.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/publish-ci/cra4/tsconfig.json b/examples/publish-ci/cra4/tsconfig.json index aca306ec8f..9d379a3c4a 100644 --- a/examples/publish-ci/cra4/tsconfig.json +++ b/examples/publish-ci/cra4/tsconfig.json @@ -14,7 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx", + "jsx": "react-jsx" }, - "include": ["src"], + "include": ["src"] } diff --git a/examples/publish-ci/cra5/tsconfig.json b/examples/publish-ci/cra5/tsconfig.json index aca306ec8f..9d379a3c4a 100644 --- a/examples/publish-ci/cra5/tsconfig.json +++ b/examples/publish-ci/cra5/tsconfig.json @@ -14,7 +14,7 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx", + "jsx": "react-jsx" }, - "include": ["src"], + "include": ["src"] } diff --git a/examples/publish-ci/next/tsconfig.json b/examples/publish-ci/next/tsconfig.json index 76bf2c7476..b8d597880a 100644 --- a/examples/publish-ci/next/tsconfig.json +++ b/examples/publish-ci/next/tsconfig.json @@ -13,8 +13,8 @@ "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", - "incremental": true, + "incremental": true }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], - "exclude": ["node_modules"], + "exclude": ["node_modules"] } diff --git a/examples/publish-ci/vite/tsconfig.json b/examples/publish-ci/vite/tsconfig.json index b5eaa05e05..3d0a51a86e 100644 --- a/examples/publish-ci/vite/tsconfig.json +++ b/examples/publish-ci/vite/tsconfig.json @@ -14,8 +14,8 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx", + "jsx": "react-jsx" }, "include": ["src"], - "references": [{ "path": "./tsconfig.node.json" }], + "references": [{ "path": "./tsconfig.node.json" }] }