From d1b8bfe24434cfb8879a0351a55e7311a17d19b5 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Thu, 6 Aug 2026 14:29:13 -0500 Subject: [PATCH] fix imports --- .../api/definitions/camouflage.pb.ts | 2 +- .../api/definitions/consumables.pb.ts | 2 +- .../api/definitions/equipment.pb.ts | 2 +- .../api/definitions/gallery.pb.ts | 2 +- .../[...chunk_api]/api/definitions/game.pb.ts | 2 +- .../api/definitions/models.pb.ts | 2 +- .../api/definitions/provisions.pb.ts | 2 +- .../api/definitions/skills.pb.ts | 2 +- .../api/definitions/tanks.pb.ts | 2 +- .../api/flags/circle/[id].webp.ts | 4 +- .../api/flags/fade/[id].webp.ts | 4 +- .../api/flags/scratched/[id].webp.ts | 4 +- .../api/gallery/avatars/[name].ts | 2 +- .../api/gamemodes/[id]/banner.webp.ts | 4 +- .../api/icons/boosters/[id].webp.ts | 4 +- .../[...chunk_api]/api/icons/camo.webp.ts | 2 +- .../api/icons/consumables/[id].webp.ts | 8 ++-- .../api/icons/currencies/[id].webp.ts | 4 +- .../api/icons/equipment/[id].webp.ts | 4 +- .../api/icons/modules/[id].webp.ts | 4 +- .../api/icons/provisions/[id].webp.ts | 8 ++-- .../api/icons/shells/[id].webp.ts | 4 +- .../api/icons/skills/[id].webp.ts | 4 +- .../[...chunk_api]/api/tanks/[id]/_index.ts | 4 +- .../api/tanks/[id]/collision.glb.ts | 2 +- .../api/tanks/[id]/icons/big.webp.ts | 4 +- .../api/tanks/[id]/icons/small.webp.ts | 2 +- .../api/tanks/[id]/model.glb.ts | 2 +- .../[...locale]/auth/[provider]/index.astro | 16 ++++---- .../docs/[directory]/[document]/index.astro | 41 ++++++++----------- .../[...locale]/embed/[embed]/index.astro | 23 ++++------- .../[...locale]/tanks/[slug]/index.astro | 21 ++++------ .../tools/embed/[embed]/index.astro | 23 ++++------- .../tools/tankopedia/[id]/index.astro | 22 ++++------ 34 files changed, 99 insertions(+), 139 deletions(-) diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts index 138d2c9ea..c4d2eb4a9 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/camouflage.pb.ts @@ -1,5 +1,5 @@ import { CamouflageDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts index adedc779a..c9310030e 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/consumables.pb.ts @@ -1,5 +1,5 @@ import { ConsumableDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts index 2c13760d7..e76b07892 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/equipment.pb.ts @@ -1,5 +1,5 @@ import { EquipmentDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts index 0755b4427..0b50dd3ff 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/gallery.pb.ts @@ -1,5 +1,5 @@ import { Gallery } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts index 080172bd9..a557213eb 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/game.pb.ts @@ -1,5 +1,5 @@ import { GameDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts index cd1d1ef8b..49d265d09 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/models.pb.ts @@ -1,5 +1,5 @@ import { ModelDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts index 5c36ca31f..b7884617f 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/provisions.pb.ts @@ -1,5 +1,5 @@ import { ProvisionDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts index 9ae4d8cf9..161f46f71 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/skills.pb.ts @@ -1,5 +1,5 @@ import { SkillDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts b/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts index 088c3035e..ce74498a5 100644 --- a/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/definitions/tanks.pb.ts @@ -1,5 +1,5 @@ import { TankDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../../core/blitzkit/api"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts index 65c8056aa..0fc735f8c 100644 --- a/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/circle/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts index f81a891a7..fe6dadee5 100644 --- a/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/fade/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts index 95a79474e..a002e6447 100644 --- a/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/flags/scratched/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts b/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts index c68e171c0..831bbd95c 100644 --- a/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts +++ b/packages/website/src/pages/[...chunk_api]/api/gallery/avatars/[name].ts @@ -2,7 +2,7 @@ import { fetchGlossary, type Avatar } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; import type { APIContext, GetStaticPathsItem } from "astro"; import { extname } from "path"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts b/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts index 7009a13db..03587e42a 100644 --- a/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/gamemodes/[id]/banner.webp.ts @@ -1,8 +1,8 @@ import type { SquadBattleTypeStylesYaml } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts index c1edd70a0..5ee73c77e 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/boosters/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts index 881f4e7d0..4d644d246 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/camo.webp.ts @@ -1,4 +1,4 @@ -import { vfs } from "../../../core/blitzkit/vfs"; +import { vfs } from "../../../../core/blitzkit/vfs"; export { getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts index 279c85c10..24074e115 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/consumables/[id].webp.ts @@ -1,10 +1,10 @@ import type { ConsumablesCommon } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -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 { 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"; interface Mappings { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts index fa0fe6d47..c4b643c51 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/currencies/[id].webp.ts @@ -1,8 +1,8 @@ import { assertSecret, type BlitzGlossary } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; const ICONS = [ diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts index 1399c472a..c91b73476 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/equipment/[id].webp.ts @@ -1,8 +1,8 @@ import type { OptionalDevices } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; interface Mappings { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts index e9aceebaa..cdd338714 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/modules/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts index b6890ab4c..97cde6260 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/provisions/[id].webp.ts @@ -1,10 +1,10 @@ import type { ProvisionsCommon } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -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 { 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"; interface Mappings { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts index f12bb2816..bd63dbde8 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/shells/[id].webp.ts @@ -1,7 +1,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts index 4b15c4276..8caab5718 100644 --- a/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/icons/skills/[id].webp.ts @@ -1,8 +1,8 @@ import type { TankmenAvatar } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts index 7d2956bbb..55f270db2 100644 --- a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/_index.ts @@ -1,5 +1,5 @@ -import { api } from "../../../../core/blitzkit/api"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { api } from "../../../../../core/blitzkit/api"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; import { getStaticPaths as _getStaticPaths } from "../../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts index 7bff4a081..85b6d1b67 100644 --- a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/collision.glb.ts @@ -11,7 +11,7 @@ import type { AbstractVFS } from "@blitzkit/core/src/blitzkit/vfs/abstract"; import { Accessor, Document, Node, NodeIO, Scene } from "@gltf-transform/core"; import type { APIContext } from "astro"; import { times } from "lodash-es"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { vfs } from "../../../../../core/blitzkit/vfs"; export { getStaticPaths } from "./_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts index c2b517a63..14b74ba7d 100644 --- a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/big.webp.ts @@ -5,8 +5,8 @@ import { } from "@blitzkit/core"; import type { APIContext } from "astro"; import sharp from "sharp"; -import { parsePackedSpriteRect } from "../../../../../core/blitz/parsePackedSpriteRect"; -import { vfs } from "../../../../../core/blitzkit/vfs"; +import { parsePackedSpriteRect } from "../../../../../../core/blitz/parsePackedSpriteRect"; +import { vfs } from "../../../../../../core/blitzkit/vfs"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts index 16725b661..7d250f16f 100644 --- a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/icons/small.webp.ts @@ -4,7 +4,7 @@ import { type VehicleDefinitionList, } from "@blitzkit/core"; import type { APIContext } from "astro"; -import { vfs } from "../../../../../core/blitzkit/vfs"; +import { vfs } from "../../../../../../core/blitzkit/vfs"; import { extractPackedTankIcon } from "./big.webp"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts index 684f4b375..181fb4cb5 100644 --- a/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts +++ b/packages/website/src/pages/[...chunk_api]/api/tanks/[id]/model.glb.ts @@ -20,7 +20,7 @@ import type { APIContext } from "astro"; import { times } from "lodash-es"; import { dirname } from "path"; import sharp from "sharp"; -import { vfs } from "../../../../core/blitzkit/vfs"; +import { vfs } from "../../../../../core/blitzkit/vfs"; import { vertexAttributeGLTFName, vertexAttributeGltfVectorSizes, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/index.astro index 0fe29196b..e74158384 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/index.astro @@ -1,18 +1,16 @@ --- import { Flex, Heading, Text } from "@radix-ui/themes"; -import type { GetStaticPaths } from "astro"; import { PageWrapper } from "../../../../../components/PageWrapper"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; import BaseLayout from "../../../../../layouts/BaseLayout.astro"; -import { getStaticPaths as parentGetStaticPaths } from "../../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../../index.astro"; import { AUTH_PROVIDER_NAMES, AUTH_PROVIDERS, Authorize } from "./_index"; -export const getStaticPaths = (() => { - const parentPaths = parentGetStaticPaths(); - - return AUTH_PROVIDERS.map((provider) => - parentPaths.map((parent) => ({ params: { ...parent.params, provider } })), - ).flat(); -}) satisfies GetStaticPaths; +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { + return AUTH_PROVIDERS.map((provider) => ({ + params: { provider }, + })); +}); const { provider } = Astro.params; const { locale } = Astro.props; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/index.astro index 9858033b6..9c00a0faa 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/index.astro @@ -1,39 +1,32 @@ --- import { AstroSeo } from "@astrolib/seo"; -import type { GetStaticPaths } from "astro"; import { readFile } from "fs/promises"; +import { mixStaticPaths } from "../../../../../../core/blitzkit/mixStaticPaths"; import BaseLayout from "../../../../../../layouts/BaseLayout.astro"; -import { getStaticPaths as parentGetStaticPaths } from "../../../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../../../index.astro"; import { Page } from "./_index"; -export const getStaticPaths = (async () => { - const parentPaths = parentGetStaticPaths(); +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const ROOT = "../../../../../../../../../docs/"; const files = import.meta.glob("../../../../../../../../../docs/**/*.md", { eager: true, }); - return ( - await Promise.all( - Object.keys(files).map(async (file) => { - const couple = file.replace(ROOT, "").split("/"); - couple[1] = couple[1].replace(".md", ""); - const content = await readFile( - `../../docs/${couple[0]}/${couple[1]}.md`, - ).then((buffer) => buffer.toString()); + return await Promise.all( + Object.keys(files).map(async (file) => { + const couple = file.replace(ROOT, "").split("/"); + couple[1] = couple[1].replace(".md", ""); + const content = await readFile( + `../../docs/${couple[0]}/${couple[1]}.md`, + ).then((buffer) => buffer.toString()); - return parentPaths.map((parent) => ({ - params: { - ...parent.params, - directory: couple[0], - document: couple[1], - }, - props: { ...parent.props, content }, - })); - }), - ) - ).flat(); -}) satisfies GetStaticPaths; + return { + params: { directory: couple[0], document: couple[1] }, + props: { content }, + }; + }), + ); +}); const { content, locale } = Astro.props; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro index d53acc9bf..9bb51e3e7 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro @@ -1,26 +1,17 @@ --- import { AstroSeo } from "@astrolib/seo"; -import type { GetStaticPaths } from "astro"; import { capitalize } from "lodash-es"; import { embedConfigurations } from "../../../../../constants/embeds"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; import BaseLayout from "../../../../../layouts/BaseLayout.astro"; -import { getStaticPaths as parentGetStaticPaths } from "../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../index.astro"; import { Page } from "./_index"; -export const getStaticPaths = (() => { - const parentPaths = parentGetStaticPaths(); - - return Object.keys(embedConfigurations) - .map((embed) => - parentPaths.map((parent) => ({ - params: { - ...parent.params, - embed: embed as keyof typeof embedConfigurations, - }, - })), - ) - .flat(); -}) satisfies GetStaticPaths; +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { + return Object.keys(embedConfigurations).map((embed) => ({ + params: { embed: embed as keyof typeof embedConfigurations }, + })); +}); const name = capitalize(Astro.params.embed); const title = `BlitzKit - ${name} embed`; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro index 9f6193fb3..3f5c07555 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro @@ -8,30 +8,25 @@ import { } from "@blitzkit/core"; import { unwrapper } from "@blitzkit/i18n"; import { literals } from "@blitzkit/i18n/src/literals"; -import type { GetStaticPaths } from "astro"; import { load } from "cheerio"; import { api } from "../../../../../core/blitzkit/api"; +import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; import { tankCharacteristics } from "../../../../../core/blitzkit/tankCharacteristics"; import { getStrings } from "../../../../../core/i18n/getStrings"; import BaseLayout from "../../../../../layouts/BaseLayout.astro"; import { genericDefaultEquipmentMatrix } from "../../../../../stores/duel/constants"; import type { TankGuide } from "../../../../../types/tankGuide"; -import { getStaticPaths as parentGetStaticPaths } from "../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../index.astro"; import { Page } from "./_index"; -export const getStaticPaths = (async () => { +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const tankDefinitions = await api.tankDefinitions(); - const parentPaths = parentGetStaticPaths(); - return Object.values(tankDefinitions.tanks) - .map((tank) => - parentPaths.map((parent) => ({ - params: { ...parent.params, slug: tank.slug }, - props: { ...parent.props, id: tank.id }, - })), - ) - .flat(); -}) satisfies GetStaticPaths; + return Object.values(tankDefinitions.tanks).map((tank) => ({ + params: { slug: tank.slug }, + props: { id: tank.id }, + })); +}); const { id, locale } = Astro.props; const strings = getStrings(locale); diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tools/embed/[embed]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tools/embed/[embed]/index.astro index 4222d3a2b..e1b439586 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tools/embed/[embed]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tools/embed/[embed]/index.astro @@ -1,23 +1,14 @@ --- -import type { GetStaticPaths } from "astro"; import { embedConfigurations } from "../../../../../../constants/embeds"; +import { mixStaticPaths } from "../../../../../../core/blitzkit/mixStaticPaths"; import LegacyRedirect from "../../../../../../layouts/LegacyRedirect.astro"; -import { getStaticPaths as parentGetStaticPaths } from "../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../index.astro"; -export const getStaticPaths = (() => { - const parentPaths = parentGetStaticPaths(); - - return Object.keys(embedConfigurations) - .map((embed) => - parentPaths.map((parent) => ({ - params: { - ...parent.params, - embed: embed as keyof typeof embedConfigurations, - }, - })), - ) - .flat(); -}) satisfies GetStaticPaths; +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { + return Object.keys(embedConfigurations).map((embed) => ({ + params: { embed }, + })); +}); const { embed } = Astro.params; const { locale } = Astro.props; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tools/tankopedia/[id]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tools/tankopedia/[id]/index.astro index 2c0979e68..3315a4174 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tools/tankopedia/[id]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tools/tankopedia/[id]/index.astro @@ -1,22 +1,14 @@ --- -import type { GetStaticPaths } from "astro"; import { api } from "../../../../../../core/blitzkit/api"; +import { mixStaticPaths } from "../../../../../../core/blitzkit/mixStaticPaths"; import LegacyRedirect from "../../../../../../layouts/LegacyRedirect.astro"; -import { getStaticPaths as parentGetStaticPaths } from "../index.astro"; +import { getStaticPaths as _getStaticPaths } from "../index.astro"; -export const getStaticPaths = (async () => { - const tankDefinitions = await api.tankDefinitions(); - const parentPaths = parentGetStaticPaths(); - - return Object.values(tankDefinitions.tanks) - .map((tank) => - parentPaths.map((parent) => ({ - params: { ...parent.params, id: tank.id }, - props: parent.props, - })), - ) - .flat(); -}) satisfies GetStaticPaths; +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { + return Object.values(tankDefinitions.tanks).map(({ id }) => ({ + params: { id }, + })); +}); const { id } = Astro.params; const { locale } = Astro.props;