diff --git a/packages/commandkit/spec/cache.test.ts b/packages/commandkit/spec/cache.test.ts index 5d830e45..ca53b851 100644 --- a/packages/commandkit/spec/cache.test.ts +++ b/packages/commandkit/spec/cache.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import { afterAll, beforeAll, describe, expect, test } from 'vitest'; import { cache, diff --git a/packages/commandkit/src/analytics/analytics-engine.ts b/packages/commandkit/src/analytics/analytics-engine.ts index 7d67f723..dc5de5f0 100644 --- a/packages/commandkit/src/analytics/analytics-engine.ts +++ b/packages/commandkit/src/analytics/analytics-engine.ts @@ -1,4 +1,4 @@ -import { CommandKit } from '../CommandKit'; +import { CommandKit } from '../commandkit'; import { Logger } from '../logger/Logger'; import { warnUnstable } from '../utils/warn-unstable'; import { diff --git a/packages/commandkit/src/app/commands/Context.ts b/packages/commandkit/src/app/commands/Context.ts index 7862d1c6..6d75744a 100644 --- a/packages/commandkit/src/app/commands/Context.ts +++ b/packages/commandkit/src/app/commands/Context.ts @@ -11,7 +11,7 @@ import { Guild, TextBasedChannel, } from 'discord.js'; -import { CommandKit } from '../../CommandKit'; +import { CommandKit } from '../../commandkit'; import { MessageCommandOptions, MessageCommandParser, diff --git a/packages/commandkit/src/app/events/EventWorkerContext.ts b/packages/commandkit/src/app/events/EventWorkerContext.ts index 8d452029..8ec6e437 100644 --- a/packages/commandkit/src/app/events/EventWorkerContext.ts +++ b/packages/commandkit/src/app/events/EventWorkerContext.ts @@ -1,6 +1,6 @@ import { AsyncLocalStorage } from 'node:async_hooks'; import { ParsedEvent } from '../router'; -import { CommandKit } from '../../CommandKit'; +import { CommandKit } from '../../commandkit'; /** * Context object containing information about the currently executing event. diff --git a/packages/commandkit/src/app/handlers/AppCommandHandler.ts b/packages/commandkit/src/app/handlers/AppCommandHandler.ts index a7983add..620067e9 100644 --- a/packages/commandkit/src/app/handlers/AppCommandHandler.ts +++ b/packages/commandkit/src/app/handlers/AppCommandHandler.ts @@ -10,7 +10,7 @@ import { Message, SlashCommandBuilder, } from 'discord.js'; -import type { CommandKit } from '../../CommandKit'; +import type { CommandKit } from '../../commandkit'; import { AsyncFunction, GenericFunction } from '../../context/async-context'; import { Logger } from '../../logger/Logger'; import type { CommandData } from '../../types'; diff --git a/packages/commandkit/src/app/handlers/AppEventsHandler.ts b/packages/commandkit/src/app/handlers/AppEventsHandler.ts index e647bc3b..4e350ca2 100644 --- a/packages/commandkit/src/app/handlers/AppEventsHandler.ts +++ b/packages/commandkit/src/app/handlers/AppEventsHandler.ts @@ -1,5 +1,5 @@ import { Collection } from 'discord.js'; -import { CommandKit } from '../../CommandKit'; +import { CommandKit } from '../../commandkit'; import { ListenerFunction } from '../../events/CommandKitEventsChannel'; import { Logger } from '../../logger/Logger'; import { toFileURL } from '../../utils/resolve-file-url'; diff --git a/packages/commandkit/src/app/register/CommandRegistrar.ts b/packages/commandkit/src/app/register/CommandRegistrar.ts index e43bb6b5..2ed10562 100644 --- a/packages/commandkit/src/app/register/CommandRegistrar.ts +++ b/packages/commandkit/src/app/register/CommandRegistrar.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, REST, Routes } from 'discord.js'; -import { CommandKit } from '../../CommandKit'; +import { CommandKit } from '../../commandkit'; import { CommandData } from '../../types'; import { Logger } from '../../logger/Logger'; diff --git a/packages/commandkit/src/cli/build.ts b/packages/commandkit/src/cli/build.ts index ed2fed0d..ebb6bf48 100644 --- a/packages/commandkit/src/cli/build.ts +++ b/packages/commandkit/src/cli/build.ts @@ -26,7 +26,7 @@ export interface ApplicationBuildOptions { * @private * @internal */ -function mergeDefinitionsIfNeeded(env: Record) { +function mergeDefinitionsIfNeeded(env: Record, isDev: boolean) { const values = Object.fromEntries( Object.entries(process.env).filter( ([k]) => !(k in env) && k.startsWith('COMMANDKIT_PUBLIC_'), @@ -36,6 +36,19 @@ function mergeDefinitionsIfNeeded(env: Record) { return { ...env, ...values, + ...(isDev + ? { + NODE_ENV: 'development', + COMMANDKIT_BOOTSTRAP_MODE: 'development', + COMMANDKIT_IS_DEV: 'true', + COMMANDKIT_IS_TEST: 'false', + } + : { + NODE_ENV: 'production', + COMMANDKIT_BOOTSTRAP_MODE: 'production', + COMMANDKIT_IS_DEV: 'false', + COMMANDKIT_IS_TEST: 'false', + }), }; } @@ -110,7 +123,7 @@ export async function buildApplication({ sourcemap: true, target: 'node16', outDir: dest, - env: mergeDefinitionsIfNeeded(config.env || {}), + env: mergeDefinitionsIfNeeded(config.env || {}, !!isDev), entry: [ 'src', `!${config.distDir}`, diff --git a/packages/commandkit/src/CommandKit.ts b/packages/commandkit/src/commandkit.ts similarity index 100% rename from packages/commandkit/src/CommandKit.ts rename to packages/commandkit/src/commandkit.ts diff --git a/packages/commandkit/src/context/async-context.ts b/packages/commandkit/src/context/async-context.ts index e13f2729..3d8d113f 100644 --- a/packages/commandkit/src/context/async-context.ts +++ b/packages/commandkit/src/context/async-context.ts @@ -1,6 +1,6 @@ import { AsyncLocalStorage } from 'node:async_hooks'; import { CommandKitEnvironment } from './environment'; -import { CommandKit } from '../CommandKit'; +import { CommandKit } from '../commandkit'; import { isCommandKitError } from '../utils/error-codes'; const kCommandWorker = Symbol('commandkitCommandWorker'); diff --git a/packages/commandkit/src/context/environment.ts b/packages/commandkit/src/context/environment.ts index b8e82bba..b4155891 100644 --- a/packages/commandkit/src/context/environment.ts +++ b/packages/commandkit/src/context/environment.ts @@ -1,5 +1,5 @@ import { randomUUID } from 'node:crypto'; -import { CommandKit } from '../CommandKit'; +import { CommandKit } from '../commandkit'; import { GenericFunction, getContext } from './async-context'; import type { Context } from '../app'; diff --git a/packages/commandkit/src/events/CommandKitEventsChannel.ts b/packages/commandkit/src/events/CommandKitEventsChannel.ts index 506b7c6d..91adf14b 100644 --- a/packages/commandkit/src/events/CommandKitEventsChannel.ts +++ b/packages/commandkit/src/events/CommandKitEventsChannel.ts @@ -1,5 +1,5 @@ import EventEmitter from 'node:events'; -import type { CommandKit } from '../CommandKit'; +import type { CommandKit } from '../commandkit'; import type { AsyncFunction, GenericFunction } from '../context/async-context'; /** diff --git a/packages/commandkit/src/flags/feature-flags.ts b/packages/commandkit/src/flags/feature-flags.ts index 172c95c7..3291fee5 100644 --- a/packages/commandkit/src/flags/feature-flags.ts +++ b/packages/commandkit/src/flags/feature-flags.ts @@ -1,7 +1,7 @@ import { getCommandKit, getContext } from '../context/async-context'; import { eventWorkerContext } from '../app/events/EventWorkerContext'; import { ParsedEvent } from '../app/router'; -import { CommandKit } from '../CommandKit'; +import { CommandKit } from '../commandkit'; import { AutocompleteInteraction, ChatInputCommandInteraction, diff --git a/packages/commandkit/src/index.ts b/packages/commandkit/src/index.ts index 7278a13f..0beeab76 100644 --- a/packages/commandkit/src/index.ts +++ b/packages/commandkit/src/index.ts @@ -1,8 +1,8 @@ -import { CommandKit } from './CommandKit'; +import { CommandKit } from './commandkit'; export default CommandKit; -export * from './CommandKit'; +export * from './commandkit'; export * from './components'; export * from './config/config'; export * from './context/async-context'; diff --git a/packages/commandkit/src/plugins/plugin-runtime/CommandKitPluginRuntime.ts b/packages/commandkit/src/plugins/plugin-runtime/CommandKitPluginRuntime.ts index 6abf1a1d..34d315ff 100644 --- a/packages/commandkit/src/plugins/plugin-runtime/CommandKitPluginRuntime.ts +++ b/packages/commandkit/src/plugins/plugin-runtime/CommandKitPluginRuntime.ts @@ -1,5 +1,5 @@ import { Collection, Constructable } from 'discord.js'; -import { CommandKit } from '../../CommandKit'; +import { CommandKit } from '../../commandkit'; import { RuntimePlugin } from '../RuntimePlugin'; import { CommandKitErrorCodes, diff --git a/packages/commandkit/src/types.ts b/packages/commandkit/src/types.ts index 0d7610e7..d192d5f3 100644 --- a/packages/commandkit/src/types.ts +++ b/packages/commandkit/src/types.ts @@ -4,7 +4,7 @@ import { Interaction, RESTPostAPIApplicationCommandsJSONBody, } from 'discord.js'; -import type { CommandKit } from './CommandKit'; +import type { CommandKit } from './commandkit'; type Prettify = { [K in keyof T]: T[K]; diff --git a/packages/commandkit/src/utils/dev-hooks.ts b/packages/commandkit/src/utils/dev-hooks.ts index 2e54aaf6..fe107136 100644 --- a/packages/commandkit/src/utils/dev-hooks.ts +++ b/packages/commandkit/src/utils/dev-hooks.ts @@ -1,4 +1,4 @@ -import type { CommandKit } from '../CommandKit'; +import type { CommandKit } from '../commandkit'; import { Logger } from '../logger/Logger'; import { COMMANDKIT_IS_DEV, HMREventType } from './constants';