fix: improved env loader

Author: twlite

apps/test-bot/src/app.ts

@@ -1,7 +1,5 @@
 import { Client } from 'discord.js';
 
-process.loadEnvFile();
-
 const client = new Client({
   intents: ['Guilds', 'GuildMembers', 'GuildMessages', 'MessageContent'],
 });

packages/commandkit/bin/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import { bootstrapCommandkitCLI } from '../dist/index.mjs';
+import { bootstrapCommandkitCLI } from '../dist/index.js';
 
 await bootstrapCommandkitCLI(process.argv);

packages/commandkit/src/cli/app-process.ts

@@ -9,16 +9,13 @@ export function createAppProcess(
   cwd: string,
   isDev: boolean,
 ) {
-  const envFiles = isDev ? devEnvFileArgs(cwd) : prodEnvFileArgs(cwd);
-
   if (!existsSync(join(cwd, fileName))) {
     panic(`Could not locate the entrypoint file: ${fileName}`);
   }
 
   const ps = spawn(
     'node',
     [
-      ...envFiles,
       `--title="CommandKit ${isDev ? 'Development' : 'Production'}"`,
       '--enable-source-maps',
       fileName,
@@ -27,7 +24,7 @@ export function createAppProcess(
       cwd: cwd,
       windowsHide: true,
       env: DevEnv(),
-      stdio: 'pipe',
+      stdio: ['pipe', 'pipe', 'pipe'],
     },
   );
 

packages/commandkit/src/cli/build.ts

@@ -7,6 +7,7 @@ import {
 import { loadConfigFile } from '../config/loader';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import { devEnvFileArgs, prodEnvFileArgs } from './env';
 
 export interface ApplicationBuildOptions {
   plugins?: CompilerPlugin[];
@@ -80,6 +81,16 @@ export async function buildApplication({
   }
 }
 
+const envScript = (dev: boolean) => `// --- Environment Variables Loader ---
+const $env = [${(dev ? devEnvFileArgs : prodEnvFileArgs).map((p) => `"${p}"`).join(', ')}];
+for (const file of $env) {
+  try {
+    process.loadEnvFile(file);
+    console.log('\\x1b[36m✔ Loaded \\x1b[0m\\x1b[33m%s\\x1b[0m', file);
+  } catch {}
+}
+`;
+
 const requireScript = [
   '// --- CommandKit require() polyfill ---',
   '  if (typeof require === "undefined") {',
@@ -123,15 +134,20 @@ async function injectEntryFile(
   distDir?: string,
 ) {
   const code = `/* Entrypoint File Generated By CommandKit */
-${isDev ? `\n\n// Injected for development\n${wrapInAsyncIIFE([antiCrashScript, requireScript])}\n\n` : ''}
+${isDev ? `\n\n// Injected for development\n${wrapInAsyncIIFE([envScript(isDev), antiCrashScript, requireScript])}\n\n` : wrapInAsyncIIFE([envScript(isDev), requireScript])}
+
 import { CommandKit } from 'commandkit';
 import app from './app.js';
 
-const commandkit = new CommandKit({
-  client: app,
-});
+async function main() {
+  const commandkit = new CommandKit({
+    client: app,
+  });
+
+  await commandkit.start();
+}
 
-await commandkit.start();
+await main();
 `;
 
   const dist = isDev ? '.commandkit' : distDir || 'dist';

packages/commandkit/src/cli/development.ts

@@ -52,7 +52,7 @@ export async function bootstrapDevelopmentServer(configPath?: string) {
         `${colors.cyanBright('Reloading command(s) at ')} ${colors.yellowBright(path)}`,
       );
       await buildAndStart(cwd, true);
-      ps.stdin.write(`COMMANDKIT_EVENT=reload-commands|${path}`);
+      ps.stdin.write(`COMMANDKIT_EVENT=reload-commands|${path}\n`);
       return true;
     }
 
@@ -61,7 +61,7 @@ export async function bootstrapDevelopmentServer(configPath?: string) {
         `${colors.cyanBright('Reloading event(s) at ')} ${colors.yellowBright(path)}`,
       );
       await buildAndStart(cwd, true);
-      ps.stdin.write(`COMMANDKIT_EVENT=reload-events|${path}`);
+      ps.stdin.write(`COMMANDKIT_EVENT=reload-events|${path}\n`);
       return true;
     }
 
@@ -70,7 +70,7 @@ export async function bootstrapDevelopmentServer(configPath?: string) {
         `${colors.cyanBright('Reloading locale(s) at ')} ${colors.yellowBright(path)}`,
       );
       await buildAndStart(cwd, true);
-      ps.stdin.write(`COMMANDKIT_EVENT=reload-locales|${path}`);
+      ps.stdin.write(`COMMANDKIT_EVENT=reload-locales|${path}\n`);
       return true;
     }
 
@@ -97,15 +97,15 @@ export async function bootstrapDevelopmentServer(configPath?: string) {
         break;
       case 'rc':
         console.log(`Received reload commands command, reloading...`);
-        ps?.stdin.write(`COMMANDKIT_EVENT=reload-commands`);
+        ps?.stdin.write(`COMMANDKIT_EVENT=reload-commands\n`);
         break;
       case 're':
         console.log(`Received reload events command, reloading...`);
-        ps?.stdin.write(`COMMANDKIT_EVENT=reload-events`);
+        ps?.stdin.write(`COMMANDKIT_EVENT=reload-events\n`);
         break;
       case 'rl':
         console.log(`Received reload locales command, reloading...`);
-        ps?.stdin.write(`COMMANDKIT_EVENT=reload-locales`);
+        ps?.stdin.write(`COMMANDKIT_EVENT=reload-locales\n`);
         break;
     }
   });

packages/commandkit/src/cli/env.ts

@@ -26,12 +26,6 @@ export const ProdEnvFiles = [
   '.env.local',
 ];
 
-export const devEnvFileArgs = (cwd: string) =>
-  [...CommonEnvFiles, ...DevEnvFiles].map(
-    (file) => `--env-file-if-exists="${join(cwd, file)}"`,
-  );
+export const devEnvFileArgs = [...CommonEnvFiles, ...DevEnvFiles];
 
-export const prodEnvFileArgs = (cwd: string) =>
-  [...CommonEnvFiles, ...ProdEnvFiles].map(
-    (file) => `--env-file-if-exists=${join(cwd, file)}`,
-  );
+export const prodEnvFileArgs = [...CommonEnvFiles, ...ProdEnvFiles];

packages/commandkit/src/plugins/runtime/CommandKitPluginRuntime.ts

@@ -18,8 +18,7 @@ export class CommandKitPluginRuntime extends EventTarget {
 
   public constructor(public readonly commandkit: CommandKit) {
     super();
-
-    this.commandkit.client.on(Events.ClientReady, this.onClientLogin);
+    // this.commandkit.client.on(Events.ClientReady, this.onClientLogin);
   }
 
   public getPlugin(pluginName: string): RuntimePlugin | null {

packages/commandkit/src/plugins/runtime/builtin/MacroPlugin.ts

@@ -1,4 +1,3 @@
-import { MacroTransformer } from 'use-macro';
 import {
   CompilerPlugin,
   MaybeFalsey,
@@ -9,10 +8,11 @@ import {
 export class MacroPlugin extends CompilerPlugin {
   public readonly name = 'MacroPlugin';
 
-  private macroTransformer!: MacroTransformer;
+  private macroTransformer!: import('use-macro').MacroTransformer;
 
   public async activate(): Promise<void> {
-    this.macroTransformer = new MacroTransformer();
+    const transform = await import('use-macro');
+    this.macroTransformer = new transform.MacroTransformer();
   }
 
   public async deactivate(): Promise<void> {

packages/commandkit/src/utils/dev-hooks.ts

@@ -11,19 +11,11 @@ export function registerDevHooks(commandkit: CommandKit) {
     const input = chunk.toString().trim();
 
     const match = input.match(EVENT_PATTERN);
-
-    console.log({ match });
-
     if (!match) return;
 
     const [, event, , path] = match;
-
-    void path;
-
     Logger.info(`Received HMR event: ${event}${path ? ` for ${path}` : ''}`);
 
-    // TODO: Implement reload logic
-
     switch (event) {
       case 'reload-commands':
         commandkit.commandHandler.reloadCommands();
@@ -33,6 +25,7 @@ export function registerDevHooks(commandkit: CommandKit) {
         break;
       case 'reload-locales':
         commandkit.commandHandler.reloadCommands();
+        break;
     }
   });
 }

packages/commandkit/tsup.config.ts

@@ -2,8 +2,8 @@ import { defineConfig } from 'tsup';
 import { esbuildPluginUseMacro } from 'use-macro';
 
 export default defineConfig({
-  format: ['cjs', 'esm'],
-  entry: ['src'],
+  format: ['cjs'],
+  entry: ['src/index.ts'],
   outDir: './dist',
   sourcemap: true,
   watch: false,
@@ -14,5 +14,6 @@ export default defineConfig({
   skipNodeModulesBundle: true,
   clean: true,
   target: 'node16',
+  // @ts-ignore
   esbuildPlugins: [esbuildPluginUseMacro()],
 });