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 fbad792c0..0bf3beece 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,6 +1,6 @@ import { Region } from '@blitzkit/core'; +import { searchCurrentRatingPlayers } from '@blitzkit/core/src/blitz/searchCurrentRatingPlayers'; import { NextResponse } from 'next/server'; -import { searchCurrentRatingPlayers } from '../../../../../../../../website/src/core/blitz/searchCurrentRatingPlayers'; export async function GET( request: Request, 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 bd6de7e31..4a91beb3a 100644 --- a/packages/api/src/app/tank-voting/[id]/average/route.ts +++ b/packages/api/src/app/tank-voting/[id]/average/route.ts @@ -1,6 +1,6 @@ import { tankDefinitions, TankVotes, usersDatabase } from '@blitzkit/core'; +import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId'; import { NextRequest, NextResponse } from 'next/server'; -import { isValidBlitzId } from '../../../../../../website/src/core/blitz/isValidBlitzId'; import { BlitzkitResponse, BlitzkitResponseError, 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 69ff144b1..6a156def4 100644 --- a/packages/api/src/app/tank-voting/[id]/cast/route.ts +++ b/packages/api/src/app/tank-voting/[id]/cast/route.ts @@ -4,9 +4,9 @@ import { TankVoteCategory, usersDatabase, } from '@blitzkit/core'; +import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId'; import { NextRequest, NextResponse } from 'next/server'; import { StarsInt } from '../../../../../../website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars'; -import { isValidBlitzId } from '../../../../../../website/src/core/blitz/isValidBlitzId'; import { BlitzkitResponse, BlitzkitResponseError, diff --git a/packages/website/src/core/blitz/canSplash.ts b/packages/core/src/blitz/canSplash.ts similarity index 100% rename from packages/website/src/core/blitz/canSplash.ts rename to packages/core/src/blitz/canSplash.ts diff --git a/packages/core/src/blitz/getAccountAchievements.ts b/packages/core/src/blitz/getAccountAchievements.ts index 57ca4c000..b212b3513 100644 --- a/packages/core/src/blitz/getAccountAchievements.ts +++ b/packages/core/src/blitz/getAccountAchievements.ts @@ -1,5 +1,5 @@ import { fetchBlitz, Region } from '@blitzkit/core'; -import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; +import { normalizeIds } from './normalizeIds'; interface IndividualAccountAchievements { achievements: { diff --git a/packages/core/src/blitz/getAccountInfo.ts b/packages/core/src/blitz/getAccountInfo.ts index 498facba8..d0c1dfb7a 100644 --- a/packages/core/src/blitz/getAccountInfo.ts +++ b/packages/core/src/blitz/getAccountInfo.ts @@ -4,7 +4,7 @@ import { Region, fetchBlitz, } from '@blitzkit/core'; -import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; +import { normalizeIds } from './normalizeIds'; export interface SupplementaryStats { WN8?: number; diff --git a/packages/core/src/blitz/getClanAccountInfo.ts b/packages/core/src/blitz/getClanAccountInfo.ts index 0d3b73255..715721f52 100644 --- a/packages/core/src/blitz/getClanAccountInfo.ts +++ b/packages/core/src/blitz/getClanAccountInfo.ts @@ -1,5 +1,5 @@ import { fetchBlitz, Region } from '@blitzkit/core'; -import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; +import { normalizeIds } from './normalizeIds'; type IndividualClanAccountInfo = { account_id: number; diff --git a/packages/core/src/blitz/getClanInfo.ts b/packages/core/src/blitz/getClanInfo.ts index f097488da..c6ef99a9f 100644 --- a/packages/core/src/blitz/getClanInfo.ts +++ b/packages/core/src/blitz/getClanInfo.ts @@ -1,5 +1,5 @@ import { fetchBlitz, Region } from '@blitzkit/core'; -import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; +import { normalizeIds } from './normalizeIds'; interface IndividualClanInfo { recruiting_options: { diff --git a/packages/core/src/blitz/getRatingInfo.ts b/packages/core/src/blitz/getRatingInfo.ts index c43e9c26d..3e979ec4d 100644 --- a/packages/core/src/blitz/getRatingInfo.ts +++ b/packages/core/src/blitz/getRatingInfo.ts @@ -1,7 +1,7 @@ import { RatingInfo, Region } from '@blitzkit/core'; -import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain'; -import { context } from '../../../website/src/core/blitzkit/context'; import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch'; +import { context } from '../blitzkit/context'; +import { regionToRegionSubdomain } from './regionToRegionSubdomain'; const cache: Partial> = {}; diff --git a/packages/core/src/blitz/getRatingLeague.ts b/packages/core/src/blitz/getRatingLeague.ts index fec5c9723..9805cd3e9 100644 --- a/packages/core/src/blitz/getRatingLeague.ts +++ b/packages/core/src/blitz/getRatingLeague.ts @@ -1,7 +1,7 @@ import { LeagueTop, RatingPlayer, Region } from '@blitzkit/core'; -import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain'; -import { context } from '../../../website/src/core/blitzkit/context'; import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch'; +import { context } from '../blitzkit/context'; +import { regionToRegionSubdomain } from './regionToRegionSubdomain'; export async function getRatingLeague( region: Region, diff --git a/packages/core/src/blitz/getRatingNeighbors.ts b/packages/core/src/blitz/getRatingNeighbors.ts index 489b4d9b3..7e45a98b0 100644 --- a/packages/core/src/blitz/getRatingNeighbors.ts +++ b/packages/core/src/blitz/getRatingNeighbors.ts @@ -1,7 +1,7 @@ import { RatingNeighbors, Region } from '@blitzkit/core'; -import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain'; import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch'; import { withCORSProxy } from '../../../website/src/core/blitzkit/withCORSProxy'; +import { regionToRegionSubdomain } from './regionToRegionSubdomain'; export async function getRatingNeighbors( region: Region, diff --git a/packages/core/src/blitz/index.ts b/packages/core/src/blitz/index.ts index 0fef98ad8..67854a3b2 100644 --- a/packages/core/src/blitz/index.ts +++ b/packages/core/src/blitz/index.ts @@ -1,3 +1,4 @@ +export * from './canSplash'; export * from './clans'; export * from './constants'; export * from './equipmentPrice'; @@ -13,11 +14,19 @@ export * from './getRatingLeague'; export * from './getRatingNeighbors'; export * from './getTankStats'; export * from './idToRegion'; +export * from './isOnGoingRatingSeason'; +export * from './isValidBlitzId'; export * from './nations'; +export * from './normalizeExtra'; +export * from './normalizeIds'; export * from './permanentSkills'; export * from './rating'; export * from './regions'; export * from './regionSubdomainToRegion'; +export * from './regionToRegionSubdomain'; export * from './resolveNearPenetration'; export * from './searchClansAcrossRegions'; +export * from './searchCurrentRatingPlayers'; export * from './searchPlayersAcrossRegions'; +export * from './toUniqueId'; +export * from './writeDVPL'; diff --git a/packages/website/src/core/blitz/isOnGoingRatingSeason.ts b/packages/core/src/blitz/isOnGoingRatingSeason.ts similarity index 100% rename from packages/website/src/core/blitz/isOnGoingRatingSeason.ts rename to packages/core/src/blitz/isOnGoingRatingSeason.ts diff --git a/packages/website/src/core/blitz/isValidBlitzId.ts b/packages/core/src/blitz/isValidBlitzId.ts similarity index 100% rename from packages/website/src/core/blitz/isValidBlitzId.ts rename to packages/core/src/blitz/isValidBlitzId.ts diff --git a/packages/website/src/core/blitz/normalizeExtra.ts b/packages/core/src/blitz/normalizeExtra.ts similarity index 100% rename from packages/website/src/core/blitz/normalizeExtra.ts rename to packages/core/src/blitz/normalizeExtra.ts diff --git a/packages/website/src/core/blitz/normalizeIds.ts b/packages/core/src/blitz/normalizeIds.ts similarity index 100% rename from packages/website/src/core/blitz/normalizeIds.ts rename to packages/core/src/blitz/normalizeIds.ts diff --git a/packages/website/src/core/blitz/regionToRegionSubdomain.ts b/packages/core/src/blitz/regionToRegionSubdomain.ts similarity index 100% rename from packages/website/src/core/blitz/regionToRegionSubdomain.ts rename to packages/core/src/blitz/regionToRegionSubdomain.ts diff --git a/packages/website/src/core/blitz/searchCurrentRatingPlayers.ts b/packages/core/src/blitz/searchCurrentRatingPlayers.ts similarity index 100% rename from packages/website/src/core/blitz/searchCurrentRatingPlayers.ts rename to packages/core/src/blitz/searchCurrentRatingPlayers.ts diff --git a/packages/website/src/core/blitz/toUniqueId.ts b/packages/core/src/blitz/toUniqueId.ts similarity index 100% rename from packages/website/src/core/blitz/toUniqueId.ts rename to packages/core/src/blitz/toUniqueId.ts diff --git a/packages/website/src/core/blitz/writeDVPL.ts b/packages/core/src/blitz/writeDVPL.ts similarity index 100% rename from packages/website/src/core/blitz/writeDVPL.ts rename to packages/core/src/blitz/writeDVPL.ts diff --git a/packages/website/src/core/blitzkit/context.ts b/packages/core/src/blitzkit/context.ts similarity index 100% rename from packages/website/src/core/blitzkit/context.ts rename to packages/core/src/blitzkit/context.ts diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 6befef479..0b8956399 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -6,6 +6,7 @@ export * from './camouflageDefinitions'; export * from './checkConsumableProvisionInclusivity'; export * from './coefficient'; export * from './consumableDefinitions'; +export * from './context'; export * from './createDefaultSkills'; export * from './degressiveStat'; export * from './equipmentDefinitions'; diff --git a/packages/core/src/blitzstars/tankAverages.ts b/packages/core/src/blitzstars/tankAverages.ts index df2ff27db..ab4ec6512 100644 --- a/packages/core/src/blitzstars/tankAverages.ts +++ b/packages/core/src/blitzstars/tankAverages.ts @@ -1,5 +1,5 @@ import { BlitzStats, tankDefinitions } from '@blitzkit/core'; -import { context } from '../../../website/src/core/blitzkit/context'; +import { context } from '../blitzkit/context'; interface SpecialStats { winrate: number; diff --git a/packages/website/src/core/blitzkit/withCORSProxy.ts b/packages/website/src/core/blitzkit/withCORSProxy.ts index cce2d45ad..242b70f0b 100644 --- a/packages/website/src/core/blitzkit/withCORSProxy.ts +++ b/packages/website/src/core/blitzkit/withCORSProxy.ts @@ -1,4 +1,4 @@ -import { context } from './context'; +import { context } from '@blitzkit/core/src/blitzkit/context'; export function withCORSProxy(url: string) { return context === 'website'