feat(refactor): Unify tsup configs, gulp -> tsup (#288)

Author: rossbulat

builder/src/builders/common/simpleBuild.ts

@@ -10,15 +10,11 @@ import {
 import { exec } from 'child_process'
 import { PACKAGE_OUTPUT } from 'consts'
 import { promises as fs } from 'fs'
-import type { Bundler } from 'types'
 import { promisify } from 'util'
 
 const execPromisify = promisify(exec)
 
-export const simpleBuild = async (
-  packageName: string,
-  { bundler }: { bundler: Bundler | null }
-) => {
+export const simpleBuild = async (packageName: string) => {
   const libDirectory = gePackageDirectory(packageName)
   // Validate package config
   try {
@@ -35,8 +31,7 @@ export const simpleBuild = async (
     if (
       !(await generatePackageJson(
         libDirectory,
-        `${libDirectory}/${PACKAGE_OUTPUT}`,
-        bundler
+        `${libDirectory}/${PACKAGE_OUTPUT}`
       ))
     ) {
       throw `Failed to generate package.json file.`

builder/src/builders/extension-assets/index.ts

@@ -57,7 +57,7 @@ export const build = async () => {
     }
 
     // Generate package.json.
-    if (!(await generatePackageJson('.', `${PACKAGE_OUTPUT}`, null))) {
+    if (!(await generatePackageJson('.', `${PACKAGE_OUTPUT}`))) {
       throw `Failed to generate package.json file.`
     }
 

builder/src/builders/util.ts

@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-only */
 import { PACKAGE_OUTPUT, TEMP_BUILD_OUTPUT } from 'consts'
 import fs from 'fs/promises'
 import { dirname, join } from 'path'
-import type { Bundler } from 'types'
 import { fileURLToPath } from 'url'
 
 // Gets workspace directory from the current directory
@@ -87,15 +86,7 @@ export const getTemplate = async (name: string) => {
 // Generate package package.json file from source package.json
 export const generatePackageJson = async (
   inputDir: string,
-  outputDir: string,
-  bundler: Bundler | null,
-  additionalExports: Record<
-    string,
-    {
-      import: string
-      require: string
-    }
-  > = {}
+  outputDir: string
 ): Promise<boolean> => {
   try {
     // Read the original package.json.
@@ -120,22 +111,17 @@ export const generatePackageJson = async (
 
     // Attempt to get exports and bundler info
     let pkgConfig
-    let configBundler = bundler // Use the passed bundler as fallback
     try {
       pkgConfig = JSON.parse(
         await fs.readFile(join(inputDir, 'pkg.config.json'), 'utf8')
       )
-      // If bundler info is available in config, use it (unless explicitly overridden)
-      if ('bundler' in pkgConfig && bundler === null) {
-        configBundler = pkgConfig.bundler
-      }
     } catch (e) {
       // Silently fail getting exports
     }
 
     // Construct the minimal package.json object
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let minimalPackageJson: any = {
+    const minimalPackageJson: any = {
       name: packageName,
       version,
       license,
@@ -159,33 +145,9 @@ export const generatePackageJson = async (
       minimalPackageJson.bugs = bugs
     }
 
-    if (configBundler === 'gulp') {
-      minimalPackageJson = {
-        ...minimalPackageJson,
-        exports: pkgConfig?.exports || {
-          '.': {
-            import: './mjs/index.js',
-            require: './cjs/index.js',
-          },
-          ...additionalExports,
-        },
-      }
-    } else if (configBundler === 'tsup') {
-      minimalPackageJson = {
-        ...minimalPackageJson,
-        exports: pkgConfig?.exports || {
-          '.': {
-            import: './index.js',
-            require: './index.cjs',
-          },
-          ...additionalExports,
-        },
-      }
-    } else {
-      // For custom bundlers, null, or any other case, include exports if provided
-      if (pkgConfig?.exports) {
-        minimalPackageJson.exports = pkgConfig.exports
-      }
+    // Include package exports if provided
+    if (pkgConfig?.exports) {
+      minimalPackageJson.exports = pkgConfig.exports
     }
 
     if (dependencies) {
@@ -194,6 +156,7 @@ export const generatePackageJson = async (
     if (peerDependencies) {
       minimalPackageJson['peerDependencies'] = peerDependencies
     }
+
     if (pkgConfig?.peerDependencies) {
       minimalPackageJson['peerDependencies'] = {
         ...minimalPackageJson['peerDependencies'],

builder/src/index.ts

@@ -14,7 +14,7 @@ const { t: task } = args
 
 switch (task) {
   case 'crypto':
-    await simpleBuild('crypto', { bundler: 'tsup' })
+    await simpleBuild('crypto')
     break
 
   case 'directory':
@@ -30,39 +30,39 @@ switch (task) {
     break
 
   case 'factories':
-    await simpleBuild('factories', { bundler: 'gulp' })
+    await simpleBuild('factories')
     break
 
   case 'hooks':
-    await simpleBuild('hooks', { bundler: 'gulp' })
+    await simpleBuild('hooks')
     break
 
   case 'observables-connect':
-    await simpleBuild('observables-connect', { bundler: 'gulp' })
+    await simpleBuild('observables-connect')
     break
 
   case 'react-connect-kit':
-    await simpleBuild('react-connect-kit', { bundler: 'gulp' })
+    await simpleBuild('react-connect-kit')
     break
 
   case 'react-odometer':
-    await simpleBuild('react-odometer', { bundler: 'gulp' })
+    await simpleBuild('react-odometer')
     break
 
   case 'react-polkicon':
-    await simpleBuild('react-polkicon', { bundler: 'gulp' })
+    await simpleBuild('react-polkicon')
     break
 
   case 'types':
-    await simpleBuild('types', { bundler: 'tsup' })
+    await simpleBuild('types')
     break
 
   case 'utils':
-    await simpleBuild('utils', { bundler: 'tsup' })
+    await simpleBuild('utils')
     break
 
   case 'validator-assets':
-    await simpleBuild('validator-assets', { bundler: null })
+    await simpleBuild('validator-assets')
     break
 
   default:

builder/src/types.ts

@@ -1,7 +1,7 @@
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */
 
-export type Bundler = 'gulp' | 'tsup' | 'module'
+export type Bundler = 'tsup' | 'module'
 
 // TypeScript interfaces for package data structures
 export interface PackageInfoYml {

library/crypto/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@w3ux/crypto-source",
   "description": "Cryptographic utilities for Dapps",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "license": "GPL-3.0-only",
   "type": "module",
   "keywords": [
@@ -23,7 +23,7 @@
   },
   "scripts": {
     "clear": "rm -rf node_modules dist tsconfig.tsbuildinfo",
-    "build": "tsup src/**/* --format esm,cjs --target es2022 --dts --no-splitting",
+    "build": "tsup",
     "compile": "builder -t crypto"
   },
   "dependencies": {

library/crypto/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "src",
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "dist"
   },
   "include": ["./**/*"],

library/crypto/tsup.config.ts

@@ -5,9 +5,9 @@ import { defineConfig } from 'tsup'
 
 export default defineConfig({
   entry: ['src/index.ts'],
-  splitting: false,
-  sourcemap: false,
+  target: 'esnext',
+  sourcemap: true,
   clean: true,
   dts: true,
-  format: 'esm',
+  format: ['esm', 'cjs']
 })

library/extension-assets/package.json

@@ -30,7 +30,7 @@
     "compile": "builder -t extension-assets"
   },
   "peerDependencies": {
-    "react": "^19"
+    "react": "^19.1.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.12",