chore(repo): ditch tsup, use tsc, ship uncompiled packages

shellscape · Sep 19, 2023 · 7dabba3 · 7dabba3
1 parent a00bef8
commit 7dabba3
Show file tree

Hide file tree

Showing 28 changed files with 129 additions and 310 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -75,7 +75,7 @@ jobs:
           moon run jsx-email:build.packages
 
       - name: Release
-        run: moon run :release --affected --concurrency 1
+        run: moon run :release --affected --concurrency 1 --remote
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,4 @@ dist
 .pnpm-debug.log*
 .env
 
-deprecated/tsconfig.json
-packages/tsconfig.json
+packages/**/tsconfig.json
diff --git a/.moon/tasks.yml b/.moon/tasks.yml
@@ -20,7 +20,7 @@ tasks:
       runDepsInParallel: false
 
   compile:
-    command: tsup src/index.ts --format esm,cjs --dts --external reactm --sourcemap
+    command: rm -rf dist && tsc --project tsconfig.json && tsc --project tsconfig.json --outDir dist/es --module esnext --target esnext
     inputs:
       - src
     deps:

diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
     "prettier": "3.0.0",
     "ts-jest": "28.0.8",
     "ts-node": "10.9.1",
-    "tsup": "7.1.0",
     "typescript": "5.1.6"
   },
   "lint-staged": {

diff --git a/packages/body/package.json b/packages/body/package.json
@@ -6,18 +6,12 @@
   },
   "description": "A React body component to wrap emails",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "files": [

diff --git a/packages/button/package.json b/packages/button/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/button"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/column/package.json b/packages/column/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/column"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/components"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/container/package.json b/packages/container/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/container"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -6,18 +6,12 @@
   },
   "description": "A React Font component to set your fonts",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "files": [

diff --git a/packages/head/package.json b/packages/head/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/head"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/heading/package.json b/packages/heading/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/heading"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/hr/package.json b/packages/hr/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/hr"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/html"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/img/package.json b/packages/img/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/img"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/link/package.json b/packages/link/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/link"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/markdown"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/preview/package.json b/packages/preview/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/preview"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/render/package.json b/packages/render/package.json
@@ -11,18 +11,12 @@
     "url": "https://github.com/shellscape/jsx-email.git",
     "directory": "packages/render"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "main": "dist/index.js",
+  "module": "dist/es/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/es/index.js",
+      "require": "./dist/index.js"
     }
   },
   "engines": {

diff --git a/packages/render/src/render-async.ts b/packages/render/src/render-async.ts
@@ -61,9 +61,7 @@ export const renderAsync = async (
 
   const document = `${doctype}${markup}`;
 
-  if (options?.pretty) {
-    return pretty(document);
-  }
+  if (options?.pretty) return pretty(document);
 
   return document;
 };