diff --git a/packages/bot/src/core/discord/manager.ts b/packages/bot/src/core/discord/manager.ts index 280d1d67d..1e42f4ae7 100644 --- a/packages/bot/src/core/discord/manager.ts +++ b/packages/bot/src/core/discord/manager.ts @@ -2,5 +2,5 @@ import { assertSecret } from '@blitzkit/core'; import { ShardingManager } from 'discord.js'; export const manager = new ShardingManager('dist/bot/workers/bot.js', { - token: assertSecret(process.env.DISCORD_TOKEN), + token: assertSecret(import.meta.env.DISCORD_TOKEN), }); diff --git a/packages/bot/src/events/interactionCreate/index.ts b/packages/bot/src/events/interactionCreate/index.ts index 6b8d84021..0af7d04be 100644 --- a/packages/bot/src/events/interactionCreate/index.ts +++ b/packages/bot/src/events/interactionCreate/index.ts @@ -115,7 +115,7 @@ export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => { ); }); -const rest = new REST().setToken(assertSecret(process.env.DISCORD_TOKEN)); +const rest = new REST().setToken(assertSecret(import.meta.env.DISCORD_TOKEN)); commands.then((awaitedCommands) => { const body = Object.values(awaitedCommands).map((registry) => @@ -123,7 +123,7 @@ commands.then((awaitedCommands) => { ); rest.put( - Routes.applicationCommands(assertSecret(process.env.DISCORD_CLIENT_ID)), + Routes.applicationCommands(assertSecret(import.meta.env.DISCORD_CLIENT_ID)), { body, }, diff --git a/packages/bot/src/workers/bot.ts b/packages/bot/src/workers/bot.ts index 513ad305e..4d19375ef 100644 --- a/packages/bot/src/workers/bot.ts +++ b/packages/bot/src/workers/bot.ts @@ -6,4 +6,4 @@ console.log(`🟡 Launching bot ${client.shard?.ids[0]}`); registerProcesses(); -client.login(assertSecret(process.env.DISCORD_TOKEN)); +client.login(assertSecret(import.meta.env.DISCORD_TOKEN)); diff --git a/packages/core/src/blitz/isValidBlitzId.ts b/packages/core/src/blitz/isValidBlitzId.ts index 89ee96b03..3eab4fed6 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.PUBLIC_WARGAMING_APPLICATION_ID, + import.meta.env.PUBLIC_WARGAMING_APPLICATION_ID, )}${ token === undefined ? '' : `&access_token=${token}` }&fields=account_id%2C-account_id`, diff --git a/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts b/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts index 9da80ed52..6479290d4 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.PUBLIC_ASSET_REPO, + import.meta.env.PUBLIC_ASSET_REPO, )}/git/trees/main`, ).then((response) => response.json())) as GitHubTrees ).tree.find(({ path }) => path === 'regions')!.url; diff --git a/packages/scripts/src/applyPatches.ts b/packages/scripts/src/applyPatches.ts index 34a7eac3a..a4fd58e83 100644 --- a/packages/scripts/src/applyPatches.ts +++ b/packages/scripts/src/applyPatches.ts @@ -1,3 +1,4 @@ +import { assertSecret } from '@blitzkit/core'; import { mkdir, writeFile } from 'fs/promises'; import { parse as parsePath } from 'path'; import ProgressBar from 'progress'; @@ -6,7 +7,6 @@ import { dvp } from '../../../submodules/blitzkit-closed/src/dvp'; import { readStringDVPL } from '../src/core/blitz/readStringDVPL'; import { DATA } from './buildAssets/constants'; import { readYAMLDVPL } from './core/blitz/readYAMLDVPL'; -import { assertSecret } from '@blitzkit/core'; import { writeDVPL } from './core/blitz/writeDVPL'; const versionTextFile = await readStringDVPL(`${DATA}/version.txt.dvpl`); @@ -22,7 +22,7 @@ let patchIndex = 1; while (true) { const response = await fetch( `${assertSecret( - process.env.WOTB_DLC_CDN, + import.meta.env.WOTB_DLC_CDN, )}/dlc/s${currentVersion}_${patchIndex}.yaml`, ); @@ -31,10 +31,10 @@ while (true) { const data = parseYaml(await response.text()); const dvpm = await fetch( - `${assertSecret(process.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`, + `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`, ).then((response) => response.arrayBuffer()); const dvpd = await fetch( - `${assertSecret(process.env.WOTB_DLC_CDN)}/dlc/${data.dx11.replace( + `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11.replace( '.dvpm', '.dvpd', )}`, @@ -63,7 +63,7 @@ while (true) { console.log('Found dynamic content localizations; patching...'); const localizationsResponse = await fetch( - `${assertSecret(process.env.WOTB_DLC_CDN)}/dlc/${ + `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${ data.dynamicContentLocalizationsDir }/en.yaml`, ); diff --git a/packages/scripts/src/buildAssets/currencies.ts b/packages/scripts/src/buildAssets/currencies.ts index 9d47b6837..836ad0903 100644 --- a/packages/scripts/src/buildAssets/currencies.ts +++ b/packages/scripts/src/buildAssets/currencies.ts @@ -35,9 +35,9 @@ export async function currencies() { }), ); - const glossary = await fetch(assertSecret(process.env.WOTB_GLOSSARY)).then( - (response) => response.json() as Promise, - ); + const glossary = await fetch( + assertSecret(import.meta.env.WOTB_GLOSSARY), + ).then((response) => response.json() as Promise); await Promise.all( Object.entries(glossary) diff --git a/packages/scripts/src/buildAssets/definitions.ts b/packages/scripts/src/buildAssets/definitions.ts index fc0dfa2dd..070aef7b8 100644 --- a/packages/scripts/src/buildAssets/definitions.ts +++ b/packages/scripts/src/buildAssets/definitions.ts @@ -514,7 +514,7 @@ export async function definitions() { const wargamingTankopedia = (await fetch( `https://api.wotblitz.com/wotb/encyclopedia/vehicles/?application_id=${assertSecret( - process.env.PUBLIC_WARGAMING_APPLICATION_ID, + import.meta.env.PUBLIC_WARGAMING_APPLICATION_ID, )}&fields=description`, ).then((response) => response.json())) as { data: { [key: number]: { description: null | string } }; diff --git a/packages/scripts/src/core/github/commitAssets.ts b/packages/scripts/src/core/github/commitAssets.ts index 5d28f1dd1..b8594581b 100644 --- a/packages/scripts/src/core/github/commitAssets.ts +++ b/packages/scripts/src/core/github/commitAssets.ts @@ -7,8 +7,8 @@ export async function commitAssets(message: string, changes: FileChange[]) { if (changes.length === 0) return; await commitMultipleFiles( - assertSecret(process.env.PUBLIC_ASSET_REPO), - assertSecret(process.env.PUBLIC_ASSET_BRANCH), + assertSecret(import.meta.env.PUBLIC_ASSET_REPO), + assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH), `${message} - ${new Date().toDateString()}`, changes, ); diff --git a/packages/scripts/src/core/github/octokit.ts b/packages/scripts/src/core/github/octokit.ts index 9078fb23f..8ee0a04e4 100644 --- a/packages/scripts/src/core/github/octokit.ts +++ b/packages/scripts/src/core/github/octokit.ts @@ -5,5 +5,5 @@ import { Octokit } from '@octokit/rest'; Octokit.plugin(throttling); export const octokit = new Octokit({ - auth: assertSecret(process.env.GH_TOKEN), + auth: assertSecret(import.meta.env.GH_TOKEN), });