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 627f267fb..cf0c162df 100644 Binary files a/package-lock.json and b/package-lock.json differ 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 } }