diff --git a/bun.lock b/bun.lock index 1ef5f6e9f..be2d63f84 100644 --- a/bun.lock +++ b/bun.lock @@ -96,6 +96,7 @@ "lz4js": "^0.2.0", "progress": "^2.0.3", "puppeteer": "^24.22.3", + "ts-proto": "^2.7.7", }, "devDependencies": { "@types/decompress": "^4.2.7", diff --git a/package.json b/package.json index ba2c87992..2b8c71e7e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "update": "yarn upgrade --latest", "tunnel": "cloudflared tunnel --url http://localhost:3000", "discoverids": "scripts/discoverIds.ts", - "build:protos": "bun packages/scripts/src/protos.ts", + "build:protos": "cd packages/scripts && bun run build:protos", "preview:website": "cd packages/website && bun run preview", "build:reviews": "cd packages/scripts && bun build:reviews", "build:ids": "cd packages/scripts && bun build:ids", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 52fa9193a..ae0baf488 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -12,11 +12,12 @@ "build:bot": "bun src/buildBot.ts", "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts", "build:proxyclient": "bun src/buildProxyClient.ts", - "prunestrings": "bun src/pruneStrings.ts" + "prunestrings": "bun src/pruneStrings.ts", + "build:protos": "bun src/protos.ts" }, "dependencies": { - "@blitzkit/core": "workspace:*", "@blitzkit/closed": "workspace:*", + "@blitzkit/core": "workspace:*", "@blitzkit/i18n": "workspace:*", "@gltf-transform/core": "^4.2.1", "@gltf-transform/extensions": "^4.2.1", @@ -29,7 +30,8 @@ "fast-xml-parser": "^5.2.5", "lz4js": "^0.2.0", "progress": "^2.0.3", - "puppeteer": "^24.22.3" + "puppeteer": "^24.22.3", + "ts-proto": "^2.7.7" }, "devDependencies": { "@types/decompress": "^4.2.7", diff --git a/packages/scripts/src/protos.ts b/packages/scripts/src/protos.ts index 668fb2873..016110dcb 100644 --- a/packages/scripts/src/protos.ts +++ b/packages/scripts/src/protos.ts @@ -6,8 +6,8 @@ import { promisify } from "util"; const MAX_COMMAND_LENGTH = 2 ** 11; const roots = [ - // "packages/core/src/protos", - "submodules/blitzkit-closed/protos", + // "../../packages/core/src/protos", + "../../packages/closed/protos", ]; const exec = promisify(execSync); diff --git a/tsconfig.json b/tsconfig.json index 41ac2be96..5774637a5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,11 +14,6 @@ "allowJs": true, "incremental": true, "isolatedModules": true, - "plugins": [ - { - "name": "next" - } - ], "paths": { "@protos/*": ["./packages/closed/protos/*"] }