build: better options for createTsupConfig

sapphiredev · Dec 4, 2023 · 9630bf1 · 9630bf1
1 parent 75f215c
commit 9630bf1
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 52 deletions.
diff --git a/packages/async-queue/tsup.config.ts b/packages/async-queue/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireAsyncQueue' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireAsyncQueue' }
+});
diff --git a/packages/bitfield/tsup.config.ts b/packages/bitfield/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { globalName: 'SapphireBitField' });
+export default createTsupConfig({
+	iifeOptions: { globalName: 'SapphireBitField' }
+});
diff --git a/packages/cron/tsup.config.ts b/packages/cron/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireCron' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireCron' }
+});
diff --git a/packages/decorators/tsup.config.ts b/packages/decorators/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { disabled: true });
+export default createTsupConfig({
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/discord-utilities/tsup.config.ts b/packages/discord-utilities/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { globalName: 'SapphireDiscordUtilities' });
+export default createTsupConfig({
+	iifeOptions: { globalName: 'SapphireDiscordUtilities' }
+});
diff --git a/packages/discord.js-utilities/tsup.config.ts b/packages/discord.js-utilities/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { disabled: true });
+export default createTsupConfig({
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/duration/tsup.config.ts b/packages/duration/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireDuration' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireDuration' }
+});
diff --git a/packages/eslint-config/tsup.config.ts b/packages/eslint-config/tsup.config.ts
@@ -6,4 +6,8 @@ const options: Options = {
 	dts: false
 };
 
-export default createTsupConfig(options, options, { disabled: true });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/eslint-plugin-result/tsup.config.ts b/packages/eslint-plugin-result/tsup.config.ts
@@ -6,4 +6,8 @@ const options: Options = {
 	dts: false
 };
 
-export default createTsupConfig(options, options, { disabled: true });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/event-iterator/tsup.config.ts b/packages/event-iterator/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { disabled: true });
+export default createTsupConfig({
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/fetch/tsup.config.ts b/packages/fetch/tsup.config.ts
@@ -32,4 +32,8 @@ const options: Options = {
 	}
 };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireFetch' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireFetch' }
+});
diff --git a/packages/lexure/tsup.config.ts b/packages/lexure/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { globalName: 'SapphireLexure' });
+export default createTsupConfig({
+	iifeOptions: { globalName: 'SapphireLexure' }
+});
diff --git a/packages/node-utilities/tsup.config.ts b/packages/node-utilities/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { disabled: true });
+export default createTsupConfig({
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/phisherman/tsup.config.ts b/packages/phisherman/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { disabled: true });
+export default createTsupConfig({
+	iifeOptions: { disabled: true }
+});
diff --git a/packages/ratelimits/tsup.config.ts b/packages/ratelimits/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireSnowflake' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireSnowflake' }
+});
diff --git a/packages/result/tsup.config.ts b/packages/result/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { globalName: 'SapphireResult' });
+export default createTsupConfig({
+	iifeOptions: { globalName: 'SapphireResult' }
+});
diff --git a/packages/snowflake/tsup.config.ts b/packages/snowflake/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireSnowflake' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireSnowflake' }
+});
diff --git a/packages/stopwatch/tsup.config.ts b/packages/stopwatch/tsup.config.ts
@@ -1,3 +1,5 @@
 import { createTsupConfig } from '../../scripts/tsup.config';
 
-export default createTsupConfig(undefined, undefined, { globalName: 'SapphireStopwatch' });
+export default createTsupConfig({
+	iifeOptions: { globalName: 'SapphireStopwatch' }
+});
diff --git a/packages/time-utilities/tsup.config.ts b/packages/time-utilities/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireTimeUtilities' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireTimeUtilities' }
+});
diff --git a/packages/timer-manager/tsup.config.ts b/packages/timer-manager/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireTimerManager' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireTimerManager' }
+});
diff --git a/packages/timestamp/tsup.config.ts b/packages/timestamp/tsup.config.ts
@@ -3,4 +3,8 @@ import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = { target: 'es2020' };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireTimestamp' });
+export default createTsupConfig({
+	cjsOptions: options,
+	esmOptions: options,
+	iifeOptions: { ...options, globalName: 'SapphireTimestamp' }
+});
diff --git a/packages/utilities/tsup.config.ts b/packages/utilities/tsup.config.ts
@@ -3,10 +3,18 @@ import { Options } from 'tsup';
 import { createTsupConfig } from '../../scripts/tsup.config';
 
 const options: Options = {
-	target: 'es2019',
+	target: 'es2019'
+};
+
+const cjsAndEsmOptions: Options = {
+	...options,
 	bundle: true,
 	entry: ['src/**/*.ts', '!src/**/*.d.ts'],
 	esbuildPlugins: [esbuildPluginFilePathExtensions()]
 };
 
-export default createTsupConfig(options, options, { ...options, globalName: 'SapphireUtilities' });
+export default createTsupConfig({
+	cjsOptions: cjsAndEsmOptions,
+	esmOptions: cjsAndEsmOptions,
+	iifeOptions: { ...options, globalName: 'SapphireUtilities' }
+});
diff --git a/scripts/tsup.config.ts b/scripts/tsup.config.ts
@@ -14,34 +14,40 @@ const baseOptions: Options = {
 	treeshake: true
 };
 
-export const createTsupConfig = (cjsOptions: Options = {}, esmOptions: Options = cjsOptions, iifeOptions: IifeOptions = cjsOptions) => [
-	defineConfig({
-		...baseOptions,
-		outDir: 'dist/cjs',
-		format: 'cjs',
-		outExtension: () => ({ js: '.cjs' }),
-		...cjsOptions
-	}),
-	defineConfig({
-		...baseOptions,
-		outDir: 'dist/esm',
-		format: 'esm',
-		...esmOptions
-	}),
-	...(iifeOptions.disabled
-		? []
-		: [
-				defineConfig({
-					...baseOptions,
-					dts: false,
-					entry: ['src/index.ts'],
-					outDir: 'dist/iife',
-					format: 'iife',
-					...iifeOptions
-				})
-		  ])
-];
+export function createTsupConfig(options: EnhancedTsupOptions) {
+	return [
+		defineConfig({
+			...baseOptions,
+			outDir: 'dist/cjs',
+			format: 'cjs',
+			outExtension: () => ({ js: '.cjs' }),
+			...options.cjsOptions
+		}),
+		defineConfig({
+			...baseOptions,
+			outDir: 'dist/esm',
+			format: 'esm',
+			...options.esmOptions
+		}),
+		...(options.iifeOptions?.disabled
+			? []
+			: [
+					defineConfig({
+						...baseOptions,
+						dts: false,
+						entry: ['src/index.ts'],
+						outDir: 'dist/iife',
+						format: 'iife',
+						...options.iifeOptions
+					})
+			  ])
+	];
+}
 
-export interface IifeOptions extends Options {
-	disabled?: boolean;
+interface EnhancedTsupOptions {
+	cjsOptions?: Options;
+	esmOptions?: Options;
+	iifeOptions?: Options & {
+		disabled?: boolean;
+	};
 }