From d1ae4e4a06e21ccf36e0dde47b1f13dec4eb77ab Mon Sep 17 00:00:00 2001 From: Rory& Date: Sun, 9 Aug 2026 10:02:52 +0200 Subject: [PATCH] Move to TS7 --- .lintstagedrc.mjs | 4 ++-- default.nix | 2 +- extra/admin-api/scaffold-db | 2 +- package-lock.json | Bin 302435 -> 311147 bytes package.json | 24 +++++++++++++----------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs index 7fc5b11e3..437582a1a 100644 --- a/.lintstagedrc.mjs +++ b/.lintstagedrc.mjs @@ -1,7 +1,7 @@ export default { - "*.{j,t}s": [() => "npm run build:src:tsgo", "eslint --concurrency 4" /* sweet spot it seems */, "prettier --write"], + "*.{j,t}s": [() => "npm run build:src", "eslint --concurrency 4" /* sweet spot it seems */, "prettier --write"], "src/schemas/{*,**/*}.ts": [ - () => "npm run build:src:tsgo", + () => "npm run build:src", () => "node scripts/schema.js", () => "node scripts/openapi.js", () => "git add assets/schemas.json assets/openapi.json", diff --git a/default.nix b/default.nix index 999efffcc..533c095f3 100644 --- a/default.nix +++ b/default.nix @@ -61,7 +61,7 @@ let ''; buildPhase = '' - npm run build:tsgo + npm run build ''; installPhase = '' diff --git a/extra/admin-api/scaffold-db b/extra/admin-api/scaffold-db index ab31be8fa..b55fbd673 100755 --- a/extra/admin-api/scaffold-db +++ b/extra/admin-api/scaffold-db @@ -12,7 +12,7 @@ dropdb -U postgres sb-server-scaffold --if-exists --force || true createdb -U postgres sb-server-scaffold # - Build spacebar-ts and apply it's migrations pushd ../.. -npm run build:src:tsgo +npm run build:src DATABASE=postgres://postgres@127.0.0.1/sb-server-scaffold npm run apply:migrations popd diff --git a/package-lock.json b/package-lock.json index 627f267fb64dcf5aa47641780677423fe1257bfc..cf0c162df8095d65594b6604d323ce495dc2b17f 100644 GIT binary patch delta 5109 zcmai1ORwW*8CK?;w$STzX4+0^XWAJgXz?6u$G4;s%s5VBJBj0K5+|aCIJOffj$_A8 zVq2;xst`M93Brr+5GxiHf<;w?fc6I<$}cEFVuMtvh&AFQ=j0scQdmTa^1b=q=Xu}f zy?lTF-L-%I=i0A7d;FQZuf2TNamTL(k!$$9spSR_-XN0C-#)&cyz|JF$A0_j6ZOpP zmBE8c3-IzQ{@@Kfx$~RM&EzL9WgdO|y(d3-@5#)c?=0_P*KRo7v9Y@T()#YbU*{w7I z#|XY4{#(gBH`}{w3;o13oG-X+3;o7!@3t-U{>+*9`|{bk=~Q4y_KF8JgQmig*gRlfWn^Z3c3k^oN*{1Hb_&MH{plxlUu|sX9ZaxlBf7+~UM}ZWv(!xM40*p6w3V7S=(Bwbj}5on1@bi0!3Pjl=cthw z(p5`Pxlm2Ic;@8jR6@zSc;;tUx>oYZ{iAZ?5}D$cFCZqLe)9-O9$=Z{O9IHnX|Sov zb-itKIIq|B$vKTif3k?X(>%A3!LHPDaTDpH)rJ>KLvn?DOxGz6ul1C^IvWFe!R-5m zCRYc@{+y>Mtv^#Et2e@Hm4RFE7SI+;=s9RP`S9fxiRGua@JG%aFTD?MC-406 z$}7q1_cPQXS`Xl(J3EPi4{$rpz+q;o)HFD{7-GKS#`Oi#vIIk82s;n4Ewj?^mvq4B zGXdz~E&);r0yISYX4BLLD!`$Nn|%Ht^U+~Cm-1RZ z@$4%*B+^xVF%z~aT>QMzR^K!gBoyMjFA+nqT`7g5NN|EF3klhhkXJQ6YQ@1I3(`I$ z`9T%PLsFr~Lrzbfs1c|cZQF)rb&*5yx|xl2rxZit5`J#2t)GAE=&hY%Uf#L+jUCwO z*k9n=jeY8116>@TMgs*SBq|Oab2yBIwl&~}7|0h{dmI3Tcm@+Z3z(KH6$dT|7=PfXF%3tbf>AN>my}#n92DZ z-f)?fnBFLF;7#Um6~Tr~uhhbuOm*I2 z0XLf4gxM(xC`UE0T6@lVFg-iva_^xtq^tJ2{OtJ~%eOv!>asX)?(sSw`^n!vzH)mf zO~e-&+lM5!*&j9pCA2yxIj4joEle~#4XQ;L&LiU%*J8=O&qXnU7pZR4(=kWugZWWB zhHPtrR3<%B@}f!`stV({Jk*0@aSo6KH61lrTIw>^g3V1VMj=_)B!$+Xj8>pI zX^*I!W|1}{H=B!)6Omxp$%4hE=7^THqH{3}_p`OH!u3|Q!)RZH=eyS-PUlA(Rtpmv zdZi*ioC=atU9_brsuZOO3|BdA&XuPPz(ZrN8c_qjScvELNE_5evpTPZBGp?cu3qe_ zGSg9-vjJ3@P}3^a;Fz@v&yXHg;XbeR7P!pZxV0m}{cNo*4>4OGY<+GBW@2S$Bbop8f!Gj7GbXuKF?`*m4tMlxfL zq$15L&C#S)8&YFll)F42Ogs@I3Xo|_ZeAt(LjnL4#rDItnOU`>_RxbDS_SCR-w;r_1<%uZ_odC~9`GFV_O{Lp$ zag3!Z!xYHp{0SJnJxhyV8h7N(wkm0@(stEg>a^qmnz~ d@r{(kwmIZ}^d_A-{aiWy9DVR6ef*Ece*v6j>oNcU delta 2361 zcmbW2U2EHB6vvShLMcl+w_Qp%N|W|xo9pP2EX#5jY?5VLwq;wEEnD_Rscb2hWJ`XN zEz9g;Fv{+_7cq1<(l0Oq8)Vxz80=>3dKY7`T?_{K0%dlxhQzU((u)U#&hytfzjOY2 zo`0TQ|MREo2miiyH`whfBTcdI?QY$B7})_kASf%N9TcEAK#-{G_ief#tgn5yy`F=7 z4{`VDFE>8j-#FagfPUY;@?7kZyU_Of86}Q*q~EvezW&>qx4#RmA*N($Bjx#iI0&DA z5uD3B)j#$70z#nQRLdDS8PDbE7^TP{#AV4kLv{!v%;AiUGfE{aOR1RBCP3aGvskpC zlnl9%igYv$j#jcg5f#)d80_V;45)@#B_D9Vj6_`S{WraXzkRp;)}Yy$!Phkto;~k) zN8hg|y+;{n(*;}C+=E+JypK_6XXAXu-VqADF^BxeJHA_AU7Zq#ptbq!NC>*|g6+Zc zUk|o5b2tu4ePdSI#payNG~dcoDUMw(UYvLQGSd0Hwq}OVS;;RW-kIY)5iiS&y1#yd zd0THmSFg=wb-@qs`Y-n9ocS_yxn!w7O?Oi1MJJw(F0&<;6jKAN24is$NA`Hpun;jG zF*3YnH`P`r#|*4`ugE0YcrC&y6-q8?#RMPLv2?N%s&xr|QVZnpNv%_^<@b^yCfCy| zmRE>Fu>0ipmIrvq^6tC`eLim@vbgg0Wwgn~wA0ouWu3;Bkyc~kB&!Kkvz6~Q5k?J^ znpHNOtszmMXcET8iC#BuX#pK8m^Fvw)k3_^Rf@ty+$-psNjjlIV;nJc$#CQ%(;ZS~ zo@QsH54>j|LSG+KZq8Nwzk$82k5=zqMjKzO?Hd9X5}cM0?D%XfdNVn+9%2+Ze^dL%!0hG%&5qR4gJbkTKYBA|e9E z>BA{&9=f@xO!vrt|1!SRBH=RYo)RvfX9APC1Z(g-*FZ(3S8%X!oz4_`^(L0Zm`)<% z)I~`N&{Mul#QZFo{?<$?RjkM|F! z&h;&U_21mS40iD_7drO@^##UFz%8PqHA1%20~Il4yYO> zO6NxLS~ufRdTdXY(pDI=EwjPJ2D8QPcnQSH$!RFob+vxB?g!- tj~trPk{Jx}n2e`K)o@smEwu^vXTaHWu+h&RYtVH0rfcQ!v9|h`@E`c0@t*(y diff --git a/package.json b/package.json index cfaf821d7..0e8d7ff1e 100644 --- a/package.json +++ b/package.json @@ -12,19 +12,17 @@ "start:webrtc": "node --enable-source-maps dist/webrtc/start.js", "build": "npm run build:src && npm run generate:schema && npm run generate:openapi", "build:src": "tsc -b -v", - "build:tsgo": "npm run build:src:tsgo && npm run generate:schema && npm run generate:openapi", - "build:src:tsgo": "rm -rf dist/* tsconfig.tsbuildinfo && tsgo -b -v", "watch": "tsc -w -b .", "test": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/test.js", - "lint": "eslint .", + "lint": "eslint . --stats --concurrency 4", "setup": "npm run build && npm run generate:schema", "sync:db": "npm run build && node -r dotenv/config -r module-alias/register --enable-source-maps scripts/syncronise.js", - "generate:rights": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/rights.js", - "generate:schema": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/schema.js", - "generate:migration": "node -r dotenv/config -r module-alias/register --enable-source-maps node_modules/typeorm/cli.js migration:generate -d dist/database/Database.js", - "generate:openapi": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/openapi.js", - "add:license": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/license.js", - "node:tests": "npm run build:src:tsgo && node -r dotenv/config -r module-alias/register --enable-source-maps --test --experimental-test-coverage dist/**/*.test.js", + "generate:rights": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/rights.js", + "generate:schema": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/schema.js", + "generate:migration": "node-r dotenv/config -r module-alias/register --enable-source-maps node_modules/typeorm/cli.js migration:generate -d dist/database/Database.js", + "generate:openapi": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/openapi.js", + "add:license": "node -r dotenv/config -r module-alias/register --enable-source-maps scripts/license.js", + "node:tests": "npm run build:src && node -r dotenv/config -r module-alias/register --enable-source-maps --test --experimental-test-coverage dist/**/*.test.js", "apply:migrations": "node --enable-source-maps dist/apply-migrations.js" }, "main": "dist/bundle/index.js", @@ -65,7 +63,7 @@ "@types/ws": "^8.18.1", "@typescript-eslint/eslint-plugin": "^8.61.0", "@typescript-eslint/parser": "^8.61.0", - "@typescript/native-preview": "^7.0.0-dev.20260119.1", + "@typescript/native": "npm:typescript@^7.0.2", "eslint": "^9.39.4", "eslint-plugin-node-import": "^1.2.0", "globals": "^17.6.0", @@ -74,7 +72,7 @@ "prettier": "^3.8.4", "pretty-quick": "^4.2.2", "ts-node": "^10.9.2", - "typescript": "^6.0.3", + "typescript": "npm:@typescript/typescript6@^6.0.3", "typescript-json-schema": "^0.67.4" }, "dependencies": { @@ -149,5 +147,9 @@ "sqlite3": "../_EXCLUDED_", "mongodb": "../_EXCLUDED_" } + }, + "allowScripts": { + "bcrypt@6.0.0": true, + "cbor-extract@2.2.2": true } }