From 734db0957e0cf069034783d5596e24fa611e72a6 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Thu, 6 Aug 2026 14:21:14 -0500 Subject: [PATCH] flatten structure --- .github/workflows/website.yml | 4 ++-- packages/website/src/core/blitzkit/chunkedStaticPaths.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/camouflage.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/consumables.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/equipment.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/gallery.pb.ts | 2 +- .../pages/[...chunk_api]/{ => api}/definitions/game.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/models.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/provisions.pb.ts | 2 +- .../[...chunk_api]/{ => api}/definitions/skills.pb.ts | 2 +- .../pages/[...chunk_api]/{ => api}/definitions/tanks.pb.ts | 2 +- .../[...chunk_api]/{ => api}/flags/circle/[id].webp.ts | 2 +- .../pages/[...chunk_api]/{ => api}/flags/fade/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/flags/scratched/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/gallery/avatars/[name].ts | 2 +- .../[...chunk_api]/{ => api}/gamemodes/[id]/banner.webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/boosters/[id].webp.ts | 2 +- .../src/pages/[...chunk_api]/{ => api}/icons/camo.webp.ts | 2 +- .../{ => api}/icons/consumables/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/currencies/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/equipment/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/modules/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/provisions/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/shells/[id].webp.ts | 2 +- .../[...chunk_api]/{ => api}/icons/skills/[id].webp.ts | 2 +- .../pages/[...chunk_api]/{ => api}/tanks/[id]/_index.ts | 2 +- .../[...chunk_api]/{ => api}/tanks/[id]/collision.glb.ts | 0 .../[...chunk_api]/{ => api}/tanks/[id]/icons/big.webp.ts | 0 .../{ => api}/tanks/[id]/icons/small.webp.ts | 0 .../pages/[...chunk_api]/{ => api}/tanks/[id]/model.glb.ts | 0 .../src/pages/[...chunk_default]/[...locale]/index.astro | 7 ++++--- packages/website/src/pages/[...chunk_default]/_index.ts | 3 +++ 32 files changed, 34 insertions(+), 30 deletions(-) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/camouflage.pb.ts (86%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/consumables.pb.ts (86%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/equipment.pb.ts (86%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/gallery.pb.ts (84%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/game.pb.ts (85%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/models.pb.ts (85%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/provisions.pb.ts (86%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/skills.pb.ts (85%) rename packages/website/src/pages/[...chunk_api]/{ => api}/definitions/tanks.pb.ts (85%) rename packages/website/src/pages/[...chunk_api]/{ => api}/flags/circle/[id].webp.ts (94%) rename packages/website/src/pages/[...chunk_api]/{ => api}/flags/fade/[id].webp.ts (93%) rename packages/website/src/pages/[...chunk_api]/{ => api}/flags/scratched/[id].webp.ts (93%) rename packages/website/src/pages/[...chunk_api]/{ => api}/gallery/avatars/[name].ts (96%) rename packages/website/src/pages/[...chunk_api]/{ => api}/gamemodes/[id]/banner.webp.ts (96%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/boosters/[id].webp.ts (95%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/camo.webp.ts (80%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/consumables/[id].webp.ts (98%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/currencies/[id].webp.ts (96%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/equipment/[id].webp.ts (97%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/modules/[id].webp.ts (94%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/provisions/[id].webp.ts (97%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/shells/[id].webp.ts (94%) rename packages/website/src/pages/[...chunk_api]/{ => api}/icons/skills/[id].webp.ts (94%) rename packages/website/src/pages/[...chunk_api]/{ => api}/tanks/[id]/_index.ts (84%) rename packages/website/src/pages/[...chunk_api]/{ => api}/tanks/[id]/collision.glb.ts (100%) rename packages/website/src/pages/[...chunk_api]/{ => api}/tanks/[id]/icons/big.webp.ts (100%) rename packages/website/src/pages/[...chunk_api]/{ => api}/tanks/[id]/icons/small.webp.ts (100%) rename packages/website/src/pages/[...chunk_api]/{ => api}/tanks/[id]/model.glb.ts (100%) create mode 100644 packages/website/src/pages/[...chunk_default]/_index.ts diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 20840962e..9028f131c 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -12,7 +12,8 @@ permissions: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref == 'refs/heads/main' }} + # cancel-in-progress: ${{ github.ref == 'refs/heads/main' }} + cancel-in-progress: true env: # blitzkit @@ -46,7 +47,6 @@ jobs: runs-on: ubuntu-latest strategy: - fail-fast: false matrix: include: - chunk: default diff --git a/packages/website/src/core/blitzkit/chunkedStaticPaths.ts b/packages/website/src/core/blitzkit/chunkedStaticPaths.ts index ea9f3be3e..5458b8945 100644 --- a/packages/website/src/core/blitzkit/chunkedStaticPaths.ts +++ b/packages/website/src/core/blitzkit/chunkedStaticPaths.ts @@ -10,6 +10,6 @@ export function chunkedStaticPaths(chunk: string) { return []; } - return [{ params: { [`chunk_${chunk}`]: chunk } }]; + return [{ params: { [`chunk_${chunk}`]: undefined } }]; } satisfies GetStaticPaths; } diff --git a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts similarity index 86% rename from packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts index 15dea60ce..138d2c9ea 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts @@ -1,7 +1,7 @@ import { CamouflageDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.camouflageDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts similarity index 86% rename from packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts index 80b6adcf8..adedc779a 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts @@ -1,7 +1,7 @@ import { ConsumableDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.consumableDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts similarity index 86% rename from packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts index 3691eb377..2c13760d7 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts @@ -1,7 +1,7 @@ import { EquipmentDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.equipmentDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts similarity index 84% rename from packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts index 49453741e..0755b4427 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts @@ -1,7 +1,7 @@ import { Gallery } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.galleryDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts similarity index 85% rename from packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts index 86200f605..080172bd9 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts @@ -1,7 +1,7 @@ import { GameDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.gameDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts similarity index 85% rename from packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts index 2399851bd..cd1d1ef8b 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts @@ -1,7 +1,7 @@ import { ModelDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.modelDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts similarity index 86% rename from packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts index c352900e1..5c36ca31f 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts @@ -1,7 +1,7 @@ import { ProvisionDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.provisionDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts similarity index 85% rename from packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts index dd0baddec..9ae4d8cf9 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts @@ -1,7 +1,7 @@ import { SkillDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.skillDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts similarity index 85% rename from packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts rename to packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts index 5976401f9..088c3035e 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts @@ -1,7 +1,7 @@ import { TankDefinitions } from "@blitzkit/core"; import { api } from "../../../core/blitzkit/api"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const definitions = await api.tankDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts similarity index 94% rename from packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts index c32a13501..65c8056aa 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts @@ -2,7 +2,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts similarity index 93% rename from packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts index e31a8ede0..f81a891a7 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts similarity index 93% rename from packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts index 9edbdf433..95a79474e 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts b/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts similarity index 96% rename from packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts rename to packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts index 032e1908d..c68e171c0 100644 --- a/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts +++ b/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts @@ -3,7 +3,7 @@ import locales from "@blitzkit/i18n/locales.json"; import type { APIContext, GetStaticPathsItem } from "astro"; import { extname } from "path"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts b/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts similarity index 96% rename from packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts rename to packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts index e0383102d..7009a13db 100644 --- a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts similarity index 95% rename from packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts index 2e3d176bb..c1edd70a0 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts @@ -2,7 +2,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/icons/camo.webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts similarity index 80% rename from packages/website/src/pages/[...chunk_api]/icons/camo.webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts index acc583993..881f4e7d0 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/camo.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts @@ -1,6 +1,6 @@ import { vfs } from "../../../core/blitzkit/vfs"; -export { getStaticPaths } from "../_index"; +export { getStaticPaths } from "../../_index"; export async function GET() { const bytes = await vfs.file("Data/Gfx/UI/Hangar/IconCamouflage.packed.webp"); diff --git a/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts similarity index 98% rename from packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts index 8b02390b8..279c85c10 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts @@ -5,7 +5,7 @@ import { extractPackedIcon } from "../../../../core/blitz/extractPackedIcon"; import { parsePackedSpriteRect } from "../../../../core/blitz/parsePackedSpriteRect"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; interface Mappings { Header: { version: number }; diff --git a/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts similarity index 96% rename from packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts index f6581c798..fa0fe6d47 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; const ICONS = [ ["currency_silver_m.packed.webp", "silver"], diff --git a/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts similarity index 97% rename from packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts index f47fc889b..1399c472a 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; interface Mappings { Header: { version: number }; diff --git a/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts similarity index 94% rename from packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts index 9237a57a2..e9aceebaa 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts @@ -2,7 +2,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts similarity index 97% rename from packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts index db38f389a..b6890ab4c 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts @@ -5,7 +5,7 @@ import { extractPackedIcon } from "../../../../core/blitz/extractPackedIcon"; import { parsePackedSpriteRect } from "../../../../core/blitz/parsePackedSpriteRect"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; interface Mappings { Header: { version: number }; diff --git a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts similarity index 94% rename from packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts index f8c520d04..f12bb2816 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts @@ -2,7 +2,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts similarity index 94% rename from packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts rename to packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts index 37fbd1e87..4b15c4276 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const paths: GetStaticPathsItem[] = []; diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts similarity index 84% rename from packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts rename to packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts index 8ea202dcb..7d2956bbb 100644 --- a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts @@ -1,6 +1,6 @@ import { api } from "../../../../core/blitzkit/api"; import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { getStaticPaths as _getStaticPaths } from "../../_index"; +import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const tanks = await api.tankDefinitions(); diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/collision.glb.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts similarity index 100% rename from packages/website/src/pages/[...chunk_api]/tanks/[id]/collision.glb.ts rename to packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/icons/big.webp.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts similarity index 100% rename from packages/website/src/pages/[...chunk_api]/tanks/[id]/icons/big.webp.ts rename to packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/icons/small.webp.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts similarity index 100% rename from packages/website/src/pages/[...chunk_api]/tanks/[id]/icons/small.webp.ts rename to packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts similarity index 100% rename from packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts rename to packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro index 113b6e785..2bda9a01e 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro @@ -4,14 +4,15 @@ import { assertSecret } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; import { literals } from "@blitzkit/i18n/src/literals"; import { Box, Flex, Link } from "@radix-ui/themes"; -import type { GetStaticPaths } from "astro"; import { AesonPlug } from "../../../components/AesonPlug"; import HomeHero from "../../../components/HomeHero.astro"; import { Plugs } from "../../../components/Plugs"; import ToolCard from "../../../components/ToolCard.astro"; import { tools, type Tool } from "../../../constants/tools"; +import { mixStaticPaths } from "../../../core/blitzkit/mixStaticPaths"; import { getStrings } from "../../../core/i18n/getStrings"; import BaseLayout from "../../../layouts/BaseLayout.astro"; +import { getStaticPaths as _getStaticPaths } from "../_index"; const MAX_TOOLS_PER_ROW = 2; @@ -38,14 +39,14 @@ for (const id in tools) { } } -export const getStaticPaths = (() => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { return [ ...locales.supported .filter(({ locale }) => locale !== locales.default) .map(({ locale }) => ({ params: { locale }, props: { locale } })), { params: { locale: undefined }, props: { locale: locales.default } }, ]; -}) satisfies GetStaticPaths; +}); ---