From 7249c3be9eb8f00c6ab8492202687f2316d51ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Sep 2024 10:46:12 -0500 Subject: [PATCH] fix: port to core 5 --- .../rating/current/search/[username]/route.ts | 3 +- .../src/app/tank-voting/[id]/average/route.ts | 2 +- .../src/app/tank-voting/[id]/cast/route.ts | 2 +- packages/core/src/blitzkit/index.ts | 1 - packages/core/src/blitzkit/withCORSProxy.ts | 2 +- packages/core/src/index.ts | 1 - packages/core/src/radix/index.ts | 1 - packages/core/tsconfig.json | 6 +--- .../src/app/tools/compare/components/Body.tsx | 3 +- .../tools/compare/components/CompareRow.tsx | 3 +- .../tools/compare/components/CompareTable.tsx | 4 +-- .../components/IntersectionMarker/index.tsx | 2 +- .../website/src/app/tools/compare/page.tsx | 2 +- .../website/src/app/tools/rating/page.tsx | 2 +- .../[id]/components/Characteristics/index.tsx | 2 +- .../[id]/components/Model/HeroSection.tsx | 7 +++-- .../MetaSection/components/Stars/index.tsx | 2 +- .../Votes/components/VoteCaster.tsx | 3 +- .../[id]/components/VideoSection.tsx | 3 +- .../website/src/core/blitzkit/filterTank.ts | 2 +- .../src/core/blitzkit/tankCharacteristics.ts | 30 +++++++++---------- .../src => website/src/core}/radix/var.ts | 0 packages/website/src/hooks/useTankVotes.ts | 4 +-- packages/website/tsconfig.json | 7 +---- 24 files changed, 41 insertions(+), 53 deletions(-) delete mode 100644 packages/core/src/radix/index.ts rename packages/{core/src => website/src/core}/radix/var.ts (100%) diff --git a/packages/api/src/app/[region]/rating/current/search/[username]/route.ts b/packages/api/src/app/[region]/rating/current/search/[username]/route.ts index 0bf3beece..c4506fdfd 100644 --- a/packages/api/src/app/[region]/rating/current/search/[username]/route.ts +++ b/packages/api/src/app/[region]/rating/current/search/[username]/route.ts @@ -1,5 +1,4 @@ -import { Region } from '@blitzkit/core'; -import { searchCurrentRatingPlayers } from '@blitzkit/core/src/blitz/searchCurrentRatingPlayers'; +import { Region, searchCurrentRatingPlayers } from '@blitzkit/core'; import { NextResponse } from 'next/server'; export async function GET( diff --git a/packages/api/src/app/tank-voting/[id]/average/route.ts b/packages/api/src/app/tank-voting/[id]/average/route.ts index 206e2b309..65b7d66c1 100644 --- a/packages/api/src/app/tank-voting/[id]/average/route.ts +++ b/packages/api/src/app/tank-voting/[id]/average/route.ts @@ -1,11 +1,11 @@ import { BlitzkitResponse, BlitzkitResponseError, + isValidBlitzId, tankDefinitions, TankVotes, usersDatabase, } from '@blitzkit/core'; -import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId'; import { NextRequest, NextResponse } from 'next/server'; export async function GET( diff --git a/packages/api/src/app/tank-voting/[id]/cast/route.ts b/packages/api/src/app/tank-voting/[id]/cast/route.ts index 044540f8b..b364de448 100644 --- a/packages/api/src/app/tank-voting/[id]/cast/route.ts +++ b/packages/api/src/app/tank-voting/[id]/cast/route.ts @@ -1,13 +1,13 @@ import { BlitzkitResponse, BlitzkitResponseError, + isValidBlitzId, StarsInt, TANK_VOTE_CATEGORIES, tankDefinitions, TankVoteCategory, usersDatabase, } from '@blitzkit/core'; -import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId'; import { NextRequest, NextResponse } from 'next/server'; export async function GET( diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 2f7368aa2..4aca0ecfd 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -1,4 +1,3 @@ -export * from '../../../website/src/core/blitzkit/tankCharacteristics'; export * from './assertSecret'; export * from './asset'; export * from './availableProvisions'; diff --git a/packages/core/src/blitzkit/withCORSProxy.ts b/packages/core/src/blitzkit/withCORSProxy.ts index 242b70f0b..b9051d11c 100644 --- a/packages/core/src/blitzkit/withCORSProxy.ts +++ b/packages/core/src/blitzkit/withCORSProxy.ts @@ -1,4 +1,4 @@ -import { context } from '@blitzkit/core/src/blitzkit/context'; +import { context } from '@blitzkit/core'; export function withCORSProxy(url: string) { return context === 'website' diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 0f4c531e0..2c230d7c4 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -6,7 +6,6 @@ export * from './imgur'; export * from './math'; export * from './patreon'; export * from './protobuf'; -export * from './radix'; export * from './statistics'; export * from './streams'; export * from './types'; diff --git a/packages/core/src/radix/index.ts b/packages/core/src/radix/index.ts deleted file mode 100644 index 140c957db..000000000 --- a/packages/core/src/radix/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './var'; diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 8272820b1..575104938 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,8 +1,4 @@ { "extends": "../../tsconfig.json", - "include": [ - "src/**/*", - "../website/src/core/blitzkit/filterTank.ts", - "../website/src/core/blitzkit/tankCharacteristics.ts" -, "../scripts/src/core/blitz/writeDVPL.ts" ] + "include": ["src/**/*", "../website/src/core/radix/var.ts"] } diff --git a/packages/website/src/app/tools/compare/components/Body.tsx b/packages/website/src/app/tools/compare/components/Body.tsx index f1afb66cf..a50484782 100644 --- a/packages/website/src/app/tools/compare/components/Body.tsx +++ b/packages/website/src/app/tools/compare/components/Body.tsx @@ -1,6 +1,7 @@ -import { asset, TankCharacteristics } from '@blitzkit/core'; +import { asset } from '@blitzkit/core'; import { Flex, Heading, IconButton, Table } from '@radix-ui/themes'; import { StickyColumnHeaderCell } from '../../../../components/StickyColumnHeaderCell'; +import { TankCharacteristics } from '../../../../core/blitzkit/tankCharacteristics'; import * as CompareEphemeral from '../../../../stores/compareEphemeral'; import { CompareRow } from './CompareRow'; import { CompareSectionTitle } from './CompareSectionTitle'; diff --git a/packages/website/src/app/tools/compare/components/CompareRow.tsx b/packages/website/src/app/tools/compare/components/CompareRow.tsx index 93d605a21..7a2e17dd1 100644 --- a/packages/website/src/app/tools/compare/components/CompareRow.tsx +++ b/packages/website/src/app/tools/compare/components/CompareRow.tsx @@ -1,4 +1,3 @@ -import { TankCharacteristics, Var } from '@blitzkit/core'; import { CaretLeftIcon, CaretRightIcon, @@ -6,6 +5,8 @@ import { } from '@radix-ui/react-icons'; import { Flex, IconButton, Table, Text } from '@radix-ui/themes'; import { StickyRowHeaderCell } from '../../../../components/StickyRowHeaderCell'; +import { TankCharacteristics } from '../../../../core/blitzkit/tankCharacteristics'; +import { Var } from '../../../../core/radix/var'; import * as CompareEphemeral from '../../../../stores/compareEphemeral'; import * as ComparePersistent from '../../../../stores/comparePersistent'; diff --git a/packages/website/src/app/tools/compare/components/CompareTable.tsx b/packages/website/src/app/tools/compare/components/CompareTable.tsx index ecc5b9148..da34495d8 100644 --- a/packages/website/src/app/tools/compare/components/CompareTable.tsx +++ b/packages/website/src/app/tools/compare/components/CompareTable.tsx @@ -1,6 +1,4 @@ import { - TankCharacteristics, - Var, asset, availableProvisions, checkConsumableProvisionInclusivity, @@ -22,6 +20,8 @@ import { ModuleManager } from '../../../../components/ModuleManager'; import { ProvisionsManager } from '../../../../components/ProvisionsManager'; import { StickyColumnHeaderCell } from '../../../../components/StickyColumnHeaderCell'; import { StickyTableRoot } from '../../../../components/StickyTableRoot'; +import { TankCharacteristics } from '../../../../core/blitzkit/tankCharacteristics'; +import { Var } from '../../../../core/radix/var'; import * as CompareEphemeral from '../../../../stores/compareEphemeral'; import { EquipmentMatrix } from '../../../../stores/duel'; import { Body } from './Body'; diff --git a/packages/website/src/app/tools/compare/components/IntersectionMarker/index.tsx b/packages/website/src/app/tools/compare/components/IntersectionMarker/index.tsx index e6bc91b0f..1f7384d52 100644 --- a/packages/website/src/app/tools/compare/components/IntersectionMarker/index.tsx +++ b/packages/website/src/app/tools/compare/components/IntersectionMarker/index.tsx @@ -1,5 +1,5 @@ -import { Var } from '@blitzkit/core'; import { useEffect, useRef } from 'react'; +import { Var } from '../../../../../core/radix/var'; import { insertionMarkers } from './constants'; export function InsertionMarker({ index }: { index: number }) { diff --git a/packages/website/src/app/tools/compare/page.tsx b/packages/website/src/app/tools/compare/page.tsx index 3f84addc5..1af189176 100644 --- a/packages/website/src/app/tools/compare/page.tsx +++ b/packages/website/src/app/tools/compare/page.tsx @@ -6,7 +6,6 @@ import { modelDefinitions, provisionDefinitions, skillDefinitions, - tankCharacteristics, tankDefinitions, } from '@blitzkit/core'; import { PlusIcon } from '@radix-ui/react-icons'; @@ -14,6 +13,7 @@ import { Box, Flex, Heading, IconButton, Text } from '@radix-ui/themes'; import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { use, useCallback, useEffect, useMemo, useState } from 'react'; import { PageWrapper } from '../../../components/PageWrapper'; +import { tankCharacteristics } from '../../../core/blitzkit/tankCharacteristics'; import { tankToCompareMember } from '../../../core/blitzkit/tankToCompareMember'; import * as CompareEphemeral from '../../../stores/compareEphemeral'; import { CompareTable } from './components/CompareTable'; diff --git a/packages/website/src/app/tools/rating/page.tsx b/packages/website/src/app/tools/rating/page.tsx index f0064f5d6..02761dd83 100644 --- a/packages/website/src/app/tools/rating/page.tsx +++ b/packages/website/src/app/tools/rating/page.tsx @@ -19,7 +19,6 @@ import { REGIONS, searchCurrentRatingPlayers, UNLOCALIZED_REGION_NAMES, - Var, } from '@blitzkit/core'; import { blackA, orangeDark } from '@radix-ui/colors'; import { MagnifyingGlassIcon } from '@radix-ui/react-icons'; @@ -38,6 +37,7 @@ import { debounce, range } from 'lodash'; import { ChangeEvent, useEffect, useRef, useState } from 'react'; import { create } from 'zustand'; import { PageWrapper } from '../../../components/PageWrapper'; +import { Var } from '../../../core/radix/var'; import { PageTurner } from './components/PageTurner'; const ROWS_PER_PAGE = Math.floor(100 / 3); diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx index 609533f1e..b8b9a1309 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx @@ -7,7 +7,6 @@ import { isExplosive, provisionDefinitions, resolvePenetrationCoefficient, - tankCharacteristics, } from '@blitzkit/core'; import { AccessibilityIcon, InfoCircledIcon } from '@radix-ui/react-icons'; import { @@ -25,6 +24,7 @@ import { Fragment, use, useEffect, useRef, useState } from 'react'; import { lerp } from 'three/src/math/MathUtils'; import { Ad, AdType } from '../../../../../../components/Ad'; import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits'; +import { tankCharacteristics } from '../../../../../../core/blitzkit/tankCharacteristics'; import { useAdExempt } from '../../../../../../hooks/useAdExempt'; import { useEquipment } from '../../../../../../hooks/useEquipment'; import { useTankModelDefinition } from '../../../../../../hooks/useTankModelDefinition'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx index 04a479632..a58106901 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx @@ -1,9 +1,10 @@ -import { resolveNearPenetration, tankDefinitions, Var } from '@blitzkit/core'; +import { resolveNearPenetration, tankDefinitions } from '@blitzkit/core'; import { Box, Flex, Heading, Text } from '@radix-ui/themes'; import { Suspense, use, useEffect, useMemo, useRef, useState } from 'react'; import { ThicknessRange } from '../../../../../../components/Armor/components/StaticArmor'; import { classIcons } from '../../../../../../components/ClassIcon'; import { NAVBAR_HEIGHT } from '../../../../../../components/Navbar/index.css'; +import { Var } from '../../../../../../core/radix/var'; import { useFullScreen } from '../../../../../../hooks/useFullScreen'; import * as Duel from '../../../../../../stores/duel'; import { TankSandbox } from './TankSandbox'; @@ -20,8 +21,8 @@ export function HeroSection() { protagonist.treeType === 'collector' ? 'blue' : protagonist.treeType === 'premium' - ? 'amber' - : undefined; + ? 'amber' + : undefined; const awaitedTankDefinitions = use(tankDefinitions); const thicknessRange = useMemo(() => { const entries = Object.values(awaitedTankDefinitions); diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx index 81ab8b957..094198b66 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx @@ -1,4 +1,4 @@ -import { StarsInt } from '@blitzkit/core/src/blitzkit/votes'; +import { StarsInt } from '@blitzkit/core'; import { Flex, Text, TextProps } from '@radix-ui/themes'; import { times } from 'lodash'; import { PartialStar } from './components/PartialStar'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx index 0ca6ed51c..4731df0d4 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx @@ -1,5 +1,4 @@ -import { BlitzkitResponse } from '@blitzkit/core/src/blitzkit/unwrapBlitzkitResponse'; -import { StarsInt } from '@blitzkit/core/src/blitzkit/votes'; +import { BlitzkitResponse, StarsInt } from '@blitzkit/core'; import { PaperPlaneIcon } from '@radix-ui/react-icons'; import { AlertDialog, diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/VideoSection.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/VideoSection.tsx index 3fcef0253..9d76fc999 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/VideoSection.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/VideoSection.tsx @@ -1,9 +1,10 @@ -import { reviews, Var, youtubers } from '@blitzkit/core'; +import { reviews, youtubers } from '@blitzkit/core'; import { Box, Flex, Heading, Text } from '@radix-ui/themes'; import { use } from 'react'; import { Link } from '../../../../../components/Link'; import { PageWrapper } from '../../../../../components/PageWrapper'; import { VerifiedIcon } from '../../../../../components/VerifiedIcon'; +import { Var } from '../../../../../core/radix/var'; import * as Duel from '../../../../../stores/duel'; export function VideoSection() { diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts index d6c1379d3..7879ffd53 100644 --- a/packages/website/src/core/blitzkit/filterTank.ts +++ b/packages/website/src/core/blitzkit/filterTank.ts @@ -1,4 +1,4 @@ -import { TankDefinition } from '@blitzkit/core/src/blitzkit/tankDefinitions'; +import { TankDefinition } from '@blitzkit/core'; import { TankFilters } from '../../stores/tankFilters'; export function filterTank(filters: TankFilters, tank: TankDefinition) { diff --git a/packages/website/src/core/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts index 247480999..560269848 100644 --- a/packages/website/src/core/blitzkit/tankCharacteristics.ts +++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts @@ -1,26 +1,24 @@ import { - EquipmentDefinitions, - ModelDefinition, - ProvisionDefinitions, -} from '@blitzkit/core'; -import { resolveNearPenetration } from '@blitzkit/core/src/blitz/resolveNearPenetration'; -import { coefficient } from '@blitzkit/core/src/blitzkit/coefficient'; -import { degressiveStat } from '@blitzkit/core/src/blitzkit/degressiveStat'; -import { isExplosive } from '@blitzkit/core/src/blitzkit/isExplosive'; -import { normalizeBoundingBox } from '@blitzkit/core/src/blitzkit/normalizeBoundingBox'; -import { progressiveStat } from '@blitzkit/core/src/blitzkit/progressiveStat'; -import { resolveDpm } from '@blitzkit/core/src/blitzkit/resolveDpm'; -import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient'; -import { sum } from '@blitzkit/core/src/blitzkit/sum'; -import { + coefficient, + degressiveStat, EngineDefinition, + EquipmentDefinitions, GunDefinition, + isExplosive, + ModelDefinition, + normalizeBoundingBox, + progressiveStat, + ProvisionDefinitions, + resolveDpm, + resolveNearPenetration, + resolvePenetrationCoefficient, ShellDefinition, + sum, TankDefinition, TrackDefinition, TurretDefinition, -} from '@blitzkit/core/src/blitzkit/tankDefinitions'; -import { unionBoundingBox } from '@blitzkit/core/src/blitzkit/unionBoundingBox'; + unionBoundingBox, +} from '@blitzkit/core'; import { EquipmentMatrix } from '../../stores/duel'; export type TankCharacteristics = ReturnType; diff --git a/packages/core/src/radix/var.ts b/packages/website/src/core/radix/var.ts similarity index 100% rename from packages/core/src/radix/var.ts rename to packages/website/src/core/radix/var.ts diff --git a/packages/website/src/hooks/useTankVotes.ts b/packages/website/src/hooks/useTankVotes.ts index b8cfbfb89..030d76c92 100644 --- a/packages/website/src/hooks/useTankVotes.ts +++ b/packages/website/src/hooks/useTankVotes.ts @@ -1,8 +1,8 @@ -import { TankVotes } from '@blitzkit/core'; import { BlitzkitResponse, + TankVotes, unwrapBlitzkitResponse, -} from '@blitzkit/core/src/blitzkit/unwrapBlitzkitResponse'; +} from '@blitzkit/core'; import { useEffect, useState } from 'react'; import * as App from '../stores/app'; diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 8aa4c286a..6e8705550 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -7,10 +7,5 @@ } ] }, - "include": [ - "src/**/*", - ".next/types/**/*.ts", - "../bot/src/core/blitzkit/resolveAncestry.ts", - "../bot/src/core/blitzkit/buildTechTreeLine.ts" - ] + "include": ["src/**/*", ".next/types/**/*.ts"] }