diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index f4eee3cae..c0db85366 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -43,6 +43,11 @@ jobs: - name: Set up Bun uses: oven-sh/setup-bun@v2 + - name: Set up Dotnet + uses: actions/setup-dotnet@v5 + with: + dotnet-version: "10.0.x" + - name: Set up Protoc uses: arduino/setup-protoc@v3 with: diff --git a/.vscode/settings.json b/.vscode/settings.json index b3c0ed755..eaf831158 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -43,6 +43,7 @@ "Callouts", "Camo", "Carro", + "catalogitemaccessor", "CCPAOPTOUT", "CDON", "clanid", diff --git a/package.json b/package.json index 49a185b2b..ffa142003 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "license": "BlitzKit License", "private": true, "scripts": { + "setup": "chmod a+x scripts/*.sh && ./scripts/setup.sh", "setup": "bun install && bun run build:protos && bun run build:proxyclient && bun run build:catalogitemaccessor", "dev": "bun run dev:website", "dev:website": "cd packages/website-ue && bun run dev", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 92d06951c..ec03d14ad 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,5 +1,21 @@ { "name": "@blitzkit/scripts", + "type": "module", + "private": true, + "scripts": { + "build:assets": "bun src/buildAssets/index.ts", + "build:averages": "bun src/averages.ts", + "setup:depotdownloader": "bun src/setupDepotDownloader.ts", + "setup:patches": "bun src/applyPatches.ts", + "build:reviews": "bun src/reviews.ts", + "build:ids": "bun src/discoverIds.ts", + "build:bot": "bun src/buildBot.ts", + "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts", + "build:proxyclient": "bun src/buildProxyClient.ts", + "build:catalogitemaccessor": "bun src/buildCatalogItemAccessor.ts", + "build:protos": "bun src/protos.ts", + "patchnotes": "bun src/patchNotes.ts" + }, "dependencies": { "@blitzkit/closed": "workspace:*", "@blitzkit/core": "workspace:*", @@ -33,21 +49,5 @@ "ts-proto": "^2.7.7", "unzipit": "^1.4.3", "yaml": "^2.8.1" - }, - "private": true, - "scripts": { - "build:assets": "bun src/buildAssets/index.ts", - "build:averages": "bun src/averages.ts", - "setup:depotdownloader": "bun src/setupDepotDownloader.ts", - "setup:patches": "bun src/applyPatches.ts", - "build:reviews": "bun src/reviews.ts", - "build:ids": "bun src/discoverIds.ts", - "build:bot": "bun src/buildBot.ts", - "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts", - "build:proxyclient": "bun src/buildProxyClient.ts", - "build:catalogitemaccessor": "bun src/buildCatalogItemAccessor.ts", - "build:protos": "bun src/protos.ts", - "patchnotes": "bun src/patchNotes.ts" - }, - "type": "module" + } } diff --git a/scripts/setup.sh b/scripts/setup.sh new file mode 100644 index 000000000..7c3c47549 --- /dev/null +++ b/scripts/setup.sh @@ -0,0 +1,11 @@ +bun install + +cd packages/scripts +bun run build:protos +bun run build:proxyclient +bun run build:proxyclient +bun run build:catalogitemaccessor + +cd ../game +dotnet restore +dotnet build \ No newline at end of file