From 416d061df117e66700335a7719b9758d7826076d Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Mon, 18 May 2026 15:33:38 -0500 Subject: [PATCH] all paths --- .../src/pages/[api]/avatars/[id].json.ts | 8 +++++--- .../src/pages/[api]/avatars/all.json.ts | 2 ++ .../website-ue/src/pages/[api]/avatars/all.pb.ts | 2 ++ .../src/pages/[api]/avatars/list.json.ts | 2 ++ .../src/pages/[api]/backgrounds/[id].json.ts | 8 +++++--- .../src/pages/[api]/backgrounds/all.json.ts | 2 ++ .../src/pages/[api]/backgrounds/list.json.ts | 2 ++ .../src/pages/[api]/currencies/[id].webp.ts | 7 ++++--- .../src/pages/[api]/enums/[enum].json.ts | 15 ++++++++++----- .../website-ue/src/pages/[api]/enums/all.json.ts | 2 ++ .../website-ue/src/pages/[api]/enums/list.json.ts | 2 ++ .../website-ue/src/pages/[api]/equipment.pb.ts | 2 ++ .../[api]/game-strings/[locale]/[group].json.ts | 8 +++++--- .../src/pages/[api]/nations/[id]/card.webp.ts | 8 +++++--- .../src/pages/[api]/strings/[locale].json.ts | 8 +++++--- .../website-ue/src/pages/[api]/tanks/[id].json.ts | 8 +++++--- .../website-ue/src/pages/[api]/tanks/all.json.ts | 2 ++ .../website-ue/src/pages/[api]/tanks/all.pb.ts | 2 ++ .../src/pages/[api]/tanks/characteristics.json.ts | 2 ++ .../website-ue/src/pages/[api]/tanks/list.json.ts | 2 ++ .../website-ue/src/pages/[api]/tanks/list.pb.ts | 2 ++ .../src/pages/[api]/tanks/popular.json.ts | 2 ++ .../src/pages/[api]/tanks/popular.pb.ts | 2 ++ .../pages/[api]/tanks/presets/upgrade/[id].pb.ts | 8 +++++--- packages/website-ue/src/pages/[api]/tiers.json.ts | 2 ++ packages/website-ue/src/pages/[api]/tiers.pb.ts | 2 ++ 26 files changed, 83 insertions(+), 29 deletions(-) diff --git a/packages/website-ue/src/pages/[api]/avatars/[id].json.ts b/packages/website-ue/src/pages/[api]/avatars/[id].json.ts index 455f8a1da..034f5854e 100644 --- a/packages/website-ue/src/pages/[api]/avatars/[id].json.ts +++ b/packages/website-ue/src/pages/[api]/avatars/[id].json.ts @@ -1,13 +1,15 @@ -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { api } from "../../../api/dynamic"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const { avatars } = await api.avatars(); return avatars.map((avatar) => ({ params: { id: avatar.name }, })); -}) satisfies GetStaticPaths; +}); /** * Returns data on an avatar based on its `id`. Do not use the `.webp` URLs diff --git a/packages/website-ue/src/pages/[api]/avatars/all.json.ts b/packages/website-ue/src/pages/[api]/avatars/all.json.ts index c142e554f..7d4d43415 100644 --- a/packages/website-ue/src/pages/[api]/avatars/all.json.ts +++ b/packages/website-ue/src/pages/[api]/avatars/all.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * Identical to `avatars/[id].json`, but returns data on all avatars at once, * mapped by `id`. diff --git a/packages/website-ue/src/pages/[api]/avatars/all.pb.ts b/packages/website-ue/src/pages/[api]/avatars/all.pb.ts index d14320976..b526ce8ea 100644 --- a/packages/website-ue/src/pages/[api]/avatars/all.pb.ts +++ b/packages/website-ue/src/pages/[api]/avatars/all.pb.ts @@ -1,6 +1,8 @@ import { Avatars } from "@protos/avatars"; import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + export async function GET() { const avatars = await api.avatars(); return new Response(Avatars.encode(avatars).finish()); diff --git a/packages/website-ue/src/pages/[api]/avatars/list.json.ts b/packages/website-ue/src/pages/[api]/avatars/list.json.ts index dde938027..81757d180 100644 --- a/packages/website-ue/src/pages/[api]/avatars/list.json.ts +++ b/packages/website-ue/src/pages/[api]/avatars/list.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * Returns a list of all avatars ids. * diff --git a/packages/website-ue/src/pages/[api]/backgrounds/[id].json.ts b/packages/website-ue/src/pages/[api]/backgrounds/[id].json.ts index 4916a4bb1..44a5cdc11 100644 --- a/packages/website-ue/src/pages/[api]/backgrounds/[id].json.ts +++ b/packages/website-ue/src/pages/[api]/backgrounds/[id].json.ts @@ -1,13 +1,15 @@ -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { api } from "../../../api/dynamic"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const { backgrounds } = await api.backgrounds(); return backgrounds.map((background) => ({ params: { id: background.name }, })); -}) satisfies GetStaticPaths; +}); export async function GET({ params }: APIContext) { const background = await api.background(params.id); diff --git a/packages/website-ue/src/pages/[api]/backgrounds/all.json.ts b/packages/website-ue/src/pages/[api]/backgrounds/all.json.ts index 88b2f69e2..2655a6612 100644 --- a/packages/website-ue/src/pages/[api]/backgrounds/all.json.ts +++ b/packages/website-ue/src/pages/[api]/backgrounds/all.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + export async function GET() { const { backgrounds } = await api.backgrounds(); return Response.json(backgrounds); diff --git a/packages/website-ue/src/pages/[api]/backgrounds/list.json.ts b/packages/website-ue/src/pages/[api]/backgrounds/list.json.ts index 298f4d8d8..a0b767c65 100644 --- a/packages/website-ue/src/pages/[api]/backgrounds/list.json.ts +++ b/packages/website-ue/src/pages/[api]/backgrounds/list.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + export async function GET() { const { backgrounds } = await api.backgrounds(); const list = backgrounds.map((background) => background.name); diff --git a/packages/website-ue/src/pages/[api]/currencies/[id].webp.ts b/packages/website-ue/src/pages/[api]/currencies/[id].webp.ts index 0dd1b4cdf..00688efda 100644 --- a/packages/website-ue/src/pages/[api]/currencies/[id].webp.ts +++ b/packages/website-ue/src/pages/[api]/currencies/[id].webp.ts @@ -1,11 +1,12 @@ -import type { GetStaticPaths } from "astro"; import { api } from "../../../api/dynamic"; import { imageProxy } from "../../../api/imageProxy"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const group = api.metadata.group("CurrencyEntity"); return group.map(({ name }) => ({ params: { id: name } })); -}) satisfies GetStaticPaths; +}); export async function GET({ params }: { params: { id: string } }) { const icon = await api.currencyIcon(params.id); diff --git a/packages/website-ue/src/pages/[api]/enums/[enum].json.ts b/packages/website-ue/src/pages/[api]/enums/[enum].json.ts index 22ac7e20a..56711018b 100644 --- a/packages/website-ue/src/pages/[api]/enums/[enum].json.ts +++ b/packages/website-ue/src/pages/[api]/enums/[enum].json.ts @@ -1,7 +1,12 @@ -import { TankClass, TankType } from "@blitzkit/core"; -import { Nation } from "@protos/blitz_static_tank_component"; -import type { APIContext, GetStaticPaths } from "astro"; +import { + Nation, + TankClass, + TankType, +} from "@protos/blitz_static_tank_component"; +import type { APIContext } from "astro"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; import { GunType } from "../../../tankopedia/characteristics"; +import { getStaticPaths as _getStaticPaths } from "../_index"; import { GET as _GET } from "./all.json"; export const ENUMS = { @@ -11,9 +16,9 @@ export const ENUMS = { "gun-type": GunType, }; -export const getStaticPaths = (() => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { return Object.keys(ENUMS).map((name) => ({ params: { enum: name } })); -}) satisfies GetStaticPaths; +}); export async function GET({ params, diff --git a/packages/website-ue/src/pages/[api]/enums/all.json.ts b/packages/website-ue/src/pages/[api]/enums/all.json.ts index c08f140e6..d7314c959 100644 --- a/packages/website-ue/src/pages/[api]/enums/all.json.ts +++ b/packages/website-ue/src/pages/[api]/enums/all.json.ts @@ -1,5 +1,7 @@ import { ENUMS } from "./[enum].json"; +export { getStaticPaths } from "../_index"; + export function GET() { const enums: Record> = {}; diff --git a/packages/website-ue/src/pages/[api]/enums/list.json.ts b/packages/website-ue/src/pages/[api]/enums/list.json.ts index 5af2a3fb1..0f927b8d0 100644 --- a/packages/website-ue/src/pages/[api]/enums/list.json.ts +++ b/packages/website-ue/src/pages/[api]/enums/list.json.ts @@ -1,5 +1,7 @@ import { ENUMS } from "./[enum].json"; +export { getStaticPaths } from "../_index"; + export function GET() { const list = Object.keys(ENUMS); return Response.json(list); diff --git a/packages/website-ue/src/pages/[api]/equipment.pb.ts b/packages/website-ue/src/pages/[api]/equipment.pb.ts index 95527883d..c87e1e879 100644 --- a/packages/website-ue/src/pages/[api]/equipment.pb.ts +++ b/packages/website-ue/src/pages/[api]/equipment.pb.ts @@ -1,6 +1,8 @@ import { Equipment } from "@protos/equipment"; import { api } from "../../api/dynamic"; +export { getStaticPaths } from "./_index"; + export async function GET() { const equipment = await api.equipment(); return new Response(Equipment.encode(equipment).finish()); diff --git a/packages/website-ue/src/pages/[api]/game-strings/[locale]/[group].json.ts b/packages/website-ue/src/pages/[api]/game-strings/[locale]/[group].json.ts index 7ad77c418..dab204e0e 100644 --- a/packages/website-ue/src/pages/[api]/game-strings/[locale]/[group].json.ts +++ b/packages/website-ue/src/pages/[api]/game-strings/[locale]/[group].json.ts @@ -1,8 +1,10 @@ import locales from "@blitzkit/i18n/locales.json"; -import type { GetStaticPaths, GetStaticPathsResult } from "astro"; +import type { GetStaticPathsResult } from "astro"; import { api } from "../../../../api/dynamic"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsResult = []; const groups = await api.gameStringGroups(); @@ -13,7 +15,7 @@ export const getStaticPaths = (async () => { } return paths; -}) satisfies GetStaticPaths; +}); export async function GET({ params, diff --git a/packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts b/packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts index d37e12f70..7cd9dba42 100644 --- a/packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts +++ b/packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts @@ -1,14 +1,16 @@ import { Nation } from "@protos/blitz_static_tank_component"; -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { clientUnmountedResponse } from "../../../../api/responses"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { game } from "../../../../game/game"; import { clientUnmounted } from "../../../../game/unmounted"; +import { getStaticPaths as _getStaticPaths } from "../../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { return Object.values(Nation) .filter(Number.isInteger) .map((id) => ({ params: { id } })); -}) satisfies GetStaticPaths; +}); /** * Even Noah can't save these animals. diff --git a/packages/website-ue/src/pages/[api]/strings/[locale].json.ts b/packages/website-ue/src/pages/[api]/strings/[locale].json.ts index 429f32312..51b853ec7 100644 --- a/packages/website-ue/src/pages/[api]/strings/[locale].json.ts +++ b/packages/website-ue/src/pages/[api]/strings/[locale].json.ts @@ -1,10 +1,12 @@ import locales from "@blitzkit/i18n/locales.json"; -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { api } from "../../../api/dynamic"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../_index"; -export const getStaticPaths = (() => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { return locales.supported.map(({ locale }) => ({ params: { locale } })); -}) satisfies GetStaticPaths; +}); /** * BlitzKit strings. diff --git a/packages/website-ue/src/pages/[api]/tanks/[id].json.ts b/packages/website-ue/src/pages/[api]/tanks/[id].json.ts index 5e286a972..a03036b64 100644 --- a/packages/website-ue/src/pages/[api]/tanks/[id].json.ts +++ b/packages/website-ue/src/pages/[api]/tanks/[id].json.ts @@ -1,10 +1,12 @@ -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { api } from "../../../api/dynamic"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const { list } = await api.tankList(); return list.map(({ id }) => ({ params: { id } })); -}) satisfies GetStaticPaths; +}); /** * Even Noah can't save these animals. diff --git a/packages/website-ue/src/pages/[api]/tanks/all.json.ts b/packages/website-ue/src/pages/[api]/tanks/all.json.ts index 279271096..07c0b8643 100644 --- a/packages/website-ue/src/pages/[api]/tanks/all.json.ts +++ b/packages/website-ue/src/pages/[api]/tanks/all.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * Literally all the tanks in one place lmao. */ diff --git a/packages/website-ue/src/pages/[api]/tanks/all.pb.ts b/packages/website-ue/src/pages/[api]/tanks/all.pb.ts index 749841658..a634f92e2 100644 --- a/packages/website-ue/src/pages/[api]/tanks/all.pb.ts +++ b/packages/website-ue/src/pages/[api]/tanks/all.pb.ts @@ -1,6 +1,8 @@ import { Tanks } from "@protos/tanks"; import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * Literally all the tanks in one place lmao. */ diff --git a/packages/website-ue/src/pages/[api]/tanks/characteristics.json.ts b/packages/website-ue/src/pages/[api]/tanks/characteristics.json.ts index 972c26605..ee9d1cba4 100644 --- a/packages/website-ue/src/pages/[api]/tanks/characteristics.json.ts +++ b/packages/website-ue/src/pages/[api]/tanks/characteristics.json.ts @@ -1,5 +1,7 @@ import { characteristicsOrder } from "../../../tankopedia/characteristicsOrder"; +export { getStaticPaths } from "../_index"; + /** * The naked man fears no pickpocket. */ diff --git a/packages/website-ue/src/pages/[api]/tanks/list.json.ts b/packages/website-ue/src/pages/[api]/tanks/list.json.ts index 1a07401b3..4233ba454 100644 --- a/packages/website-ue/src/pages/[api]/tanks/list.json.ts +++ b/packages/website-ue/src/pages/[api]/tanks/list.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * List! */ diff --git a/packages/website-ue/src/pages/[api]/tanks/list.pb.ts b/packages/website-ue/src/pages/[api]/tanks/list.pb.ts index afa54848a..7f7e8730d 100644 --- a/packages/website-ue/src/pages/[api]/tanks/list.pb.ts +++ b/packages/website-ue/src/pages/[api]/tanks/list.pb.ts @@ -1,6 +1,8 @@ import { TankList } from "@protos/tank_list"; import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + /** * List!! */ diff --git a/packages/website-ue/src/pages/[api]/tanks/popular.json.ts b/packages/website-ue/src/pages/[api]/tanks/popular.json.ts index 0a7bec9fc..fc6b5f1cd 100644 --- a/packages/website-ue/src/pages/[api]/tanks/popular.json.ts +++ b/packages/website-ue/src/pages/[api]/tanks/popular.json.ts @@ -1,5 +1,7 @@ import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + export async function GET() { const popular = await api.popularTanks(); return Response.json(popular); diff --git a/packages/website-ue/src/pages/[api]/tanks/popular.pb.ts b/packages/website-ue/src/pages/[api]/tanks/popular.pb.ts index fb985d4d3..5f1e5ab27 100644 --- a/packages/website-ue/src/pages/[api]/tanks/popular.pb.ts +++ b/packages/website-ue/src/pages/[api]/tanks/popular.pb.ts @@ -1,6 +1,8 @@ import { PopularTanks } from "@protos/popular_tanks"; import { api } from "../../../api/dynamic"; +export { getStaticPaths } from "../_index"; + export async function GET() { const popular = await api.popularTanks(); return new Response(PopularTanks.encode(popular).finish()); diff --git a/packages/website-ue/src/pages/[api]/tanks/presets/upgrade/[id].pb.ts b/packages/website-ue/src/pages/[api]/tanks/presets/upgrade/[id].pb.ts index 0776442be..c7051f22c 100644 --- a/packages/website-ue/src/pages/[api]/tanks/presets/upgrade/[id].pb.ts +++ b/packages/website-ue/src/pages/[api]/tanks/presets/upgrade/[id].pb.ts @@ -1,12 +1,14 @@ import { TankUpgradePricePresetComponent } from "@protos/blitz_static_tank_upgrade_price_preset_component"; -import type { APIContext, GetStaticPaths } from "astro"; +import type { APIContext } from "astro"; import { api } from "../../../../../api/dynamic"; +import { mixStaticPaths } from "../../../../../astro/mixStaticPaths"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { return api.metadata .group("TankUpgradePricePresetEntity") .map(({ name }) => ({ params: { id: name } })); -}) satisfies GetStaticPaths; +}); export async function GET({ params }: APIContext) { const preset = await api.tankUpgradePreset(params.id); diff --git a/packages/website-ue/src/pages/[api]/tiers.json.ts b/packages/website-ue/src/pages/[api]/tiers.json.ts index 2a0e3100b..9c6a172ef 100644 --- a/packages/website-ue/src/pages/[api]/tiers.json.ts +++ b/packages/website-ue/src/pages/[api]/tiers.json.ts @@ -1,5 +1,7 @@ import { api } from "../../api/dynamic"; +export { getStaticPaths } from "./_index"; + /** * Woah! test. */ diff --git a/packages/website-ue/src/pages/[api]/tiers.pb.ts b/packages/website-ue/src/pages/[api]/tiers.pb.ts index 6c157448f..0597cd07a 100644 --- a/packages/website-ue/src/pages/[api]/tiers.pb.ts +++ b/packages/website-ue/src/pages/[api]/tiers.pb.ts @@ -1,6 +1,8 @@ import { Tiers } from "@protos/tiers"; import { api } from "../../api/dynamic"; +export { getStaticPaths } from "./_index"; + /** * Woah! */