From b8742bae6645a950cac840ebfc8dc94791662c88 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 5 Aug 2026 14:17:33 -0500 Subject: [PATCH] fix linting errors --- package.json | 2 +- packages/website/src/components/Embeds/Boolean.tsx | 2 +- packages/website/src/components/Embeds/Color.tsx | 2 +- packages/website/src/components/Embeds/Enum.tsx | 2 +- packages/website/src/components/Embeds/Radius.tsx | 2 +- packages/website/src/components/Embeds/RichText.tsx | 6 ++++-- packages/website/src/components/Embeds/Size.tsx | 2 +- .../website/src/components/Embeds/SizeWithout0.tsx | 4 ++-- packages/website/src/components/Embeds/Slider.tsx | 2 +- .../website/src/components/Embeds/TextController.tsx | 2 +- packages/website/src/components/HomePageHotTanks.tsx | 4 ++-- .../src/components/ModuleButtons/ShellButton.tsx | 7 +++---- .../HeroSection/components/TankSandboxLoader.tsx | 3 +-- packages/website/src/core/blitzkit/isHalloween.ts | 1 - packages/website/src/hooks/useEccentricity.ts | 12 ++++++------ packages/website/src/hooks/useEquipmentPreset.ts | 4 ++-- .../src/pages/[...chunk_api]/tanks/[id]/model.glb.ts | 6 ++---- .../[...locale]/auth/[provider]/_index.tsx | 2 +- .../[...locale]/embed/[embed]/host/_index.tsx | 10 +++++----- 19 files changed, 36 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 1e63fe21c..e790351de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blitzkit", - "version": "1.30.8", + "version": "1.31.0", "license": "BlitzKit License", "private": true, "scripts": { diff --git a/packages/website/src/components/Embeds/Boolean.tsx b/packages/website/src/components/Embeds/Boolean.tsx index c098c9db8..f90db59c8 100644 --- a/packages/website/src/components/Embeds/Boolean.tsx +++ b/packages/website/src/components/Embeds/Boolean.tsx @@ -1,5 +1,5 @@ import { Switch } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState } from "../../stores/embedState"; export function Boolean({ configKey }: EmbedPreviewControllerProps) { diff --git a/packages/website/src/components/Embeds/Color.tsx b/packages/website/src/components/Embeds/Color.tsx index 16ebe28e6..2b6003f87 100644 --- a/packages/website/src/components/Embeds/Color.tsx +++ b/packages/website/src/components/Embeds/Color.tsx @@ -1,4 +1,4 @@ -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState } from "../../stores/embedState"; import { ColorControllerRaw } from "./ColorControllerRaw"; diff --git a/packages/website/src/components/Embeds/Enum.tsx b/packages/website/src/components/Embeds/Enum.tsx index 191e2ce33..9d75f8af5 100644 --- a/packages/website/src/components/Embeds/Enum.tsx +++ b/packages/website/src/components/Embeds/Enum.tsx @@ -1,6 +1,6 @@ import { Select } from "@radix-ui/themes"; import { useLocale } from "../../hooks/useLocale"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState } from "../../stores/embedState"; import type { EmbedConfigItemType, diff --git a/packages/website/src/components/Embeds/Radius.tsx b/packages/website/src/components/Embeds/Radius.tsx index f7c76775c..ff6973c9b 100644 --- a/packages/website/src/components/Embeds/Radius.tsx +++ b/packages/website/src/components/Embeds/Radius.tsx @@ -1,5 +1,5 @@ import { Slider } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState, type RadixRadius } from "../../stores/embedState"; export function Radius({ configKey }: EmbedPreviewControllerProps) { diff --git a/packages/website/src/components/Embeds/RichText.tsx b/packages/website/src/components/Embeds/RichText.tsx index 469be74e6..eff92bba7 100644 --- a/packages/website/src/components/Embeds/RichText.tsx +++ b/packages/website/src/components/Embeds/RichText.tsx @@ -1,6 +1,6 @@ import { FontBoldIcon, FontSizeIcon } from "@radix-ui/react-icons"; import { Flex, Slider, Text } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState, type RadixSizeWithout0 } from "../../stores/embedState"; import { radixTextWeights, @@ -12,7 +12,9 @@ import { ColorControllerRaw } from "./ColorControllerRaw"; export function RichText({ configKey }: EmbedPreviewControllerProps) { const state = EmbedState.use( (state) => - state[configKey] as EmbedConfigItemType["default"] + state[ + configKey + ] as EmbedConfigItemType["default"], ); return ( diff --git a/packages/website/src/components/Embeds/Size.tsx b/packages/website/src/components/Embeds/Size.tsx index 8a28ecdf7..394d2df17 100644 --- a/packages/website/src/components/Embeds/Size.tsx +++ b/packages/website/src/components/Embeds/Size.tsx @@ -1,5 +1,5 @@ import { Slider } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState, type RadixSize } from "../../stores/embedState"; export function Size({ configKey }: EmbedPreviewControllerProps) { diff --git a/packages/website/src/components/Embeds/SizeWithout0.tsx b/packages/website/src/components/Embeds/SizeWithout0.tsx index b2ae6356e..51ebef575 100644 --- a/packages/website/src/components/Embeds/SizeWithout0.tsx +++ b/packages/website/src/components/Embeds/SizeWithout0.tsx @@ -1,5 +1,5 @@ import { Slider } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState, type RadixSizeWithout0 } from "../../stores/embedState"; export function SizeWithout0({ configKey }: EmbedPreviewControllerProps) { @@ -10,7 +10,7 @@ export function SizeWithout0({ configKey }: EmbedPreviewControllerProps) { max={9} value={[ EmbedState.use((state) => - parseInt(state[configKey] as RadixSizeWithout0) + parseInt(state[configKey] as RadixSizeWithout0), ), ]} onValueChange={([value]) => { diff --git a/packages/website/src/components/Embeds/Slider.tsx b/packages/website/src/components/Embeds/Slider.tsx index 0302fe82e..52af6d053 100644 --- a/packages/website/src/components/Embeds/Slider.tsx +++ b/packages/website/src/components/Embeds/Slider.tsx @@ -1,5 +1,5 @@ import { Slider as RadixSlider } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState, type RadixSize } from "../../stores/embedState"; import type { EmbedConfigItemType, diff --git a/packages/website/src/components/Embeds/TextController.tsx b/packages/website/src/components/Embeds/TextController.tsx index b7f6d4bc8..d86a718ea 100644 --- a/packages/website/src/components/Embeds/TextController.tsx +++ b/packages/website/src/components/Embeds/TextController.tsx @@ -1,5 +1,5 @@ import { TextField } from "@radix-ui/themes"; -import type { EmbedPreviewControllerProps } from "../../pages/[...locale]/embed/[embed]/_index"; +import type { EmbedPreviewControllerProps } from "../../pages/[...chunk_default]/[...locale]/embed/[embed]/_index"; import { EmbedState } from "../../stores/embedState"; export function TextController({ configKey }: EmbedPreviewControllerProps) { diff --git a/packages/website/src/components/HomePageHotTanks.tsx b/packages/website/src/components/HomePageHotTanks.tsx index f7c999185..255f93a70 100644 --- a/packages/website/src/components/HomePageHotTanks.tsx +++ b/packages/website/src/components/HomePageHotTanks.tsx @@ -2,7 +2,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import { EyeOpenIcon } from "@radix-ui/react-icons"; import { Box, Flex, Heading, Text } from "@radix-ui/themes"; import { awaitablePopularTanks } from "../core/awaitables/popularTanks"; -import { awaitableTankDefinitions } from "../core/awaitables/tankDefinitions"; +import { api } from "../core/blitzkit/api"; import { LocaleProvider, useLocale, @@ -11,7 +11,7 @@ import { import { TankCard } from "./TankCard"; const [tankDefinitions, popularTanks] = await Promise.all([ - awaitableTankDefinitions, + api.tankDefinitions(), awaitablePopularTanks, ]); diff --git a/packages/website/src/components/ModuleButtons/ShellButton.tsx b/packages/website/src/components/ModuleButtons/ShellButton.tsx index 08c3fcfd8..b9452e71f 100644 --- a/packages/website/src/components/ModuleButtons/ShellButton.tsx +++ b/packages/website/src/components/ModuleButtons/ShellButton.tsx @@ -1,6 +1,5 @@ -import { asset } from '@blitzkit/core'; -import { GenericTankComponentButton } from './GenericTankComponentButton'; -import type { TankComponentButtonProps } from './TankComponentButton'; +import { GenericTankComponentButton } from "./GenericTankComponentButton"; +import type { TankComponentButtonProps } from "./TankComponentButton"; interface ShellButtonProps extends TankComponentButtonProps { shell: string; @@ -9,7 +8,7 @@ interface ShellButtonProps extends TankComponentButtonProps { export function ShellButton({ shell, ...props }: ShellButtonProps) { return ( ); diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandboxLoader.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandboxLoader.tsx index 0c4c33338..f72dc089f 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandboxLoader.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandboxLoader.tsx @@ -1,4 +1,3 @@ -import { asset } from "@blitzkit/core"; import { Flex, type FlexProps, Progress } from "@radix-ui/themes"; import { useProgress } from "@react-three/drei"; @@ -12,7 +11,7 @@ export function TankSandboxLoader({ id, ...props }: TankSandboxLoaderProps) { return ( state.protagonist.tank); diff --git a/packages/website/src/hooks/useEquipmentPreset.ts b/packages/website/src/hooks/useEquipmentPreset.ts index c69f75da5..294f7f988 100644 --- a/packages/website/src/hooks/useEquipmentPreset.ts +++ b/packages/website/src/hooks/useEquipmentPreset.ts @@ -1,6 +1,6 @@ -import { awaitableEquipmentDefinitions } from "../core/awaitables/equipmentDefinitions"; +import { api } from "../core/blitzkit/api"; -const equipmentDefinitions = await awaitableEquipmentDefinitions; +const equipmentDefinitions = await api.equipmentDefinitions(); export function useEquipmentPreset(preset: string) { return equipmentDefinitions.presets[preset]; diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts b/packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts index 6c7471e0c..684f4b375 100644 --- a/packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts +++ b/packages/website/src/pages/[...chunk_api]/tanks/[id]/model.glb.ts @@ -105,7 +105,7 @@ async function extractModel(vfs: AbstractVFS, path: string) { } if (textures) { - const { image: baseColor, hasAlpha } = await readBaseColor( + const baseColor = await readBaseColor( `Data/3d/${dirname(path)}/${textures.baseColorMap ?? textures.albedo}`, textures.miscMap ? `Data/3d/${dirname(path)}/${textures.miscMap}` @@ -369,7 +369,6 @@ async function extractModel(vfs: AbstractVFS, path: string) { } async function readBaseColor(path: string, occlusionPath?: string) { - let hasAlpha = false; const baseRaw = await readTexture(path); const occlusionRaw = occlusionPath ? await readTexture(occlusionPath) @@ -399,7 +398,6 @@ async function readBaseColor(path: string, occlusionPath?: string) { } const alpha = base[i * 4 + 3]; - hasAlpha ||= alpha < 255; combined[i * 4 + 0] = Math.round(base[i * 4 + 0] * c); combined[i * 4 + 1] = Math.round(base[i * 4 + 1] * c); @@ -413,7 +411,7 @@ async function readBaseColor(path: string, occlusionPath?: string) { .webp() .toBuffer(); - return { hasAlpha, image }; + return image; } async function readRoughnessMetallic(path: string) { diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/_index.tsx index c1bb1f1a7..311a80c44 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/auth/[provider]/_index.tsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { App } from "../../../../stores/app"; +import { App } from "../../../../../stores/app"; export const AUTH_PROVIDERS = ["wargaming"] as const; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx index 17691f545..3c8269285 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx @@ -1,22 +1,22 @@ import { Box } from "@radix-ui/themes"; import { useMemo } from "react"; import { parse } from "urlon"; -import { BlitzKitTheme } from "../../../../../components/BlitzKitTheme"; +import { BlitzKitTheme } from "../../../../../../components/BlitzKitTheme"; import { embedConfigurations, embedRenderers, extractEmbedConfigDefaults, -} from "../../../../../constants/embeds"; +} from "../../../../../../constants/embeds"; import { LocaleProvider, type LocaleAcceptorProps, -} from "../../../../../hooks/useLocale"; +} from "../../../../../../hooks/useLocale"; import { EmbedState, type EmbedConfig, type ExtractEmbedConfigTypes, -} from "../../../../../stores/embedState"; -import { useEmbedStateCurry } from "../../../../../stores/embedState/utilities"; +} from "../../../../../../stores/embedState"; +import { useEmbedStateCurry } from "../../../../../../stores/embedState/utilities"; interface PageProps { embed: keyof typeof embedConfigurations;