Merge pull request #205 from underctrl-io/rolldown

feat!: use rolldown based bundler

Author: twlite

packages/commandkit/package.json

@@ -64,7 +64,7 @@
   "scripts": {
     "lint": "tsc --noEmit",
     "dev": "pnpm run --filter=test-bot dev",
-    "build": "tsup",
+    "build": "tsdown",
     "publish-package": "npm publish",
     "test": "vitest"
   },
@@ -80,6 +80,7 @@
     "event handler"
   ],
   "dependencies": {
+    "@rollup/plugin-json": "^6.1.0",
     "chokidar": "^4.0.3",
     "commander": "^13.0.0",
     "directive-to-hof": "^0.0.2",
@@ -89,7 +90,7 @@
     "picocolors": "^1.1.1",
     "rfdc": "^1.3.1",
     "rimraf": "^6.0.0",
-    "tsup": "^8.4.0",
+    "tsdown": "^0.12.4",
     "use-macro": "^1.1.0"
   },
   "devDependencies": {

packages/commandkit/src/CommandKit.ts

@@ -74,6 +74,7 @@ export function onApplicationBootstrap<F extends BootstrapFunction>(
 
 export class CommandKit extends EventEmitter {
   #started = false;
+  private options: CommandKitOptions;
   public eventInterceptor!: EventInterceptor;
 
   public static readonly createElement = createElement;
@@ -89,10 +90,10 @@ export class CommandKit extends EventEmitter {
 
   public commandsRouter!: CommandsRouter;
   public eventsRouter!: EventsRouter;
-  public readonly commandHandler = new AppCommandHandler(this);
-  public readonly eventHandler = new AppEventsHandler(this);
-  public readonly plugins: CommandKitPluginRuntime;
-  public readonly events = new CommandKitEventsChannel(this);
+  public commandHandler!: AppCommandHandler;
+  public eventHandler!: AppEventsHandler;
+  public plugins!: CommandKitPluginRuntime;
+  public events!: CommandKitEventsChannel;
 
   static instance: CommandKit | undefined = undefined;
 
@@ -102,7 +103,7 @@ export class CommandKit extends EventEmitter {
    * @param options - The default CommandKit configuration.
    * @see {@link https://commandkit.js.org/docs/guide/commandkit-setup}
    */
-  constructor(private readonly options: CommandKitOptions) {
+  constructor(options: CommandKitOptions) {
     if (CommandKit.instance) {
       process.emitWarning(
         'CommandKit instance already exists. Having multiple instance in same project is discouraged and it may lead to unexpected behavior.',
@@ -120,12 +121,14 @@ export class CommandKit extends EventEmitter {
 
     super();
 
-    this.plugins = new CommandKitPluginRuntime(this);
+    this.options = options;
 
     if (!CommandKit.instance) {
       CommandKit.instance = this;
     }
 
+    this.plugins = new CommandKitPluginRuntime(this);
+
     // @ts-ignore
     commandkit = CommandKit.instance;
 
@@ -280,6 +283,10 @@ export class CommandKit extends EventEmitter {
     const commandsPath = this.getPath('commands')!;
     const events = this.getPath('events')!;
 
+    this.commandHandler = new AppCommandHandler(this);
+    this.eventHandler = new AppEventsHandler(this);
+    this.events = new CommandKitEventsChannel(this);
+
     this.commandsRouter = new CommandsRouter({
       entrypoint: commandsPath,
     });

packages/commandkit/src/cli/build.ts

@@ -1,9 +1,5 @@
-import { build } from 'tsup';
-import {
-  CompilerPlugin,
-  CompilerPluginRuntime,
-  fromEsbuildPlugin,
-} from '../plugins';
+import { build } from 'tsdown';
+import { CompilerPlugin, CompilerPluginRuntime } from '../plugins';
 import { loadConfigFile } from '../config/loader';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -15,14 +11,14 @@ import { MaybeArray } from '../components';
 
 export interface ApplicationBuildOptions {
   plugins?: MaybeArray<CompilerPlugin>[] | Array<CompilerPlugin>;
-  esbuildPlugins?: any[];
+  rolldownPlugins?: any[];
   isDev?: boolean;
   configPath?: string;
 }
 
 export async function buildApplication({
   plugins,
-  esbuildPlugins,
+  rolldownPlugins,
   isDev,
   configPath,
 }: ApplicationBuildOptions) {
@@ -35,45 +31,40 @@ export async function buildApplication({
   const pluginRuntime = new CompilerPluginRuntime(
     (plugins || []) as CompilerPlugin[],
   );
-  const esbuildPluginList: any[] = pluginRuntime.isEmpty()
-    ? []
-    : [pluginRuntime.toEsbuildPlugin()];
 
-  if (esbuildPlugins?.length) {
-    esbuildPluginList.push(...esbuildPlugins.map(fromEsbuildPlugin));
-  }
+  rolldownPlugins ??= [];
+
+  rolldownPlugins.push(pluginRuntime.toJSON());
 
   try {
     const dest = isDev ? '.commandkit' : config.distDir;
 
     // Clean the destination directory
     await rimraf(dest);
 
+    await pluginRuntime.init();
+
     await build({
-      esbuildPlugins: esbuildPluginList,
       watch: false,
-      banner: {
-        js: !isDev
-          ? '/* Optimized production build generated by commandkit */'
-          : '',
-      },
-      cjsInterop: true,
       dts: false,
       clean: true,
       format: ['esm'],
       shims: true,
-      keepNames: true,
       minify: false,
-      esbuildOptions: (options) => {
-        options.jsx = 'automatic';
-        options.jsxImportSource = 'commandkit';
-
-        return options;
-      },
-      minifyIdentifiers: false,
-      minifySyntax: false,
       silent: !!isDev,
-      splitting: true,
+      inputOptions: {
+        transform: {
+          jsx: {
+            runtime: 'automatic',
+            importSource: 'commandkit',
+          },
+        },
+        moduleTypes: {
+          '.json': 'js',
+        },
+      },
+      plugins: rolldownPlugins,
+      platform: 'node',
       skipNodeModulesBundle: true,
       name: 'CommandKit',
       sourcemap: true,
@@ -87,6 +78,7 @@ export async function buildApplication({
         '!**/*.test.*',
         '!**/*.spec.*',
       ],
+      unbundle: false,
     });
 
     await copyLocaleFiles('src', dest);
@@ -99,7 +91,7 @@ export async function buildApplication({
     process.exit(1); // Force exit on error
   } finally {
     // Ensure plugins are cleaned up
-    await pluginRuntime.cleanup();
+    await pluginRuntime.destroy();
   }
 }
 
@@ -113,23 +105,6 @@ for (const file of $env) {
 }
 `;
 
-const requireScript = [
-  '// --- CommandKit require() polyfill ---',
-  '  if (typeof require === "undefined") {',
-  '    const { createRequire } = await import("node:module");',
-  '    const __require = createRequire(import.meta.url);',
-  '    Object.defineProperty(globalThis, "require", {',
-  '      value: (id) => {',
-  '        return __require(id);',
-  '      },',
-  '      configurable: true,',
-  '      enumerable: false,',
-  '      writable: true,',
-  '    });',
-  '  }',
-  '// --- CommandKit require() polyfill ---',
-].join('\n');
-
 const antiCrashScript = [
   '// --- CommandKit Anti-Crash Monitor ---',
   "  // 'uncaughtException' event is supposed to be used to perform synchronous cleanup before shutting down the process",
@@ -156,7 +131,7 @@ async function injectEntryFile(
   distDir?: string,
 ) {
   const code = `/* Entrypoint File Generated By CommandKit */
-${isDev ? `\n\n// Injected for development\n${wrapInAsyncIIFE([envScript(isDev), antiCrashScript, requireScript])}\n\n` : wrapInAsyncIIFE([envScript(isDev), requireScript])}
+${isDev ? `\n\n// Injected for development\n${wrapInAsyncIIFE([envScript(isDev), antiCrashScript])}\n\n` : wrapInAsyncIIFE([envScript(isDev)])}
 
 import { CommandKit } from 'commandkit';
 

packages/commandkit/src/cli/development.ts

@@ -20,7 +20,7 @@ async function buildAndStart(configPath: string, skipStart = false) {
     configPath,
     isDev: true,
     plugins: config.plugins.flat(2).filter((p) => isCompilerPlugin(p)),
-    esbuildPlugins: config.esbuildPlugins,
+    rolldownPlugins: config.rolldownPlugins,
   });
 
   if (skipStart) return null as never;

packages/commandkit/src/cli/production.ts

@@ -39,7 +39,7 @@ export async function createProductionBuild(configPath?: string) {
     plugins: config.plugins.filter((p) =>
       isCompilerPlugin(p),
     ) as CompilerPlugin[],
-    esbuildPlugins: config.esbuildPlugins,
+    rolldownPlugins: config.rolldownPlugins,
   });
 
   spinner.succeed('Production build completed!');

packages/commandkit/src/config/config.ts

@@ -37,9 +37,9 @@ export function defineConfig(
       ...defaultConfig.env,
       ...config.env,
     },
-    esbuildPlugins: [
-      ...(config.esbuildPlugins ?? []),
-      ...(defaultConfig.esbuildPlugins ?? []),
+    rolldownPlugins: [
+      ...(config.rolldownPlugins ?? []),
+      ...(defaultConfig.rolldownPlugins ?? []),
     ],
     plugins: [...(config.plugins ?? []), ...(defaultConfig.plugins ?? [])].flat(
       Infinity,

packages/commandkit/src/config/default.ts

@@ -1,9 +1,10 @@
 import { MacroPlugin } from '../plugins/plugin-runtime/builtin/MacroPlugin';
 import { ResolvedCommandKitConfig } from './utils';
+import json from '@rollup/plugin-json';
 
 export const defaultConfig: ResolvedCommandKitConfig = {
   plugins: [new MacroPlugin({ enabled: true })],
-  esbuildPlugins: [],
+  rolldownPlugins: [json() as any],
   compilerOptions: {
     macro: {
       development: false,

packages/commandkit/src/config/types.ts

@@ -8,9 +8,9 @@ export interface CommandKitConfig {
    */
   plugins?: MaybeArray<CommandKitPlugin>[] | Array<CommandKitPlugin>;
   /**
-   * The esbuild plugins to use with CommandKit.
+   * The rolldown plugins to use with CommandKit.
    */
-  esbuildPlugins?: any[];
+  rolldownPlugins?: any[];
   /**
    * The compiler options to use with CommandKit.
    */

packages/commandkit/src/flags/feature-flags.ts

@@ -8,13 +8,11 @@ import {
   Client,
   ClientEvents,
   ContextMenuCommandInteraction,
-  Events,
   Guild,
   Message,
   TextBasedChannel,
 } from 'discord.js';
 import { LoadedCommand } from '../app';
-import { FlagStore } from './store';
 
 export type MaybePromise<T> = T | Promise<T>;
 

packages/commandkit/src/plugins/CompilerPlugin.ts

@@ -1,9 +1,4 @@
-import {
-  Loader,
-  OnLoadArgs,
-  OnResolveArgs,
-  OnResolveResult,
-} from './plugin-runtime/types';
+import { OnResolveArgs } from './plugin-runtime/types';
 import {
   isPlugin,
   PluginCommon,
@@ -14,20 +9,13 @@ import { MaybeFalsey } from './types';
 import { CompilerPluginRuntime } from './plugin-runtime/CompilerPluginRuntime';
 
 export interface PluginTransformParameters {
-  args: OnLoadArgs;
-  path: string;
-  contents: string | Uint8Array;
-  loader?: Loader;
+  code: string;
+  id: string;
 }
 
 export interface TransformedResult {
-  contents?: string | Uint8Array;
-  loader?: Loader;
-}
-
-export interface ResolveResult {
-  path?: string;
-  external?: boolean;
+  code?: string;
+  map?: string | null;
 }
 
 export abstract class CompilerPlugin<
@@ -45,27 +33,6 @@ export abstract class CompilerPlugin<
   ): Promise<MaybeFalsey<TransformedResult>> {
     return null;
   }
-
-  /**
-   * Called when a resolve is requested to this plugin
-   * @param args The arguments for the resolve
-   * @returns The resolved result
-   */
-  public async resolve(
-    args: OnResolveArgs,
-  ): Promise<MaybeFalsey<ResolveResult>> {
-    return null;
-  }
-
-  /**
-   * Called when a build is started
-   */
-  public async onBuildStart(): Promise<void> {}
-
-  /**
-   * Called when a build is ended
-   */
-  public async onBuildEnd(): Promise<void> {}
 }
 
 export function isCompilerPlugin(plugin: unknown): plugin is CompilerPlugin {