build: tsup for better cjs / esm support

discordjs · Sep 2, 2022 · df46ab8 · df46ab8 · vercel · Sep 2, 2022
1 parent b7eb96d
commit df46ab8
Show file tree

Hide file tree

Showing 40 changed files with 762 additions and 1,070 deletions.
diff --git a/build.config.ts b/build.config.ts
diff --git a/package.json b/package.json
@@ -41,13 +41,12 @@
 		"@commitlint/config-angular": "^17.1.0",
 		"@favware/cliff-jumper": "^1.8.7",
 		"@favware/npm-deprecate": "^1.0.5",
-		"@types/is-ci": "^3.0.0",
 		"conventional-changelog-cli": "^2.2.2",
-		"fast-glob": "^3.2.11",
 		"husky": "^8.0.1",
 		"is-ci": "^3.0.1",
 		"lint-staged": "^13.0.3",
-		"turbo": "^1.4.3",
+		"tsup": "^6.2.3",
+		"turbo": "^1.4.4",
 		"typescript": "^4.8.2"
 	},
 	"resolutions": {

diff --git a/packages/actions/build.config.ts b/packages/actions/build.config.ts
diff --git a/packages/actions/package.json b/packages/actions/package.json
@@ -5,7 +5,7 @@
 	"private": true,
 	"scripts": {
 		"test": "vitest run",
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src __tests__ --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src __tests__ --ext mjs,js,ts --fix",
 		"fmt": "yarn format"
@@ -48,9 +48,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
+		"tsup": "^6.2.3",
 		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9",
 		"vitest": "^0.22.1"
 	},
 	"engines": {

diff --git a/packages/actions/tsup.config.js b/packages/actions/tsup.config.js
@@ -0,0 +1,7 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig({
+	entry: ['src/index.ts', 'src/formatTag/index.ts'],
+	format: ['esm'],
+	minify: true,
+});
diff --git a/packages/api-extractor-utils/package.json b/packages/api-extractor-utils/package.json
@@ -4,12 +4,13 @@
 	"description": "Utilities for api-extractor",
 	"private": true,
 	"scripts": {
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src --ext mjs,js,ts --fix",
 		"fmt": "yarn format"
 	},
-	"main": "./dist/index.mjs",
+	"main": "./dist/index.js",
+	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
 	"directories": {
 		"lib": "src"
@@ -38,9 +39,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
-		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9"
+		"tsup": "^6.2.3",
+		"typescript": "^4.8.2"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/api-extractor-utils/tsup.config.js b/packages/api-extractor-utils/tsup.config.js
@@ -0,0 +1,5 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig({
+	minify: true,
+});
diff --git a/packages/builders/build.config.ts b/packages/builders/build.config.ts
diff --git a/packages/builders/package.json b/packages/builders/package.json
@@ -4,7 +4,7 @@
 	"description": "A set of builders that you can use when creating your bot",
 	"scripts": {
 		"test": "vitest run",
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src __tests__ --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src __tests__ --ext mjs,js,ts --fix",
 		"fmt": "yarn format",
@@ -13,12 +13,12 @@
 		"changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/builders/*'",
 		"release": "cliff-jumper"
 	},
-	"main": "./dist/index.cjs",
+	"main": "./dist/index.js",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
 	"exports": {
 		"import": "./dist/index.mjs",
-		"require": "./dist/index.cjs",
+		"require": "./dist/index.js",
 		"types": "./dist/index.d.ts"
 	},
 	"directories": {
@@ -70,9 +70,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
+		"tsup": "^6.2.3",
 		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9",
 		"vitest": "^0.22.1"
 	},
 	"engines": {

diff --git a/packages/builders/tsup.config.js b/packages/builders/tsup.config.js
@@ -0,0 +1,3 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig();
diff --git a/packages/collection/build.config.ts b/packages/collection/build.config.ts
diff --git a/packages/collection/package.json b/packages/collection/package.json
@@ -4,7 +4,7 @@
 	"description": "Utility data structure used in discord.js",
 	"scripts": {
 		"test": "vitest run",
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src __tests__ --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src __tests__ --ext mjs,js,ts --fix",
 		"fmt": "yarn format",
@@ -13,12 +13,12 @@
 		"changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/collection/*'",
 		"release": "cliff-jumper"
 	},
-	"main": "./dist/index.cjs",
+	"main": "./dist/index.js",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
 	"exports": {
 		"import": "./dist/index.mjs",
-		"require": "./dist/index.cjs",
+		"require": "./dist/index.js",
 		"types": "./dist/index.d.ts"
 	},
 	"directories": {
@@ -59,9 +59,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
+		"tsup": "^6.2.3",
 		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9",
 		"vitest": "^0.22.1"
 	},
 	"engines": {

diff --git a/packages/collection/tsup.config.js b/packages/collection/tsup.config.js
@@ -0,0 +1,3 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig();
diff --git a/packages/docgen/build.config.ts b/packages/docgen/build.config.ts
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
@@ -3,15 +3,15 @@
 	"version": "0.12.1",
 	"description": "The docs.json generator for discord.js and its related projects",
 	"scripts": {
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src --ext mjs,js,ts --fix",
 		"fmt": "yarn format",
 		"prepack": "yarn format && yarn build",
 		"changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/docgen/*'",
 		"release": "cliff-jumper"
 	},
-	"bin": "./dist/cli.cjs",
+	"bin": "./dist/cli.js",
 	"directories": {
 		"lib": "src"
 	},
@@ -45,7 +45,7 @@
 		"commander": "^9.4.0",
 		"jsdoc-to-markdown": "^7.1.1",
 		"tslib": "^2.4.0",
-		"typedoc": "^0.23.11"
+		"typedoc": "^0.23.13"
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^1.8.7",
@@ -54,9 +54,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
-		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9"
+		"tsup": "^6.2.3",
+		"typescript": "^4.8.2"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/docgen/tsup.config.js b/packages/docgen/tsup.config.js
@@ -0,0 +1,7 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig({
+	entry: ['src/index.ts', 'src/cli.ts'],
+	minify: true,
+	dts: false,
+});
diff --git a/packages/proxy-container/Dockerfile b/packages/proxy-container/Dockerfile
@@ -15,4 +15,4 @@ RUN yarn workspaces focus
 COPY ./packages/proxy-container ./
 RUN yarn build && yarn workspaces focus --production
 
-CMD ["node", "--enable-source-maps", "./dist/index.mjs"]
+CMD ["node", "--enable-source-maps", "./dist/index.js"]
diff --git a/packages/proxy-container/build.config.ts b/packages/proxy-container/build.config.ts
diff --git a/packages/proxy-container/package.json b/packages/proxy-container/package.json
@@ -3,15 +3,15 @@
 	"version": "1.0.0",
 	"description": "Lightweight HTTP proxy for Discord's API, brought to you as a container 📦",
 	"scripts": {
-		"build": "unbuild",
+		"build": "tsup",
 		"lint": "prettier --check . && TIMING=1 eslint src --ext mjs,js,ts",
 		"format": "prettier --write . && TIMING=1 eslint src --ext mjs,js,ts --fix",
 		"fmt": "yarn format",
 		"prepack": "yarn lint && yarn test && yarn build",
 		"changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/proxy-container/*'"
 	},
-	"main": "./dist/index.mjs",
 	"type": "module",
+	"module": "./dist/index.js",
 	"directories": {
 		"lib": "src"
 	},
@@ -53,9 +53,8 @@
 		"eslint": "^8.23.0",
 		"eslint-config-neon": "^0.1.23",
 		"prettier": "^2.7.1",
-		"rollup-plugin-typescript2": "^0.33.0",
-		"typescript": "^4.8.2",
-		"unbuild": "^0.8.9"
+		"tsup": "^6.2.3",
+		"typescript": "^4.8.2"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/proxy-container/tsup.config.js b/packages/proxy-container/tsup.config.js
@@ -0,0 +1,6 @@
+import { createTsupConfig } from '../../tsup.config.js';
+
+export default createTsupConfig({
+	format: ['esm'],
+	minify: true,
+});
diff --git a/packages/proxy/build.config.ts b/packages/proxy/build.config.ts