From 1e331b7c9d74cc4a0c532ebe8562986547d388ca Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Sep 2021 01:50:20 +0200 Subject: [PATCH] :art: use typescript plugin that converts to relative paths --- api/babel.config.js | 6 ++++++ api/package-lock.json | Bin 807368 -> 933007 bytes api/package.json | 14 +++++++++++--- api/tsconfig.json | 5 +++-- bundle/package-lock.json | Bin 72597 -> 89327 bytes bundle/package.json | 4 +++- bundle/tsconfig-paths-bootstrap.js | 14 -------------- cdn/package-lock.json | Bin 354786 -> 360232 bytes cdn/package.json | 6 ++++-- cdn/scripts/tsconfig-paths-bootstrap.js | 10 ---------- cdn/tsconfig.json | 3 ++- gateway/package-lock.json | Bin 156237 -> 161981 bytes gateway/package.json | 4 +++- gateway/scripts/tsconfig-paths-bootstrap.js | 10 ---------- gateway/tsconfig.json | 3 ++- util/tsconfig.json | 8 +------- 16 files changed, 35 insertions(+), 52 deletions(-) create mode 100644 api/babel.config.js delete mode 100644 bundle/tsconfig-paths-bootstrap.js delete mode 100644 cdn/scripts/tsconfig-paths-bootstrap.js delete mode 100644 gateway/scripts/tsconfig-paths-bootstrap.js diff --git a/api/babel.config.js b/api/babel.config.js new file mode 100644 index 00000000..45ab8ad8 --- /dev/null +++ b/api/babel.config.js @@ -0,0 +1,6 @@ +module.exports = { + presets: [ + ["@babel/preset-env", { targets: { node: "current" } }], + ["@babel/preset-typescript", { allowDeclareFields: true }] + ] +}; diff --git a/api/package-lock.json b/api/package-lock.json index fd9c68b4db350559571acf3f3bded2c26f32fb27..3e8f655d51697dd91c553eda6c015b656ee92956 100644 GIT binary patch delta 50734 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 F{{bzviwyt( delta 1159 zcmaKqe@v8h9LM*4?)yC7?{m-d+>h=6Jqps3*$NqTQ;LMc*r;r5jG?V7^oBqNl`dQ< zZgBID{)k^^-{7OTg6W)OP1qjYCt?s|R<`AiRda5*cB!*$cAYI?+U$A`+_^R9pP%>p z^ZD-c`MzI$x1K(C?8&hxh3FNoK+Fq{1wgr-c@J14V=pqT=jduDTSsuBwf-rEbrP*-nP1Oy< zzu5v%vyvET&4UF*x?)=zL`ytLkTEIr8SXzLHCDj(T3Z%`f7AmIZc$d_`9g4E(#rf>b_g=qE%$M?wybs)~uuDC7D(ag>Wm)#-Uv_ zi)Yl}7M%ErzSE7bH^}P=o^Fy~`T+em3hs8Z13}pK3gbBZGP~56PW~SWk^$}#G4!T`wn87r=y~>?mPxzLb~oSE1T1Ie zz(uwWiY_xRUi^jakkEOJ`LqE^@|lwzc?80>JRqDsDkMET56UG;HM=ABdpcVBD9NyK zM9)CbN-)vRommhIQ5ohMs0y8}RK}@(j?ZA{EbsEe36y;}wZNaNS^@wp06tG|CRi6s{;ce)J+W^_C0KSB&Km~z9~Z}jW9^PIj( nf`Qw*PxKyiL&aZe09~{C8&w#~G2Z/jest/setup.js" ], - "globalSetup": "/scripts/globalSetup.js", + "globalSetup": "/jest/globalSetup.js", "verbose": true } } diff --git a/api/tsconfig.json b/api/tsconfig.json index 21a8eb96..0169642d 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -66,8 +66,9 @@ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, "baseUrl": ".", "paths": { - "@fosscord/api": ["src/index.ts"], + "@fosscord/api": ["src/index"], "@fosscord/api/*": ["src/*"] - } + }, + "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] } } diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 718cc969b5e4ecf07d132ad70a37c1b80c1a96d3..08e09450f296565c3ee9417a54b051cd317c3164 100644 GIT binary patch delta 8945 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 AssI20 delta 444 zcmX|--%C?r7{__e-t*3#j&A83tzhm*j*_v77)1n%sa;JlNEnh1Z@f?vRJ`#A7>VeG zXb-_Pf}zoL#v7XQRBKj}h~ z8Tc*c6mcEWh8G@Sqh5hSs-4$92^ED3XjJua9M5oJB$0=8Ne}vTCypg<;rBN>#q>so ze_RH3tfq^SC}Zi4`-cq+TeQ3w0=mECv{U8UU)yyWj;dd2XPw({z|)CMNey3{ z4jN7rF-tg189zQ_R`x#xL&5HCuXPp^#bF4GnILS)`Vir6 diff --git a/bundle/package.json b/bundle/package.json index 83f26116..7cf4ba40 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -4,6 +4,7 @@ "description": "", "main": "src/start.js", "scripts": { + "prepare": "ts-patch install -s", "preinstall": "cd ../util && npm i && cd ../api && npm i && cd ../cdn && npm i && cd ../gateway && npm i", "build": "npm run build:util && npm run build:api && npm run build:cdn && npm run build:gateway && npm run build:bundle", "build:bundle": "npx tsc -b .", @@ -12,7 +13,7 @@ "build:cdn": "cd ../cdn/ && npm run build", "build:gateway": "cd ../gateway/ && npm run build", "start": "npm run build && npm run start:bundle", - "start:bundle": "node -r ./tsconfig-paths-bootstrap.js dist/start.js", + "start:bundle": "node dist/start.js", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { @@ -43,6 +44,7 @@ "@types/uuid": "^8.3.0", "@types/ws": "^7.4.0", "@zerollup/ts-transform-paths": "^1.7.18", + "ts-patch": "^1.4.4", "typescript": "^4.3.5" }, "dependencies": { diff --git a/bundle/tsconfig-paths-bootstrap.js b/bundle/tsconfig-paths-bootstrap.js deleted file mode 100644 index efe4b3bc..00000000 --- a/bundle/tsconfig-paths-bootstrap.js +++ /dev/null @@ -1,14 +0,0 @@ -const tsConfigPaths = require("tsconfig-paths"); -const path = require("path"); - -const cleanup = tsConfigPaths.register({ - baseUrl: path.join(__dirname, "node_modules", "@fosscord"), - paths: { - "@fosscord/api": ["api/dist/index.js"], - "@fosscord/api/*": ["api/dist/*"], - "@fosscord/gateway": ["gateway/dist/index.js"], - "@fosscord/gateway/*": ["gateway/dist/*"], - "@fosscord/cdn": ["cdn/dist/index.js"], - "@fosscord/cdn/*": ["cdn/dist/*"], - }, -}); diff --git a/cdn/package-lock.json b/cdn/package-lock.json index 7a4edd89674878d41c0794505b4c1b61f482e1dd..8a70844c3f4c4f80ebd18075261a740377b6afed 100644 GIT binary patch delta 2804 zcmd6pS!~;M9LHrR>5i^rv}?PKmNnVIN){)!(;T2NB4)&_TTh%&ZYS1X(IJRY z5?Sti<%yy7r|vM&I^n6)eoe=(fj(K@WLW0u0xN^dCt)wRgs6um`VphSSmbJ1itG7c zbwYEHq?)c;HIN`(KGM73w#c|x2~)vbtkGNyF{OODQmeGEl-^sTB-WOW7SqMWK!$EI zMZA!5>D^qRUXMwsqRr8)m%K?gR&_+lRIy!u&G;-^W&0vz+r!S50@w0WQaEZu?+0#gQ7x4-zz2-qdfb`^@?ZS<6u^vQvI zI#ox*Nq;OGz^hGDt}Y0^T5^HFEY={$yCrW1O{F>6oe&8zNH7s9P+?FMGbS??pDYsv zDNv6tCL$H9=x$MhDU$HV)|G&zU*SWe8wFUwFWfZxh+BO&%jl-{o~6MDjcza z%d3!aTa{IgTR8!PQXaTUYqUgwG`6H7iAgJ|IW`P zwA;$T5Z{pEWXowYi9*~H@mO08FIl8GCS!>&EV?QlUzrFxgE9?HzOI^XU%EK5nXQU6 zue2VVx~rN5XTMXUm8c7(>5S+2<#~FZbJF&rIn(+tfwy9 zX`GjvnXoD7v3No@FXwHRS`~Yk=j1u#GLC0cNy(n}S{k{8Iqa0v8MiOZ&vCrX*&E$s zufW4r6Ji>y*~U!tOTH)77vD{o5DS8Vmu^FQMwpVY9$KGzfdO~i&}{n(Hr+Y%27J>B z8dMOGArm_KMaKj2~iLA*b%Y2!4c?CCy6}dU5n3(4lS6a#W zC|1cv$U;F5M^bUVnNKjdRS28V=8Bw1o10wL$@+XgN5Jo@P?WpqNvs5HT(C^mGRn}I zz@5*bZ3z0e%5~0lby$_Cb)fxT`pF=60U86F_QRv#+wURWj$UW_;%!RFdq0E^f!bYY zWMZIXa11$)MM^^35j)ua1>UZH4nwSM?eLSY=B~q?+;x>I`$#Yt#F{Go|AO!jYwG=) z9_dc5sV2JI1@B!`qZ{A_cdn`TJ^x_Hd*n#BZ*A>cW8h~*Gdau(wA|Y?4BR-Up6R@R zsF~dlmAsD#b$7PEI=iKF&8yBX{d?XL4}`bf4^rpQ2Wsu{`$Ac8 zShKeCq4Kr6V8FOlGkoM8ivAbC_Ws#*W+pYqkVgZhd%%^tY81RJtM5Bck3OZ*cUm3| GyZs{;swfCaaJ1p%vYw>xAU diff --git a/cdn/package.json b/cdn/package.json index 7c59381b..71211d67 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -5,9 +5,10 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { + "prepare": "ts-patch install -s", "test": "npm run build && jest --coverage ./tests", "build": "npx tsc -b .", - "start": "npm run build && node -r ./scripts/tsconfig-paths-bootstrap.js dist/start.js" + "start": "npm run build && node dist/start.js" }, "repository": { "type": "git", @@ -34,7 +35,8 @@ "@types/multer": "^1.4.7", "@types/node": "^14.17.0", "@types/node-fetch": "^2.5.7", - "@types/uuid": "^8.3.0" + "@types/uuid": "^8.3.0", + "ts-patch": "^1.4.4" }, "dependencies": { "@fosscord/util": "file:../util", diff --git a/cdn/scripts/tsconfig-paths-bootstrap.js b/cdn/scripts/tsconfig-paths-bootstrap.js deleted file mode 100644 index 50602b02..00000000 --- a/cdn/scripts/tsconfig-paths-bootstrap.js +++ /dev/null @@ -1,10 +0,0 @@ -const tsConfigPaths = require("tsconfig-paths"); -const path = require("path"); - -const cleanup = tsConfigPaths.register({ - baseUrl: path.join(__dirname, ".."), - paths: { - "@fosscord/cdn": ["dist/index.js"], - "@fosscord/cdn/*": ["dist/*"], - }, -}); diff --git a/cdn/tsconfig.json b/cdn/tsconfig.json index 2daac1ad..f893869f 100644 --- a/cdn/tsconfig.json +++ b/cdn/tsconfig.json @@ -70,6 +70,7 @@ "paths": { "@fosscord/cdn/": ["src/index.ts"], "@fosscord/cdn/*": ["src/*"] - } + }, + "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] } } diff --git a/gateway/package-lock.json b/gateway/package-lock.json index 40db319da8a742b4f6d65a61a87afc99f19909b0..df97d858837f70e044349095432f3a74a855b042 100644 GIT binary patch delta 2988 zcmd6oZD<>H9LM>mom;wgYr8dDx2EfZ!)<9U_mJj6-5^g*n&&3DqzSTlNiMldE=iNS zB$vF}zztuBI&b)A3~_rQ3VYL8G$;<4C_YYF1VscNP!Pd^eIxj0dP&pK;me}iz4`wh z;O_f-_Xo5qJ{tft<8lk zhbvEdtR9h;ZVc>~mTjtCY*C;qa(Cg{7hpsxeoY+Mj0hba8(Be%Nw3DqS}o-gpQ`J_iJ&1)#K!SB|q*I%3iZY zWa4bel8V-{d=hijLP?9XHZ&?-MGi~fzcjV--NlcTy(~|QaIFYNrRUG<2HGCoR?|ME z)$`Mb4Z&J7?H8j-9ZS-TJ;l$Zgm}}$YZ#04N8hoPt5+^7cXsCi%YzCPJnc{@q4oqg zwyztO-`BOY28nv(h=lIyCDW-eR^>Eip+MWsvk{Gmn{+he&8E!-ho2(6e9ayangycP zusQ<9P;g18S?n4?ua89+DKZzahEkQKIeLz>nPRp|l?>@;4UF9DL((dxhT}Fcv0{Gh zSyyk0DY4RxRo7sJZkrWZ%!VcHU7J#4S|)7uM*Y>2H=4HTOO04MW<&!uGT_rMz)3GS zC_O!>8miEIiL24wMZ^$;w0`n2xrdW0@89vMdKsGI;LwxcApG)AfQ|5NKgY{o>RMV< zUb*ELz$9tR<_R)k&Id9<@4O|+bKYhnMmt$YSv1o`MXV=$sK;S&cuh{uSPONI45s~At%UGd5+S20*Mr1CC7m|T!CL{U+u~4O+4l{(2_n}z5 zDTd?vI+wJvE|<&Vp0^b!%AR$En{E^5$wy0x_WJ6iyY7B?c^d52v{}?C!iZpqakKFI z2-Qgw2ns(vsd!X#{}}NtE$I%b+Y%F^mx2K`e6Jtue)%ZaGqMGw?e?TN7RmAOMJ*VE zXODtD__`YG={1uD3H1YmnRWRhFeIkgzXCcrf565Z)| ztc>|0^9xBgQLLk>GS9n85kH9=j2^CHuR0T0EY6Acus{kPk_k}m0)t_=E|Ms?M3Kx? z-R0n7I8ZPO_6EhHf$)5L9d>M7VC0fY);}Jcu5H5puypmx&#kj-;Fp~b6Y<-BS7j^x zEx3MiTeQdC1SkGY`qo{Q;`8ALjd*zLDKN7w#<$)%uJ~*JLqYM*^@i7<1OFGt-^CPr dTFa*t9}hk_Dt9Khfn~US1dO(70mV1N{{XNx+l>GK delta 122 zcmV-=0EPd(@d?eu39z*TlQ;$tlivd(mu*`C3zIN246`)^6M(big~|=H+Lgr#vtFQ? z39~1wh)A>3^h*}E)(in28n-ej0bLol=tBWOhPR8$0nQ4yKiB~X2)Fs*0mlfpw(0?^ cJ-0|H0=g2nSUm#i6t@Lb0>u!w=Vb!c5?d-W0ssI2 diff --git a/gateway/package.json b/gateway/package.json index 6b9e27d6..f5e66a9a 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -4,8 +4,9 @@ "description": "", "main": "dist/index.js", "scripts": { + "prepare": "ts-patch install -s", "test": "echo \"Error: no test specified\" && exit 1", - "start": "npm run build && node -r ./scripts/tsconfig-paths-bootstrap.js dist/start.js", + "start": "npm run build && node dist/start.js", "build": "npx tsc -b .", "dev": "tsnd --respawn src/start.ts" }, @@ -23,6 +24,7 @@ "@types/uuid": "^8.3.0", "@types/ws": "^7.4.0", "ts-node-dev": "^1.1.6", + "ts-patch": "^1.4.4", "typescript": "^4.2.3" }, "dependencies": { diff --git a/gateway/scripts/tsconfig-paths-bootstrap.js b/gateway/scripts/tsconfig-paths-bootstrap.js deleted file mode 100644 index 7308523b..00000000 --- a/gateway/scripts/tsconfig-paths-bootstrap.js +++ /dev/null @@ -1,10 +0,0 @@ -const tsConfigPaths = require("tsconfig-paths"); -const path = require("path"); - -const cleanup = tsConfigPaths.register({ - baseUrl: path.join(__dirname, ".."), - paths: { - "@fosscord/gateway": ["dist/index.js"], - "@fosscord/gateway/*": ["dist/*"], - }, -}); diff --git a/gateway/tsconfig.json b/gateway/tsconfig.json index 2530aa41..c50bd77a 100644 --- a/gateway/tsconfig.json +++ b/gateway/tsconfig.json @@ -72,6 +72,7 @@ "paths": { "@fosscord/gateway/*": ["src/*"], "@fosscord/util/*": ["../util/src/*"] - } + }, + "plugins": [{ "transform": "@zerollup/ts-transform-paths" }] } } diff --git a/util/tsconfig.json b/util/tsconfig.json index ac41cea5..7fbe3bac 100644 --- a/util/tsconfig.json +++ b/util/tsconfig.json @@ -68,12 +68,6 @@ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "resolveJsonModule": true, - "plugins": [ - { - "transform": "ts-transform-json-schema", - "type": "program" - } - ] + "resolveJsonModule": true } }