diff --git a/.github/workflows/cd-assets.yml b/.github/workflows/cd-assets.yml index 90a9323fa..5f020d874 100644 --- a/.github/workflows/cd-assets.yml +++ b/.github/workflows/cd-assets.yml @@ -120,6 +120,6 @@ jobs: DATABASE_URL: ${{ secrets.DATABASE_URL }} VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }} GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} - NEXT_PUBLIC_ASSET_BRANCH: ${{ github.event.inputs.cdn_branch }} + PUBLIC_ASSET_BRANCH: ${{ github.event.inputs.cdn_branch }} WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }} run: bun build:assets --all-targets --depot --production diff --git a/.github/workflows/cd-averages.yml b/.github/workflows/cd-averages.yml index d7ad4f52c..4c4773ad2 100644 --- a/.github/workflows/cd-averages.yml +++ b/.github/workflows/cd-averages.yml @@ -22,7 +22,7 @@ jobs: - name: Build averages env: - NEXT_PUBLIC_ASSET_BRANCH: main + PUBLIC_ASSET_BRANCH: main DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} diff --git a/.github/workflows/cd-rating-asia.yml b/.github/workflows/cd-rating-asia.yml index 60892adeb..ece687b9c 100644 --- a/.github/workflows/cd-rating-asia.yml +++ b/.github/workflows/cd-rating-asia.yml @@ -17,7 +17,7 @@ jobs: - name: Generate leaderboard env: - NEXT_PUBLIC_ASSET_BRANCH: main + PUBLIC_ASSET_BRANCH: main DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} diff --git a/.github/workflows/cd-rating-eu.yml b/.github/workflows/cd-rating-eu.yml index 5f3f11b46..b719dbcdc 100644 --- a/.github/workflows/cd-rating-eu.yml +++ b/.github/workflows/cd-rating-eu.yml @@ -17,7 +17,7 @@ jobs: - name: Generate leaderboard env: - NEXT_PUBLIC_ASSET_BRANCH: main + PUBLIC_ASSET_BRANCH: main DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} diff --git a/.github/workflows/cd-rating-latest.yml b/.github/workflows/cd-rating-latest.yml index 187a7ef57..802a4ee82 100644 --- a/.github/workflows/cd-rating-latest.yml +++ b/.github/workflows/cd-rating-latest.yml @@ -17,7 +17,7 @@ jobs: - name: Generate all leaderboards env: - NEXT_PUBLIC_ASSET_BRANCH: main + PUBLIC_ASSET_BRANCH: main DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} diff --git a/.github/workflows/cd-rating-na.yml b/.github/workflows/cd-rating-na.yml index edb5af4fc..b9b2e4795 100644 --- a/.github/workflows/cd-rating-na.yml +++ b/.github/workflows/cd-rating-na.yml @@ -17,7 +17,7 @@ jobs: - name: Generate leaderboard env: - NEXT_PUBLIC_ASSET_BRANCH: main + PUBLIC_ASSET_BRANCH: main DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }} GH_TOKEN: ${{ secrets.GH_TOKEN }} DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} diff --git a/bun.lockb b/bun.lockb index 6babcd457..0deb31d57 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 0c00fafba..eb7837365 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,10 @@ }, "license": "MIT", "dependencies": { - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { + "@types/lodash-es": "^4.17.12", "@types/bun": "latest", "@types/node": "^22.5.4", "esbuild": "^0.19.12", diff --git a/packages/api/src/app/patreon/auth/[code]/route.ts b/packages/api/src/app/patreon/auth/[code]/route.ts index 8ec284a7a..714cb846b 100644 --- a/packages/api/src/app/patreon/auth/[code]/route.ts +++ b/packages/api/src/app/patreon/auth/[code]/route.ts @@ -9,12 +9,10 @@ export async function GET( `https://www.patreon.com/api/oauth2/token?code=${ params.code }&grant_type=authorization_code&client_id=${assertSecret( - process.env.NEXT_PUBLIC_PATREON_CLIENT_ID, + process.env.PUBLIC_PATREON_CLIENT_ID, )}&client_secret=${assertSecret( process.env.PATREON_CLIENT_SECRET, - )}&redirect_uri=${assertSecret( - process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI, - )}`, + )}&redirect_uri=${assertSecret(process.env.PUBLIC_PATREON_REDIRECT_URI)}`, { method: 'POST', headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, diff --git a/packages/api/src/app/patreon/refresh/[token]/route.ts b/packages/api/src/app/patreon/refresh/[token]/route.ts index 22106a448..bf58e39b7 100644 --- a/packages/api/src/app/patreon/refresh/[token]/route.ts +++ b/packages/api/src/app/patreon/refresh/[token]/route.ts @@ -9,7 +9,7 @@ export async function GET( `https://www.patreon.com/api/oauth2/token?grant_type=refresh_token&refresh_token=${ params.token }&client_id=${assertSecret( - process.env.NEXT_PUBLIC_PATREON_CLIENT_ID, + process.env.PUBLIC_PATREON_CLIENT_ID, )}&client_secret=${assertSecret(process.env.PATREON_CLIENT_SECRET)}`, { method: 'POST' }, ); diff --git a/packages/bot/src/commands/breakdown/render.tsx b/packages/bot/src/commands/breakdown/render.tsx index 0182c8d13..c804674eb 100644 --- a/packages/bot/src/commands/breakdown/render.tsx +++ b/packages/bot/src/commands/breakdown/render.tsx @@ -12,7 +12,7 @@ import { tankDefinitions, } from '@blitzkit/core'; import { Locale } from 'discord.js'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash-es'; import * as Breakdown from '../../components/Breakdown'; import { CommandWrapper } from '../../components/CommandWrapper'; import { NoData } from '../../components/NoData'; diff --git a/packages/bot/src/commands/ownedTanks.tsx b/packages/bot/src/commands/ownedTanks.tsx index b42f2f41f..e20a25369 100644 --- a/packages/bot/src/commands/ownedTanks.tsx +++ b/packages/bot/src/commands/ownedTanks.tsx @@ -9,7 +9,7 @@ import { getTankStats, tankDefinitions, } from '@blitzkit/core'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash-es'; import markdownEscape from 'markdown-escape'; import { addTierChoices } from '../core/discord/addTierChoices'; import { addUsernameChoices } from '../core/discord/addUsernameChoices'; diff --git a/packages/bot/src/commands/ratingLeaderboard.tsx b/packages/bot/src/commands/ratingLeaderboard.tsx index ceccfeeaf..3eca65e3f 100644 --- a/packages/bot/src/commands/ratingLeaderboard.tsx +++ b/packages/bot/src/commands/ratingLeaderboard.tsx @@ -20,7 +20,7 @@ import { Locale, SlashCommandSubcommandBuilder, } from 'discord.js'; -import { range } from 'lodash'; +import { range } from 'lodash-es'; import markdownEscape from 'markdown-escape'; import { CommandWrapper } from '../components/CommandWrapper'; import * as Leaderboard from '../components/Leaderboard'; diff --git a/packages/bot/src/commands/replay.tsx b/packages/bot/src/commands/replay.tsx index 021cb0ead..dbe2b27a0 100644 --- a/packages/bot/src/commands/replay.tsx +++ b/packages/bot/src/commands/replay.tsx @@ -9,7 +9,7 @@ import { tankIcon, TIER_ROMAN_NUMERALS, } from '@blitzkit/core'; -import { clamp } from 'lodash'; +import { clamp } from 'lodash-es'; import { CommandWrapper } from '../components/CommandWrapper'; import { TitleBar } from '../components/TitleBar'; import { iconPng } from '../core/blitzkit/iconPng'; diff --git a/packages/bot/src/components/Graph/components/Margin/index.tsx b/packages/bot/src/components/Graph/components/Margin/index.tsx index 66b64df5e..049eda311 100644 --- a/packages/bot/src/components/Graph/components/Margin/index.tsx +++ b/packages/bot/src/components/Graph/components/Margin/index.tsx @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { theme } from '../../../../stitches.config'; import { MarginInputProps } from '../Root'; import { MarginOrientation } from './constants'; diff --git a/packages/bot/src/components/Graph/components/Root/index.tsx b/packages/bot/src/components/Graph/components/Root/index.tsx index 6f621f07d..9d13064bb 100644 --- a/packages/bot/src/components/Graph/components/Root/index.tsx +++ b/packages/bot/src/components/Graph/components/Root/index.tsx @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { ReactNode } from 'react'; import { theme } from '../../../../stitches.config'; import { Margin } from '../Margin'; diff --git a/packages/bot/src/core/discord/addTierChoices.ts b/packages/bot/src/core/discord/addTierChoices.ts index 30ed76f22..70f8bdfde 100644 --- a/packages/bot/src/core/discord/addTierChoices.ts +++ b/packages/bot/src/core/discord/addTierChoices.ts @@ -4,7 +4,7 @@ import { Locale, SlashCommandStringOption, } from 'discord.js'; -import { range } from 'lodash'; +import { range } from 'lodash-es'; import { translator } from '../localization/translator'; import { localizationObject } from './localizationObject'; diff --git a/packages/core/src/blitz/fetchBlitz.ts b/packages/core/src/blitz/fetchBlitz.ts index 5592d8dcd..cffaacc87 100644 --- a/packages/core/src/blitz/fetchBlitz.ts +++ b/packages/core/src/blitz/fetchBlitz.ts @@ -73,7 +73,7 @@ export function fetchBlitz( queue.push({ url: `https://api.wotblitz.${region}/wotb/${path}/?${Object.entries({ application_id: assertSecret( - process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID, + process.env.PUBLIC_WARGAMING_APPLICATION_ID, ), ...params, }) diff --git a/packages/core/src/blitz/isValidBlitzId.ts b/packages/core/src/blitz/isValidBlitzId.ts index cc992d555..89ee96b03 100644 --- a/packages/core/src/blitz/isValidBlitzId.ts +++ b/packages/core/src/blitz/isValidBlitzId.ts @@ -11,7 +11,7 @@ export async function isValidBlitzId(id: number, token?: string) { const json = await fetch( `https://api.wotblitz.${region}/wotb/account/info/?account_id=${id}&application_id=${assertSecret( - process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID, + process.env.PUBLIC_WARGAMING_APPLICATION_ID, )}${ token === undefined ? '' : `&access_token=${token}` }&fields=account_id%2C-account_id`, diff --git a/packages/core/src/blitzkit/asset.ts b/packages/core/src/blitzkit/asset.ts index f4b06452b..7a288b465 100644 --- a/packages/core/src/blitzkit/asset.ts +++ b/packages/core/src/blitzkit/asset.ts @@ -2,6 +2,6 @@ import { assertSecret } from './assertSecret'; export function asset(path: string) { return `https://raw.githubusercontent.com/${assertSecret( - process.env.NEXT_PUBLIC_ASSET_REPO, - )}/${assertSecret(process.env.NEXT_PUBLIC_ASSET_BRANCH)}/${path}`; + process.env.PUBLIC_ASSET_REPO, + )}/${assertSecret(process.env.PUBLIC_ASSET_BRANCH)}/${path}`; } diff --git a/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts b/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts index 7ba551583..9da80ed52 100644 --- a/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts +++ b/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts @@ -17,7 +17,7 @@ export async function getArchivedLatestSeasonNumber() { const regionsURL = ( (await fetch( `https://api.github.com/repos/tresabhi/${assertSecret( - process.env.NEXT_PUBLIC_ASSET_REPO, + process.env.PUBLIC_ASSET_REPO, )}/git/trees/main`, ).then((response) => response.json())) as GitHubTrees ).tree.find(({ path }) => path === 'regions')!.url; diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 6efb3af1c..b994b5c4f 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -12,10 +12,10 @@ export * from './assertSecret'; // export * from './discoveredIdDefinitions'; // export * from './emblemURL'; // export * from './equipmentDefinitions'; -// export * from './eventManager'; +export * from './eventManager'; // export * from './fetchCdonLz4'; // export * from './flagUserActivity'; -// export * from './gameDefinitions'; +export * from './gameDefinitions'; // export * from './getArchivedLatestSeasonNumber'; // export * from './getArchivedRatingInfo'; // export * from './getArchivedRatingLeaderboard'; @@ -36,8 +36,8 @@ export * from './assertSecret'; // export * from './reviews'; // export * from './skillDefinitions'; // export * from './sum'; -// export * from './superCompress'; -// export * from './superDecompress'; +export * from './superCompress'; +export * from './superDecompress'; // export * from './tankDefinitions'; // export * from './tankIcon'; // export * from './tankNames'; diff --git a/packages/core/src/blitzkit/tankNames.ts b/packages/core/src/blitzkit/tankNames.ts index 643b28afd..9cfb469c8 100644 --- a/packages/core/src/blitzkit/tankNames.ts +++ b/packages/core/src/blitzkit/tankNames.ts @@ -1,4 +1,4 @@ -import { deburr } from 'lodash'; +import { deburr } from 'lodash-es'; import { camouflageDefinitions, tankDefinitionsArray } from '.'; export const tankNames = Promise.all([ diff --git a/packages/core/src/blitzkit/uniqueGuns.ts b/packages/core/src/blitzkit/uniqueGuns.ts index f6af5ac55..b9db83f25 100644 --- a/packages/core/src/blitzkit/uniqueGuns.ts +++ b/packages/core/src/blitzkit/uniqueGuns.ts @@ -1,4 +1,4 @@ -import { forEachRight } from 'lodash'; +import { forEachRight } from 'lodash-es'; import { GunDefinition, TurretDefinition } from './tankDefinitions'; export function uniqueGuns(turrets: TurretDefinition[]) { diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index d8237e00d..43e808fdd 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,4 +1,4 @@ -// export * from './blitz'; +export * from './blitz'; export * from './blitzkit'; // export * from './blitzstars'; // export * from './databases'; diff --git a/packages/core/src/patreon/patreonLoginUrl.ts b/packages/core/src/patreon/patreonLoginUrl.ts index 4bdf9b5e6..3341bdab4 100644 --- a/packages/core/src/patreon/patreonLoginUrl.ts +++ b/packages/core/src/patreon/patreonLoginUrl.ts @@ -3,8 +3,8 @@ import { assertSecret } from '../blitzkit/assertSecret'; export function patreonLoginUrl() { const params = new URLSearchParams({ response_type: 'code', - client_id: assertSecret(process.env.NEXT_PUBLIC_PATREON_CLIENT_ID), - redirect_uri: assertSecret(process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI), + client_id: assertSecret(process.env.PUBLIC_PATREON_CLIENT_ID), + redirect_uri: assertSecret(process.env.PUBLIC_PATREON_REDIRECT_URI), scope: 'identity', }); diff --git a/packages/core/src/streams/bkrl.ts b/packages/core/src/streams/bkrl.ts index 19bdf31d9..113797907 100644 --- a/packages/core/src/streams/bkrl.ts +++ b/packages/core/src/streams/bkrl.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { ReadStream, WriteStream } from './buffer'; export enum BkrlFormat { diff --git a/packages/core/src/streams/cdon.ts b/packages/core/src/streams/cdon.ts index f9257b8fb..ecf66521f 100644 --- a/packages/core/src/streams/cdon.ts +++ b/packages/core/src/streams/cdon.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { ReadStream, WriteStream } from './buffer'; enum ValueType { diff --git a/packages/core/src/streams/dds.ts b/packages/core/src/streams/dds.ts index a57bf589a..816db8710 100644 --- a/packages/core/src/streams/dds.ts +++ b/packages/core/src/streams/dds.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { Vector3Tuple, Vector4Tuple } from 'three'; import { WindowsReadStream } from './windows'; diff --git a/packages/core/src/streams/dids.ts b/packages/core/src/streams/dids.ts index ac57cd59e..e2c70e042 100644 --- a/packages/core/src/streams/dids.ts +++ b/packages/core/src/streams/dids.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { ReadStream, WriteStream } from './buffer'; export class DidsReadStream extends ReadStream { diff --git a/packages/core/src/streams/pvr.ts b/packages/core/src/streams/pvr.ts index d23360ddf..979b9c396 100644 --- a/packages/core/src/streams/pvr.ts +++ b/packages/core/src/streams/pvr.ts @@ -1,4 +1,4 @@ -import { clamp, isEqual, times } from 'lodash'; +import { clamp, isEqual, times } from 'lodash-es'; import { ReadStream } from './buffer'; export enum PvrFlags { diff --git a/packages/core/src/streams/rts.ts b/packages/core/src/streams/rts.ts index 657ef046b..5fba32c74 100644 --- a/packages/core/src/streams/rts.ts +++ b/packages/core/src/streams/rts.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { IndividualTankStats } from '..'; import { BlitzStats } from '../statistics/compositeStats/constants'; import { ReadStream, WriteStream } from './buffer'; diff --git a/packages/core/src/streams/scpg.ts b/packages/core/src/streams/scpg.ts index 8d8401b71..f02d655c2 100644 --- a/packages/core/src/streams/scpg.ts +++ b/packages/core/src/streams/scpg.ts @@ -1,4 +1,4 @@ -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { ReadStream } from './buffer'; enum KAType { diff --git a/packages/scripts/src/averages.ts b/packages/scripts/src/averages.ts index bd5337984..7d54ab84a 100644 --- a/packages/scripts/src/averages.ts +++ b/packages/scripts/src/averages.ts @@ -14,7 +14,7 @@ import { getTankStats, idToRegion, } from '@blitzkit/core'; -import { chunk, times } from 'lodash'; +import { chunk, times } from 'lodash-es'; import { commitAssets } from './core/github/commitAssets'; import { fetchPreDiscoveredIds } from './core/github/fetchPreDiscoveredIds'; diff --git a/packages/scripts/src/buildAssets/definitions.ts b/packages/scripts/src/buildAssets/definitions.ts index 6972e68c9..852a19f3e 100644 --- a/packages/scripts/src/buildAssets/definitions.ts +++ b/packages/scripts/src/buildAssets/definitions.ts @@ -451,7 +451,7 @@ export async function definitions() { const wargamingTankopedia = (await fetch( `https://api.wotblitz.com/wotb/encyclopedia/vehicles/?application_id=${assertSecret( - process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID, + process.env.PUBLIC_WARGAMING_APPLICATION_ID, )}&fields=description`, ).then((response) => response.json())) as { data: { [key: number]: { description: null | string } }; diff --git a/packages/scripts/src/buildRatingLeaderboard.ts b/packages/scripts/src/buildRatingLeaderboard.ts index 352a9b73f..af54dc6b0 100644 --- a/packages/scripts/src/buildRatingLeaderboard.ts +++ b/packages/scripts/src/buildRatingLeaderboard.ts @@ -14,7 +14,7 @@ import { regionSubdomainToRegion, superCompress, } from '@blitzkit/core'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash-es'; import { argv } from 'process'; import { commitAssets } from './core/github/commitAssets'; import { FileChange } from './core/github/commitMultipleFiles'; diff --git a/packages/scripts/src/core/blitz/extractArmor.ts b/packages/scripts/src/core/blitz/extractArmor.ts index fc30d840c..a5c6e6b2d 100644 --- a/packages/scripts/src/core/blitz/extractArmor.ts +++ b/packages/scripts/src/core/blitz/extractArmor.ts @@ -5,7 +5,7 @@ import { VertexAttribute, } from '@blitzkit/core'; import { Accessor, Document, Node, Scene } from '@gltf-transform/core'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { vertexAttributeGLTFName, vertexAttributeGltfVectorSizes, diff --git a/packages/scripts/src/core/blitz/extractModel/index.ts b/packages/scripts/src/core/blitz/extractModel/index.ts index abb0fdcac..64281df2b 100644 --- a/packages/scripts/src/core/blitz/extractModel/index.ts +++ b/packages/scripts/src/core/blitz/extractModel/index.ts @@ -6,7 +6,7 @@ import { VertexAttribute, } from '@blitzkit/core'; import { Document, Material, Node, Scene } from '@gltf-transform/core'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { dirname } from 'path'; import { Matrix4, Quaternion, Vector3, Vector4Tuple } from 'three'; import { readDVPLFile } from '../readDVPLFile'; diff --git a/packages/scripts/src/core/github/assetCommit.ts b/packages/scripts/src/core/github/assetCommit.ts index 8ab1f9438..40ab2b77d 100644 --- a/packages/scripts/src/core/github/assetCommit.ts +++ b/packages/scripts/src/core/github/assetCommit.ts @@ -11,7 +11,7 @@ export class AssetCommit { const blob = await createBlob( 'tresabhi', - assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), + assertSecret(process.env.PUBLIC_ASSET_REPO), { content, encoding, @@ -28,14 +28,14 @@ export class AssetCommit { const latestCommitSha = ( await octokit.git.getRef({ owner: 'tresabhi', - repo: assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), - ref: `heads/${assertSecret(process.env.NEXT_PUBLIC_ASSET_BRANCH)}`, + repo: assertSecret(process.env.PUBLIC_ASSET_REPO), + ref: `heads/${assertSecret(process.env.PUBLIC_ASSET_BRANCH)}`, }) ).data.object.sha; const treeSha = ( await octokit.git.getCommit({ owner: 'tresabhi', - repo: assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), + repo: assertSecret(process.env.PUBLIC_ASSET_REPO), commit_sha: latestCommitSha, }) ).data.tree.sha; @@ -43,21 +43,21 @@ export class AssetCommit { const { data: treeData } = await octokit.git.createTree({ owner: 'tresabhi', - repo: assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), + repo: assertSecret(process.env.PUBLIC_ASSET_REPO), base_tree: treeSha, tree: blobs, }); const { data: newCommitData } = await octokit.git.createCommit({ owner: 'tresabhi', - repo: assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), + repo: assertSecret(process.env.PUBLIC_ASSET_REPO), message: this.message, tree: treeData.sha, parents: [latestCommitSha], }); await octokit.git.updateRef({ owner: 'tresabhi', - repo: assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), - ref: `heads/${assertSecret(process.env.NEXT_PUBLIC_ASSET_BRANCH)}`, + repo: assertSecret(process.env.PUBLIC_ASSET_REPO), + ref: `heads/${assertSecret(process.env.PUBLIC_ASSET_BRANCH)}`, sha: newCommitData.sha, }); } diff --git a/packages/scripts/src/core/github/commitAssets.ts b/packages/scripts/src/core/github/commitAssets.ts index 6d0ee075d..5b9ab72e0 100644 --- a/packages/scripts/src/core/github/commitAssets.ts +++ b/packages/scripts/src/core/github/commitAssets.ts @@ -8,8 +8,8 @@ export async function commitAssets(message: string, changes: FileChange[]) { await commitMultipleFiles( 'tresabhi', - assertSecret(process.env.NEXT_PUBLIC_ASSET_REPO), - assertSecret(process.env.NEXT_PUBLIC_ASSET_BRANCH), + assertSecret(process.env.PUBLIC_ASSET_REPO), + assertSecret(process.env.PUBLIC_ASSET_BRANCH), `${message} - ${new Date().toDateString()}`, changes, ); diff --git a/packages/scripts/src/core/github/createBlob.ts b/packages/scripts/src/core/github/createBlob.ts index 2677521da..45ccd7cd7 100644 --- a/packages/scripts/src/core/github/createBlob.ts +++ b/packages/scripts/src/core/github/createBlob.ts @@ -1,4 +1,4 @@ -import { throttle } from 'lodash'; +import { throttle } from 'lodash-es'; import { FileChange } from './commitMultipleFiles'; import { octokit } from './octokit'; diff --git a/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts b/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts index 7f37658cd..c14d779ae 100644 --- a/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts +++ b/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts @@ -3,7 +3,7 @@ import { DidsReadStream, DiscoveredIdsDefinitions, } from '@blitzkit/core'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { decompress } from 'lz4js'; import ProgressBar from 'progress'; diff --git a/packages/scripts/src/discoverIds.ts b/packages/scripts/src/discoverIds.ts index f28c3c481..0123f6181 100644 --- a/packages/scripts/src/discoverIds.ts +++ b/packages/scripts/src/discoverIds.ts @@ -10,7 +10,7 @@ import { idToRegion, retryAbleBlitzFetchEvent, } from '@blitzkit/core'; -import { chunk, times, uniq } from 'lodash'; +import { chunk, times, uniq } from 'lodash-es'; import { compress, decompress } from 'lz4js'; import { commitAssets } from './core/github/commitAssets'; diff --git a/packages/scripts/src/reviews.ts b/packages/scripts/src/reviews.ts index 9d1edf111..655b8ab18 100644 --- a/packages/scripts/src/reviews.ts +++ b/packages/scripts/src/reviews.ts @@ -9,7 +9,7 @@ import { } from '@blitzkit/core'; import { readdir } from 'fs/promises'; import { google } from 'googleapis'; -import { cloneDeep, uniqBy } from 'lodash'; +import { cloneDeep, uniqBy } from 'lodash-es'; import { parse as parseYaml } from 'yaml'; import { DATA } from './buildAssets/constants'; import { @@ -118,7 +118,7 @@ for (const tank of tanksSanitized) { ({ id: item.id!.videoId!, author: item.snippet!.channelId!, - } satisfies Video), + }) satisfies Video, ), }; diff --git a/packages/website-legacy/package.json b/packages/website-legacy/package.json index b3a7306d8..56aed9621 100644 --- a/packages/website-legacy/package.json +++ b/packages/website-legacy/package.json @@ -29,8 +29,7 @@ "react-fuzzysort": "^1.0.1", "immer": "^10.1.1", "@vanilla-extract/dynamic": "^2.1.2", - "zustand": "^4.5.5", - "react-promise-suspense": "^0.3.4" + "zustand": "^4.5.5" }, "devDependencies": { "@types/react-dom": "^18", diff --git a/packages/website-legacy/src/app/auth/[provider]/page.tsx b/packages/website-legacy/src/app/auth/[provider]/page.tsx index b98096fab..a3e9773e7 100644 --- a/packages/website-legacy/src/app/auth/[provider]/page.tsx +++ b/packages/website-legacy/src/app/auth/[provider]/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { Flex, Heading, Text } from '@radix-ui/themes'; import { useRouter } from 'next/navigation'; import { useEffect } from 'react'; diff --git a/packages/website-legacy/src/app/components/Checks.tsx b/packages/website-legacy/src/app/components/Checks.tsx index 1962110e8..7f08b73b6 100644 --- a/packages/website-legacy/src/app/components/Checks.tsx +++ b/packages/website-legacy/src/app/components/Checks.tsx @@ -1,5 +1,3 @@ -'use client'; - import { assertSecret, idToRegion } from '@blitzkit/core'; import { Button, Flex, Heading, Link, Text } from '@radix-ui/themes'; import { usePathname } from 'next/navigation'; @@ -78,7 +76,7 @@ export function Checks() { `https://api.worldoftanks.${idToRegion( wargaming.id, )}/wot/auth/prolongate/?application_id=${assertSecret( - process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID, + process.env.PUBLIC_WARGAMING_APPLICATION_ID, )}&access_token=${wargaming.token}`, ) .then((response) => response.json() as Promise) diff --git a/packages/website-legacy/src/app/docs/[directory]/[document]/page.tsx b/packages/website-legacy/src/app/docs/[directory]/[document]/page.tsx index 779eb7d31..22cc6cfd9 100644 --- a/packages/website-legacy/src/app/docs/[directory]/[document]/page.tsx +++ b/packages/website-legacy/src/app/docs/[directory]/[document]/page.tsx @@ -13,7 +13,7 @@ export default function Page({ const markdown = use( fetch( `https://raw.githubusercontent.com/tresabhi/blitzkit/${assertSecret( - process.env.NEXT_PUBLIC_ASSET_BRANCH, + process.env.PUBLIC_ASSET_BRANCH, )}/docs/${params.directory}/${params.document}.md`, ).then((response) => response.text()), ); diff --git a/packages/website-legacy/src/app/layout.tsx b/packages/website-legacy/src/app/layout.tsx index 50f64de05..fa14e9662 100644 --- a/packages/website-legacy/src/app/layout.tsx +++ b/packages/website-legacy/src/app/layout.tsx @@ -1,5 +1,3 @@ -'use client'; - import { Flex, Theme } from '@radix-ui/themes'; import '@radix-ui/themes/styles.css'; import { Roboto_Flex } from 'next/font/google'; diff --git a/packages/website-legacy/src/app/not-found.tsx b/packages/website-legacy/src/app/not-found.tsx index b9b9e6510..2909fce86 100644 --- a/packages/website-legacy/src/app/not-found.tsx +++ b/packages/website-legacy/src/app/not-found.tsx @@ -1,5 +1,3 @@ -'use client'; - import { DiscordLogoIcon, HomeIcon } from '@radix-ui/react-icons'; import { Button, Flex, Heading, Text } from '@radix-ui/themes'; import Link from 'next/link'; diff --git a/packages/website-legacy/src/app/page.tsx b/packages/website-legacy/src/app/page.tsx index 2372f5682..cdc95374a 100644 --- a/packages/website-legacy/src/app/page.tsx +++ b/packages/website-legacy/src/app/page.tsx @@ -1,7 +1,6 @@ -'use client'; - import { Flex, Heading } from '@radix-ui/themes'; import { Hero } from '../../../website/src/components/Hero'; +import { Plugs } from '../../../website/src/components/Plugs'; import { ToolCard } from '../../../website/src/components/ToolCard'; import { compareTool, @@ -14,7 +13,6 @@ import { } from '../../../website/src/constants/tools'; import { AdMidSectionResponsive } from '../components/AdMidSectionResponsive'; import { useAdExempt } from '../hooks/useAdExempt'; -import { Plugs } from '../../../website/src/components/Plugs'; export default function Page() { const exempt = useAdExempt(); diff --git a/packages/website-legacy/src/app/settings/page.tsx b/packages/website-legacy/src/app/settings/page.tsx index 35cb4902c..0ab5fc4f0 100644 --- a/packages/website-legacy/src/app/settings/page.tsx +++ b/packages/website-legacy/src/app/settings/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { Flex, Heading, Switch, Text } from '@radix-ui/themes'; import { PageWrapper } from '../../components/PageWrapper'; import * as App from '../../stores/app'; diff --git a/packages/website-legacy/src/app/tools/compare/components/CompareSectionTitle.tsx b/packages/website-legacy/src/app/tools/compare/components/CompareSectionTitle.tsx index 83009f647..bc6b3481f 100644 --- a/packages/website-legacy/src/app/tools/compare/components/CompareSectionTitle.tsx +++ b/packages/website-legacy/src/app/tools/compare/components/CompareSectionTitle.tsx @@ -1,5 +1,5 @@ import { Heading, Table } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { StickyColumnHeaderCell } from '../../../../components/StickyColumnHeaderCell'; import * as CompareEphemeral from '../../../../stores/compareEphemeral'; diff --git a/packages/website-legacy/src/app/tools/compare/components/CompareTable.tsx b/packages/website-legacy/src/app/tools/compare/components/CompareTable.tsx index da34495d8..dd2560342 100644 --- a/packages/website-legacy/src/app/tools/compare/components/CompareTable.tsx +++ b/packages/website-legacy/src/app/tools/compare/components/CompareTable.tsx @@ -10,7 +10,7 @@ import { } from '@blitzkit/core'; import { ComponentPlaceholderIcon } from '@radix-ui/react-icons'; import { Button, Flex, Popover, Slider, Table, Text } from '@radix-ui/themes'; -import { debounce, times } from 'lodash'; +import { debounce, times } from 'lodash-es'; import { use } from 'react'; import { BlitzkitButtonGrayIcon } from '../../../../components/BlitzkitButtonGrayIcon'; import { ConsumablesManager } from '../../../../components/ConsumablesManager'; diff --git a/packages/website-legacy/src/app/tools/compare/page.tsx b/packages/website-legacy/src/app/tools/compare/page.tsx index 1af189176..7470dc6d2 100644 --- a/packages/website-legacy/src/app/tools/compare/page.tsx +++ b/packages/website-legacy/src/app/tools/compare/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { createDefaultSkills, equipmentDefinitions, diff --git a/packages/website-legacy/src/app/tools/embed/[embed]/host/page.tsx b/packages/website-legacy/src/app/tools/embed/[embed]/host/page.tsx index 8d8f7d815..56de3c850 100644 --- a/packages/website-legacy/src/app/tools/embed/[embed]/host/page.tsx +++ b/packages/website-legacy/src/app/tools/embed/[embed]/host/page.tsx @@ -1,13 +1,11 @@ -'use client'; - import { Code, Heading } from '@radix-ui/themes'; import { useSearchParams } from 'next/navigation'; import { useMemo } from 'react'; -import { PageWrapper } from '../../../../../components/PageWrapper'; import { configurations, extractEmbedConfigDefaults, } from '../../../../../../../website/src/constants/embeds'; +import { PageWrapper } from '../../../../../components/PageWrapper'; import * as EmbedState from '../../../../../stores/embedState'; export interface EmbedPreviewControllerProps { diff --git a/packages/website-legacy/src/app/tools/embed/[embed]/page.tsx b/packages/website-legacy/src/app/tools/embed/[embed]/page.tsx index 72c33be8d..c586f512c 100644 --- a/packages/website-legacy/src/app/tools/embed/[embed]/page.tsx +++ b/packages/website-legacy/src/app/tools/embed/[embed]/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { imgur } from '@blitzkit/core'; import { CodeIcon, @@ -11,12 +9,12 @@ import { WidthIcon, } from '@radix-ui/react-icons'; import { Box, Button, Flex, Heading, ScrollArea, Text } from '@radix-ui/themes'; -import { capitalize, startCase } from 'lodash'; +import { capitalize, startCase } from 'lodash-es'; import { ReactNode, useEffect, useRef, useState } from 'react'; import { stringify } from 'urlon'; +import { configurations } from '../../../../../../website/src/constants/embeds'; import { CopyButton } from '../../../../components/CopyButton'; import { PageWrapper } from '../../../../components/PageWrapper'; -import { configurations } from '../../../../../../website/src/constants/embeds'; import * as App from '../../../../stores/app'; import * as EmbedState from '../../../../stores/embedState'; import { EmbedConfig } from '../../../../stores/embedState'; diff --git a/packages/website-legacy/src/app/tools/layout.tsx b/packages/website-legacy/src/app/tools/layout.tsx index bbbb7e8c7..e240bf8bd 100644 --- a/packages/website-legacy/src/app/tools/layout.tsx +++ b/packages/website-legacy/src/app/tools/layout.tsx @@ -1,5 +1,3 @@ -'use client'; - import { imgur, ImgurSize } from '@blitzkit/core'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; diff --git a/packages/website-legacy/src/app/tools/performance/components/BodyLoader.tsx b/packages/website-legacy/src/app/tools/performance/components/BodyLoader.tsx index 21daa866e..e48bd88d2 100644 --- a/packages/website-legacy/src/app/tools/performance/components/BodyLoader.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/BodyLoader.tsx @@ -1,5 +1,5 @@ import { Table } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { RowLoader } from './RowLoader'; export function BodyLoader() { diff --git a/packages/website-legacy/src/app/tools/performance/components/Header.tsx b/packages/website-legacy/src/app/tools/performance/components/Header.tsx index 3c3693ffc..2dbf46c42 100644 --- a/packages/website-legacy/src/app/tools/performance/components/Header.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/Header.tsx @@ -1,5 +1,3 @@ -'use client'; - import { CaretDownIcon, CaretSortIcon, diff --git a/packages/website-legacy/src/app/tools/performance/components/Info.tsx b/packages/website-legacy/src/app/tools/performance/components/Info.tsx index 0e270a7a5..c7b07ac08 100644 --- a/packages/website-legacy/src/app/tools/performance/components/Info.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/Info.tsx @@ -1,6 +1,8 @@ -'use client'; - -import { averageDefinitions, discoveredIdsDefinitions, formatCompact } from '@blitzkit/core'; +import { + averageDefinitions, + discoveredIdsDefinitions, + formatCompact, +} from '@blitzkit/core'; import { InfoCircledIcon } from '@radix-ui/react-icons'; import { Callout, Flex } from '@radix-ui/themes'; import { use } from 'react'; diff --git a/packages/website-legacy/src/app/tools/performance/components/PlayerCountControl.tsx b/packages/website-legacy/src/app/tools/performance/components/PlayerCountControl.tsx index a9b164fd1..550194f75 100644 --- a/packages/website-legacy/src/app/tools/performance/components/PlayerCountControl.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/PlayerCountControl.tsx @@ -1,5 +1,3 @@ -'use client'; - import { Flex, Select, Text } from '@radix-ui/themes'; import * as TankPerformancePersistent from '../../../../stores/tankPerformancePersistent'; import { PlayerCountPeriod } from '../../../../stores/tankPerformancePersistent/constants'; diff --git a/packages/website-legacy/src/app/tools/performance/components/RowLoader.tsx b/packages/website-legacy/src/app/tools/performance/components/RowLoader.tsx index a019b5285..5349eecc0 100644 --- a/packages/website-legacy/src/app/tools/performance/components/RowLoader.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/RowLoader.tsx @@ -1,5 +1,5 @@ import { Skeleton, Table } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { memo, useRef } from 'react'; import { useIntersection } from '../../../../hooks/useIntersection'; import { TankPerformanceSortTypeNamesArray } from '../../../../stores/tankPerformanceSort/constants'; diff --git a/packages/website-legacy/src/app/tools/performance/components/Table.tsx b/packages/website-legacy/src/app/tools/performance/components/Table.tsx index f0b028119..bc448aa38 100644 --- a/packages/website-legacy/src/app/tools/performance/components/Table.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/Table.tsx @@ -1,5 +1,3 @@ -'use client'; - import { Flex } from '@radix-ui/themes'; import { Suspense } from 'react'; import { StickyTableRoot } from '../../../../components/StickyTableRoot'; diff --git a/packages/website-legacy/src/app/tools/performance/components/Tanks.tsx b/packages/website-legacy/src/app/tools/performance/components/Tanks.tsx index d1de89eff..c2e9f64c5 100644 --- a/packages/website-legacy/src/app/tools/performance/components/Tanks.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/Tanks.tsx @@ -1,19 +1,14 @@ -'use client'; - -import { - averageDefinitionsArray, - tankDefinitions, -} from '@blitzkit/core'; +import { averageDefinitionsArray, tankDefinitions } from '@blitzkit/core'; import { Table } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { Suspense, use, useEffect, useMemo, useState } from 'react'; +import { filterTank } from '../../../../core/blitzkit/filterTank'; import * as TankFilters from '../../../../stores/tankFilters'; import * as TankPerformancePersistent from '../../../../stores/tankPerformancePersistent'; import * as TankPerformanceSort from '../../../../stores/tankPerformanceSort'; import { RowLoader } from './RowLoader'; import { TankRow } from './TankRow'; import { Total } from './Total'; -import { filterTank } from '../../../../core/blitzkit/filterTank'; const PREVIEW_COUNT = 10; const DEFAULT_LOADED_ROWS = 25; diff --git a/packages/website-legacy/src/app/tools/performance/components/TierBreakdown.tsx b/packages/website-legacy/src/app/tools/performance/components/TierBreakdown.tsx index 9ed96da21..687a7c06b 100644 --- a/packages/website-legacy/src/app/tools/performance/components/TierBreakdown.tsx +++ b/packages/website-legacy/src/app/tools/performance/components/TierBreakdown.tsx @@ -1,5 +1,3 @@ -'use client'; - import { averageDefinitionsArray, formatCompact, @@ -12,7 +10,7 @@ import { import strings from '@blitzkit/core/lang/en-US.json'; import { ResponsiveBar } from '@nivo/bar'; import { Box, Flex, Heading } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { use } from 'react'; import { nivoTheme } from '../../../../core/nivo/theme'; diff --git a/packages/website-legacy/src/app/tools/rating/components/PageTurner/index.tsx b/packages/website-legacy/src/app/tools/rating/components/PageTurner/index.tsx index 0d2eee532..6b6566e1a 100644 --- a/packages/website-legacy/src/app/tools/rating/components/PageTurner/index.tsx +++ b/packages/website-legacy/src/app/tools/rating/components/PageTurner/index.tsx @@ -4,7 +4,7 @@ import { SymbolIcon, } from '@radix-ui/react-icons'; import { Flex, IconButton, TextField } from '@radix-ui/themes'; -import { range } from 'lodash'; +import { range } from 'lodash-es'; import { useEffect, useRef } from 'react'; import { infiniteSpin } from './index.css'; diff --git a/packages/website-legacy/src/app/tools/rating/page.tsx b/packages/website-legacy/src/app/tools/rating/page.tsx index 02761dd83..d54a126e8 100644 --- a/packages/website-legacy/src/app/tools/rating/page.tsx +++ b/packages/website-legacy/src/app/tools/rating/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { AccountList, AccountListItem, @@ -33,7 +31,7 @@ import { TextField, } from '@radix-ui/themes'; import { produce } from 'immer'; -import { debounce, range } from 'lodash'; +import { debounce, range } from 'lodash-es'; import { ChangeEvent, useEffect, useRef, useState } from 'react'; import { create } from 'zustand'; import { PageWrapper } from '../../../components/PageWrapper'; diff --git a/packages/website-legacy/src/app/tools/session/page.tsx b/packages/website-legacy/src/app/tools/session/page.tsx index d299591b9..e3d719cd4 100644 --- a/packages/website-legacy/src/app/tools/session/page.tsx +++ b/packages/website-legacy/src/app/tools/session/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { AccountListWithServer, IndividualAccountInfo, @@ -37,7 +35,7 @@ import { Text, TextField, } from '@radix-ui/themes'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; import { use, useEffect, useMemo, useRef, useState } from 'react'; import { PageWrapper } from '../../../components/PageWrapper'; import { TankRowHeaderCell } from '../../../components/TankRowHeaderCell'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/components/Miscellaneous.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/components/Miscellaneous.tsx index 661bc62c9..231987ac6 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/components/Miscellaneous.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/components/Miscellaneous.tsx @@ -1,6 +1,6 @@ import { asset } from '@blitzkit/core'; import { Flex, Heading, Slider, TextField } from '@radix-ui/themes'; -import { clamp, debounce } from 'lodash'; +import { clamp, debounce } from 'lodash-es'; import { useEffect, useMemo, useRef, useState } from 'react'; import { GenericTankComponentButton } from '../../../../../../../components/ModuleButtons/GenericTankComponentButton'; import * as Duel from '../../../../../../../stores/duel'; @@ -61,10 +61,10 @@ export function Miscellaneous() { cooldownBooster === 0 ? undefined : cooldownBooster === 1 - ? '#afb0abc0' - : cooldownBooster === 2 - ? '#5f72cbc0' - : '#9b3cc0c0' + ? '#afb0abc0' + : cooldownBooster === 2 + ? '#5f72cbc0' + : '#9b3cc0c0' } iconStyles={{ transform: 'translate(-50%, -50%) scale(0.8)', diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx index b8b9a1309..f550af9ab 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx @@ -19,7 +19,7 @@ import { TextField, Tooltip, } from '@radix-ui/themes'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; import { Fragment, use, useEffect, useRef, useState } from 'react'; import { lerp } from 'three/src/math/MathUtils'; import { Ad, AdType } from '../../../../../../components/Ad'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Content.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Content.tsx index 264c102c2..20b4a0929 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Content.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Content.tsx @@ -1,5 +1,3 @@ -'use client'; - import { TIER_ROMAN_NUMERALS } from '@blitzkit/core'; import strings from '@blitzkit/core/lang/en-US.json'; import { invalidate } from '@react-three/fiber'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx index 094198b66..71ed692d7 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx @@ -1,6 +1,6 @@ import { StarsInt } from '@blitzkit/core'; import { Flex, Text, TextProps } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { PartialStar } from './components/PartialStar'; type StarsProps = TextProps & { diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/index.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/index.tsx index d975d0387..a79806b4a 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/index.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/index.tsx @@ -1,5 +1,3 @@ -'use client'; - import { formatCompact } from '@blitzkit/core'; import { Flex, Heading, Skeleton, Text } from '@radix-ui/themes'; import { memo } from 'react'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx index ea218c42b..123cd61db 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx @@ -51,8 +51,7 @@ export function MetaSection() { - {assertSecret(process.env.NEXT_PUBLIC_PROMOTE_OPENTEST) === - 'true' && ( + {assertSecret(process.env.PUBLIC_PROMOTE_OPENTEST) === 'true' && ( @@ -134,8 +133,8 @@ export function MetaSection() { protagonist.treeType === 'collector' ? 'blue' : protagonist.treeType === 'premium' - ? 'amber' - : undefined + ? 'amber' + : undefined } > {strings.common.tree_type[protagonist.treeType]} diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/SceneProps.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/SceneProps.tsx index da465f980..9a6a3ed32 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/components/SceneProps.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/components/SceneProps.tsx @@ -1,5 +1,5 @@ import { useFrame, useLoader } from '@react-three/fiber'; -import { clamp } from 'lodash'; +import { clamp } from 'lodash-es'; import { useRef } from 'react'; import { MeshStandardMaterial, TextureLoader } from 'three'; import * as TankopediaPersistent from '../../../../../stores/tankopediaPersistent'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/[id]/page.tsx b/packages/website-legacy/src/app/tools/tankopedia/[id]/page.tsx index 5793a5ee3..e0d1a78fa 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/[id]/page.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/[id]/page.tsx @@ -1,5 +1,3 @@ -'use client'; - import { TIER_ROMAN_NUMERALS } from '@blitzkit/core'; import strings from '@blitzkit/core/lang/en-US.json'; import { invalidate } from '@react-three/fiber'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/components/FilterControl.tsx b/packages/website-legacy/src/app/tools/tankopedia/components/FilterControl.tsx index 2bdb186fb..7aeee58fa 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/components/FilterControl.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/components/FilterControl.tsx @@ -1,5 +1,3 @@ -'use client'; - import { asset, gameDefinitions, @@ -10,7 +8,7 @@ import { import strings from '@blitzkit/core/lang/en-US.json'; import { ReloadIcon } from '@radix-ui/react-icons'; import { Box, Flex, IconButton, Text, Tooltip } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { use } from 'react'; import { classIcons } from '../../../../components/ClassIcon'; import { ExperimentIcon } from '../../../../components/ExperimentIcon'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/components/QuickLink.tsx b/packages/website-legacy/src/app/tools/tankopedia/components/QuickLink.tsx index 36e000abe..6d408f2ad 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/components/QuickLink.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/components/QuickLink.tsx @@ -1,4 +1,4 @@ -import { TankDefinition } from '@blitzkit/core'; +import { type TankDefinition } from '@blitzkit/core'; import { CaretRightIcon } from '@radix-ui/react-icons'; import { Button, Link, TextField } from '@radix-ui/themes'; import * as TankFilters from '../../../../stores/tankFilters'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/components/SearchBar.tsx b/packages/website-legacy/src/app/tools/tankopedia/components/SearchBar.tsx index 04cd2c07d..0472d7a5e 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/components/SearchBar.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/components/SearchBar.tsx @@ -1,7 +1,7 @@ import { TankDefinition } from '@blitzkit/core'; import { MagnifyingGlassIcon } from '@radix-ui/react-icons'; import { Flex, Spinner, TextField } from '@radix-ui/themes'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; import { useRouter } from 'next/navigation'; import { KeyboardEventHandler, useCallback, useRef } from 'react'; import * as TankFilters from '../../../../stores/tankFilters'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/components/TankSearch/index.tsx b/packages/website-legacy/src/app/tools/tankopedia/components/TankSearch/index.tsx index 13dde8be1..0717dd230 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/components/TankSearch/index.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/components/TankSearch/index.tsx @@ -1,5 +1,3 @@ -'use client'; - import { TANK_CLASSES, TankDefinition, @@ -15,7 +13,7 @@ import { } from '@blitzkit/core'; import { Callout, Flex, FlexProps, Link, Text } from '@radix-ui/themes'; import { go } from 'fuzzysort'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { Fragment, memo, use, useEffect, useMemo, useState } from 'react'; import { AdMidSectionResponsive } from '../../../../../components/AdMidSectionResponsive'; import { ExperimentIcon } from '../../../../../components/ExperimentIcon'; diff --git a/packages/website-legacy/src/app/tools/tankopedia/components/TierFilter.tsx b/packages/website-legacy/src/app/tools/tankopedia/components/TierFilter.tsx index 96189e4df..82f25238b 100644 --- a/packages/website-legacy/src/app/tools/tankopedia/components/TierFilter.tsx +++ b/packages/website-legacy/src/app/tools/tankopedia/components/TierFilter.tsx @@ -1,6 +1,6 @@ import { Tier, TIER_ROMAN_NUMERALS } from '@blitzkit/core'; import { Flex, IconButton, Text } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { memo } from 'react'; import * as TankFilters from '../../../../stores/tankFilters'; import * as TankopediaSort from '../../../../stores/tankopediaSort'; diff --git a/packages/website/package.json b/packages/website/package.json index 82f0c0e61..08c09a1b5 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -12,6 +12,8 @@ "@astrojs/check": "^0.9.3", "@astrojs/react": "^3.6.2", "@blitzkit/core": "workspace:*", + "@nanostores/persistent": "^0.10.2", + "@nanostores/react": "^0.7.3", "@radix-ui/react-icons": "^1.3.0", "@radix-ui/themes": "^3.1.3", "@vanilla-extract/css": "^1.15.5", @@ -20,7 +22,8 @@ "nanostores": "^0.11.3", "purgecss": "^6.0.0", "react": "^18.3.1", - "react-dom": "^18.3.1" + "react-dom": "^18.3.1", + "react-promise-suspense": "^0.3.4" }, "devDependencies": { "@vanilla-extract/vite-plugin": "^4.0.15" diff --git a/packages/website/src/components/Ad.tsx b/packages/website/src/components/Ad.tsx index 2168892c0..57921965e 100644 --- a/packages/website/src/components/Ad.tsx +++ b/packages/website/src/components/Ad.tsx @@ -1,8 +1,6 @@ -'use client'; - import { imgur } from '@blitzkit/core'; import { Box, BoxProps, Text } from '@radix-ui/themes'; -import { uniqueId } from 'lodash'; +import { uniqueId } from 'lodash-es'; import { useEffect, useRef } from 'react'; import { Vector2Tuple } from 'three'; diff --git a/packages/website/src/components/Armor/components/ShotDisplay.tsx b/packages/website/src/components/Armor/components/ShotDisplay.tsx index a7d240ccf..2c7e7c92b 100644 --- a/packages/website/src/components/Armor/components/ShotDisplay.tsx +++ b/packages/website/src/components/Armor/components/ShotDisplay.tsx @@ -2,8 +2,8 @@ import { J_HAT, K_HAT } from '@blitzkit/core'; import { Box, Flex, Text } from '@radix-ui/themes'; import { Html } from '@react-three/drei'; import { useFrame } from '@react-three/fiber'; -import { clamp } from 'lodash'; -import { ComponentProps, useEffect, useRef } from 'react'; +import { clamp } from 'lodash-es'; +import { type ComponentProps, useEffect, useRef } from 'react'; import { BufferGeometry, DoubleSide, diff --git a/packages/website/src/components/Armor/components/ShotDisplayCard.tsx b/packages/website/src/components/Armor/components/ShotDisplayCard.tsx index 5b04e564f..544d97d6e 100644 --- a/packages/website/src/components/Armor/components/ShotDisplayCard.tsx +++ b/packages/website/src/components/Armor/components/ShotDisplayCard.tsx @@ -6,7 +6,7 @@ import { Separator, Text, } from '@radix-ui/themes'; -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; import { radToDeg } from 'three/src/math/MathUtils'; import * as TankopediaEphemeral from '../../../../../website-legacy/src/stores/tankopediaEphemeral'; import { shotStatusColors } from './ShotDisplay'; diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx index 7c654e0ae..79b549ef9 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx @@ -1,5 +1,5 @@ import { - ShellType, + type ShellType, isExplosive, resolveNearPenetration, resolvePenetrationCoefficient, @@ -7,7 +7,7 @@ import { import { useThree } from '@react-three/fiber'; import { useCallback } from 'react'; import { - Intersection, + type Intersection, MeshBasicMaterial, Object3D, Plane, @@ -17,11 +17,8 @@ import { Vector3, } from 'three'; import { degToRad } from 'three/src/math/MathUtils'; -import { hasEquipment } from '../../../../../../website-legacy/src/core/blitzkit/hasEquipment'; -import { jsxTree } from '../../../../../../website-legacy/src/core/blitzkit/jsxTree'; -import { discardClippingPlane } from '../../../../../../website-legacy/src/core/three/discardClippingPlane'; -import * as Duel from '../../../../../../website-legacy/src/stores/duel'; -import * as TankopediaEphemeral from '../../../../../../website-legacy/src/stores/tankopediaEphemeral'; +import * as Duel from '../../../../stores/duel'; +import * as TankopediaEphemeral from '../../../../stores/tankopediaEphemeral'; import { ArmorType } from '../SpacedArmorScene'; import { SpacedArmorSubExternal } from './components/SpacedArmorSubExternal'; import { SpacedArmorSubSpaced } from './components/SpacedArmorSubSpaced'; diff --git a/packages/website/src/components/Armor/components/StaticArmorSceneComponent.tsx b/packages/website/src/components/Armor/components/StaticArmorSceneComponent.tsx index 198f70349..6466ee9cf 100644 --- a/packages/website/src/components/Armor/components/StaticArmorSceneComponent.tsx +++ b/packages/website/src/components/Armor/components/StaticArmorSceneComponent.tsx @@ -1,6 +1,6 @@ import { I_HAT, J_HAT } from '@blitzkit/core'; import { MeshProps, useThree } from '@react-three/fiber'; -import { clamp } from 'lodash'; +import { clamp } from 'lodash-es'; import { useEffect, useMemo } from 'react'; import { Box3, diff --git a/packages/website/src/components/BlitzkitButtonGrayIcon.tsx b/packages/website/src/components/BlitzkitButtonGrayIcon.tsx index 3778d78f0..bbf6d0a8e 100644 --- a/packages/website/src/components/BlitzkitButtonGrayIcon.tsx +++ b/packages/website/src/components/BlitzkitButtonGrayIcon.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function BlitzkitButtonGrayIcon(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/ClassIcon/components/ClassHeavy.tsx b/packages/website/src/components/ClassIcon/components/ClassHeavy.tsx index a2da4e599..a21b5badd 100644 --- a/packages/website/src/components/ClassIcon/components/ClassHeavy.tsx +++ b/packages/website/src/components/ClassIcon/components/ClassHeavy.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function ClassHeavy(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/ClassIcon/components/ClassLight.tsx b/packages/website/src/components/ClassIcon/components/ClassLight.tsx index 39c2e6916..9db2a1e79 100644 --- a/packages/website/src/components/ClassIcon/components/ClassLight.tsx +++ b/packages/website/src/components/ClassIcon/components/ClassLight.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function ClassLight(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/ClassIcon/components/ClassMedium.tsx b/packages/website/src/components/ClassIcon/components/ClassMedium.tsx index 1276e3220..a43521887 100644 --- a/packages/website/src/components/ClassIcon/components/ClassMedium.tsx +++ b/packages/website/src/components/ClassIcon/components/ClassMedium.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function ClassMedium(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx b/packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx index b908dce03..900c15e28 100644 --- a/packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx +++ b/packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function ClassTankDestroyer(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/ClassIcon/index.ts b/packages/website/src/components/ClassIcon/index.ts index 5ef1cfdd5..430de4ec5 100644 --- a/packages/website/src/components/ClassIcon/index.ts +++ b/packages/website/src/components/ClassIcon/index.ts @@ -1,5 +1,5 @@ -import { TankClass } from '@blitzkit/core'; -import { ComponentProps, ReactNode } from 'react'; +import { type TankClass } from '@blitzkit/core'; +import type { ComponentProps, ReactNode } from 'react'; import { ClassHeavy } from './components/ClassHeavy'; import { ClassLight } from './components/ClassLight'; import { ClassMedium } from './components/ClassMedium'; diff --git a/packages/website/src/components/CopyButton.tsx b/packages/website/src/components/CopyButton.tsx index 71074c015..1365316ca 100644 --- a/packages/website/src/components/CopyButton.tsx +++ b/packages/website/src/components/CopyButton.tsx @@ -1,4 +1,4 @@ -import { Button, ButtonProps, Tooltip } from '@radix-ui/themes'; +import { Button, type ButtonProps, Tooltip } from '@radix-ui/themes'; import { useState } from 'react'; interface CopyButtonProps extends ButtonProps { diff --git a/packages/website/src/components/DatePicker.tsx b/packages/website/src/components/DatePicker.tsx index 315f14ba9..158727d00 100644 --- a/packages/website/src/components/DatePicker.tsx +++ b/packages/website/src/components/DatePicker.tsx @@ -14,7 +14,7 @@ import { Popover, Text, } from '@radix-ui/themes'; -import { times } from 'lodash'; +import { times } from 'lodash-es'; import { useState } from 'react'; const DAY_TITLES = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; diff --git a/packages/website/src/components/DummyLink.tsx b/packages/website/src/components/DummyLink.tsx index 726a27bde..51dd7ad89 100644 --- a/packages/website/src/components/DummyLink.tsx +++ b/packages/website/src/components/DummyLink.tsx @@ -1,4 +1,4 @@ -import { Link, LinkProps } from '@radix-ui/themes'; +import { Link, type LinkProps } from '@radix-ui/themes'; export function DummyLink({ href = '#', onClick, ...props }: LinkProps) { return ( diff --git a/packages/website/src/components/EquipmentManager.tsx b/packages/website/src/components/EquipmentManager.tsx index 445708f0d..ff3ef35c0 100644 --- a/packages/website/src/components/EquipmentManager.tsx +++ b/packages/website/src/components/EquipmentManager.tsx @@ -1,6 +1,6 @@ import { EquipmentPreset } from '@blitzkit/core'; import { Flex } from '@radix-ui/themes'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { EquipmentMatrix } from '../../../website-legacy/src/stores/duel'; import { EquipmentButton } from './ModuleButtons/EquipmentButton'; diff --git a/packages/website/src/components/ExperimentIcon.tsx b/packages/website/src/components/ExperimentIcon.tsx index f0d2ab841..1af6844b8 100644 --- a/packages/website/src/components/ExperimentIcon.tsx +++ b/packages/website/src/components/ExperimentIcon.tsx @@ -1,4 +1,4 @@ -import { ComponentProps } from 'react'; +import type { ComponentProps } from 'react'; export function ExperimentIcon(props: ComponentProps<'svg'>) { return ( diff --git a/packages/website/src/components/Footer.astro b/packages/website/src/components/Footer.astro new file mode 100644 index 000000000..02885c710 --- /dev/null +++ b/packages/website/src/components/Footer.astro @@ -0,0 +1,158 @@ +--- +import { gameDefinitions } from '@blitzkit/core'; +import { Code, Flex, Heading, Link, Text } from '@radix-ui/themes'; +import packageJson from '../../../../package.json'; + +const awaitedGameDefinitions = await gameDefinitions; +--- + + + + + BlitzKit + Everything World of Tanks Blitz + + Unaffiliated with Wargaming or any service + + + + + + About + + Credits + + Discord + + + GitHub + + Patches + + {/* patreon supporters? */} + + + + + Legal + + + Privacy policy + + + Terms of service + + + Ad settings + + + + + + + + + BlitzKit + WoT Blitz + CDN + + + + + {packageJson.version} + + + {awaitedGameDefinitions.version} + + + {process.env.PUBLIC_ASSET_BRANCH} + + + + + + BlitzKit + + {packageJson.version} + + WoT Blitz + + {awaitedGameDefinitions.version} + + CDN + + {process.env.PUBLIC_ASSET_BRANCH} + + + diff --git a/packages/website/src/components/Footer/components/WoTBVersion.tsx b/packages/website/src/components/Footer/components/WoTBVersion.tsx deleted file mode 100644 index 78d77545c..000000000 --- a/packages/website/src/components/Footer/components/WoTBVersion.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { gameDefinitions } from '@blitzkit/core'; -import { Code } from '@radix-ui/themes'; -import { use } from 'react'; - -export function WoTBVersion() { - const awaitedGameDefinitions = use(gameDefinitions); - - return ( - - {awaitedGameDefinitions.version} - - ); -} diff --git a/packages/website/src/components/Footer/index.css.ts b/packages/website/src/components/Footer/index.css.ts deleted file mode 100644 index eafaf4c11..000000000 --- a/packages/website/src/components/Footer/index.css.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { style } from '@vanilla-extract/css'; - -export const containerInner = style({ - justifyContent: 'space-between', - width: '100%', - maxWidth: 1024, - padding: '0 16px', - - '@media': { - 'screen and (max-width: 640px)': { - justifyContent: 'center', - }, - }, -}); diff --git a/packages/website/src/components/Footer/index.tsx b/packages/website/src/components/Footer/index.tsx deleted file mode 100644 index 723ac9e15..000000000 --- a/packages/website/src/components/Footer/index.tsx +++ /dev/null @@ -1,182 +0,0 @@ -'use client'; - -import { gameDefinitions } from '@blitzkit/core'; -import { Code, Flex, Heading, Text, Theme } from '@radix-ui/themes'; -import { use } from 'react'; -import packageJson from '../../../../../package.json'; -import { Link } from '../Link'; - -export function Footer() { - const awaitedGameDefinitions = use(gameDefinitions); - - return ( - - - - - BlitzKit - Everything World of Tanks Blitz - - Unaffiliated with Wargaming or any service - - - - - - About - - - Credits - - - Discord - - - GitHub - - - Patches - - - {/* patreon supporters? */} - - - - - Legal - - - Privacy policy - - - Terms of service - - - Ad settings - - - - - - - - - - BlitzKit - - - WoT Blitz - - - CDN - - - - - - {packageJson.version} - - - {awaitedGameDefinitions.version} - - - {process.env.NEXT_PUBLIC_ASSET_BRANCH} - - - - - - - BlitzKit - - - {packageJson.version} - - - WoT Blitz - - - {awaitedGameDefinitions.version} - - - CDN - - - {process.env.NEXT_PUBLIC_ASSET_BRANCH} - - - - - ); -} diff --git a/packages/website/src/components/HomeHero.astro b/packages/website/src/components/HomeHero.astro index 26134a38e..73f4db226 100644 --- a/packages/website/src/components/HomeHero.astro +++ b/packages/website/src/components/HomeHero.astro @@ -4,8 +4,8 @@ import { Code, Flex, Heading, Text } from '@radix-ui/themes'; import { BRANCH_NAMES } from '../constants/branches'; const isBranchNamed = - process.env.NEXT_PUBLIC_ASSET_BRANCH && - BRANCH_NAMES[process.env.NEXT_PUBLIC_ASSET_BRANCH]; + process.env.PUBLIC_ASSET_BRANCH && + BRANCH_NAMES[process.env.PUBLIC_ASSET_BRANCH]; ---