fix: port to core 5

packages/api/src/app/[region]/rating/current/search/[username]/route.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { Region, searchCurrentRatingPlayers } from '@blitzkit/core';
-import { searchCurrentRatingPlayers } from '@blitzkit/core/src/blitz/searchCurrentRatingPlayers';
 import { NextResponse } from 'next/server';
 
 export async function GET(

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(

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(

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';

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'

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';

packages/core/src/radix/index.ts

@@ -1 +0,0 @@
-export * from './var';

packages/core/tsconfig.json

@@ -1,8 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": [
+  "include": ["src/**/*", "../website/src/core/radix/var.ts"]
-    "src/**/*",
-    "../website/src/core/blitzkit/filterTank.ts",
-    "../website/src/core/blitzkit/tankCharacteristics.ts"
-, "../scripts/src/core/blitz/writeDVPL.ts"  ]
 }

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';

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';
 

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';

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 }) {

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';

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);

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';

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'
+        ? 'amber'
-      : undefined;
+        : undefined;
   const awaitedTankDefinitions = use(tankDefinitions);
   const thicknessRange = useMemo(() => {
     const entries = Object.values(awaitedTankDefinitions);

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';

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 { BlitzkitResponse, StarsInt } from '@blitzkit/core';
-import { StarsInt } from '@blitzkit/core/src/blitzkit/votes';
 import { PaperPlaneIcon } from '@radix-ui/react-icons';
 import {
   AlertDialog,

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() {

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) {

packages/website/src/core/blitzkit/tankCharacteristics.ts

@@ -1,26 +1,24 @@
 import {
-  EquipmentDefinitions,
+  coefficient,
-  ModelDefinition,
+  degressiveStat,
-  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 {
   EngineDefinition,
+  EquipmentDefinitions,
   GunDefinition,
+  isExplosive,
+  ModelDefinition,
+  normalizeBoundingBox,
+  progressiveStat,
+  ProvisionDefinitions,
+  resolveDpm,
+  resolveNearPenetration,
+  resolvePenetrationCoefficient,
   ShellDefinition,
+  sum,
   TankDefinition,
   TrackDefinition,
   TurretDefinition,
-} from '@blitzkit/core/src/blitzkit/tankDefinitions';
+  unionBoundingBox,
-import { unionBoundingBox } from '@blitzkit/core/src/blitzkit/unionBoundingBox';
+} from '@blitzkit/core';
 import { EquipmentMatrix } from '../../stores/duel';
 
 export type TankCharacteristics = ReturnType<typeof tankCharacteristics>;

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';
 

packages/website/tsconfig.json

@@ -7,10 +7,5 @@
       }
     ]
   },
-  "include": [
+  "include": ["src/**/*", ".next/types/**/*.ts"]
-    "src/**/*",
-    ".next/types/**/*.ts",
-    "../bot/src/core/blitzkit/resolveAncestry.ts",
-    "../bot/src/core/blitzkit/buildTechTreeLine.ts"
-  ]
 }