From fd1c99db2d0004cbdfa6e5a1e00f691614c249fd Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:20:03 +0100 Subject: [PATCH] build: remove sqlite3 in favor of better-sqlite3 --- package-lock.json | Bin 540103 -> 541638 bytes package.json | 3 +-- src/util/util/Database.ts | 11 ++--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43a1114ef79f491c5e9673b330616b2574c0af69..3713fc53f85f20cb78b29efd2a61d1beb8c4ab64 100644 GIT binary patch delta 1744 zcmZuxYfM~46wb`tduLxf3UtAReX$EQ_Cbv?CPum~r3?!$P*m#C|q4!ndLhF;{ zY@Ja9=jP=_0(<6J2~4a|7mN=Pj>V^m&7i=_Psko|M78P*BwaOnJ|!>Z2+FB#^!7d* zbAo$}WWfqkW^m*?($*-V-ZIIL^$yxkbpau^244PFDT0AZG=yO%{fwpaV6&I*rRnwH znx9JelaKCtEj@r$AJbB<5om@D{zDY(jMDC0K{_-_gRo_o#xr2|pQm<9#$D(4bYh(b z!=^>rCS+->su{araEZFHHcsujEln%*^9)-~``GJwhM3M`mJeqOSvg!dz+BL2XJ&Ng zGs&?QHv^1|lx(Y%B^Ypjh=ogq5Y^x^yxPvD???kW@sDH7Vl;)OOJR z737A&aaF-gm<0Nkxfw@da<0ykh@!f%bN3~)J&6r1)Ysz9YVLzZiI+p*Z~2B%3o91n z?9AHObVCN4A$^J|QgxEo4Iu}0z|VeOg6nG)tF9nX0e99Z9g+dWkPmG)!BlxC zWd6W^n$72YhuCveWrRdN9xdYU>rnN!4%;1EA3#W);o$;xde0T}Wl>(etH$dk{42LO zt8gzI*~H>7;pcXotmMvAA-MrwlX`w?GcVA;HtnT8Z04)s%^GIIQ&qf2m!wACPEn6% zw(+&8B=I1B-etG}v+c|c4Grpd5pCuBN)6lW-Q1xANm%iK`8cb94|;eGb{*n1ZX6qvY2O)Qz+(}9>)1xp(FEOpG9L!EkdIX!UffD5 z!xk8qB}g5!&`>c&*Mt8{B4Brt=M;|RPve%RSba=kSg5ONi zm1<6ubH1yDfVP8d2Hfr!9*8ca9M%{@Kjvjy{xk9+!rDEGVvUz=wsG>9hokxIboL&_ zhkVRs3*1`7p0z{r7{Mot+4V9t&Q~?!4z|^>Zf30ocJ}cq2sD!-JW$J4*r49sv=Vx1 zg^msN>^`ZY+%E22$?n+k;UoiaH!=<{gxPeApJ0Cz*yD1PXCEQ+2PuOytJ$czgL;(N zo{(xG^SlVaK$Mk2>KCFzu$67b@t4@rd0FM2*v|~R*01l23UHnxbD?^W6hP-8reQkH zZr*Qi!9#Vp+$RlI^&KlLH!Bq4>nRq_E*P#}V`HkcDIB~uD4bYwgRR}F2K!)>W05L` zsb?HxSFAShRs#>`!9ZMiVjbya_}NCDEB7L=FfU0A9NEN|kXZDz7po%t@u$p)7o^AQ zFms$2sZ3m&fRI8?WQJS|S#|puWK~32e z%g<{Qy2^iKSPRTn1$T1cR$YSZau#0DMUbHEx>?QInIjt9iaI#UY-mvAKyRrizy&43 zX-^&Ti#Khl?n#;(5T5^yz(hWC!QP;_eGfTG^53Ofr0yuKyMQVQ^H+#^f~~b;j`fg_ zU)PH+r4)9K@ZTuJtA!3Hdq^>AkFuGvsQPg^@WLuFRiX%`5%-0Z23>oEG@MmN8m?Vd xl==AT=OQf=%%yKnu{s<&E7n^=z=m^TOa;slQR+~>TETlm`W&0dS*G^{{s9=!@LT`@ diff --git a/package.json b/package.json index 101a5f53..85edb0e5 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,6 @@ "erlpack": "^0.1.4", "nodemailer-mailgun-transport": "^2.1.5", "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", - "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", - "sqlite3": "^5.1.6" + "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport" } } diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 5d48ac03..1cf7adfd 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -36,17 +36,10 @@ if (!process.env) { const dbConnectionString = process.env.DATABASE || path.join(process.cwd(), "database.db"); -let DatabaseType = dbConnectionString.includes("://") +const DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") - : "sqlite"; + : "better-sqlite"; -if (DatabaseType === "sqlite") { - try { - require("better-sqlite3"); - DatabaseType = "better-sqlite3"; - // eslint-disable-next-line no-empty - } catch (error) {} -} const isSqlite = DatabaseType.includes("sqlite"); const DataSourceOptions = new DataSource({