chore: esm work

Author: shellscape

.moon/tasks.yml

@@ -32,7 +32,7 @@ tasks:
       - package.json
 
   compile:
-    command: tshy
+    command: tsc --project tsconfig.json
     inputs:
       - src
       - package.json

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "bootstrap": "./shared/bootstrap.sh",
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "devDependencies": {
     "@dot/versioner": "^0.4.2",
@@ -24,8 +24,7 @@
     "prettier": "^3.5.3",
     "prettier-plugin-package": "^1.4.0",
     "ts-node": "10.9.2",
-    "tshy": "^3.0.2",
-    "typescript": "^5.2.2",
+    "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   },
   "lint-staged": {

packages/create-jsx-email/package.json

@@ -33,7 +33,7 @@
     "@types/yargs-parser": "^21.0.3",
     "chalk-template": "^1.1.0",
     "detect-package-manager": "^3.0.1",
-    "globby": "14.0.2",
+    "globby": "14.1.0",
     "mustache": "^4.2.0",
     "prompts": "^2.4.2",
     "yargs-parser": "^21.1.1"

packages/jsx-email/bin/email

@@ -1,2 +1,2 @@
 #!/usr/bin/env -S node --enable-source-maps --no-warnings=ExperimentalWarning
-import './../dist/esm/cli/main.mjs';
+import './../dist/cli/main.mjs';

packages/jsx-email/moon.yml

@@ -28,7 +28,7 @@ tasks:
       cache: false
 
   compile:
-    command: tshy
+    command: tsc --project tsconfig.json
     inputs:
       - src
       - package.json

packages/jsx-email/package.json

@@ -13,42 +13,23 @@
   },
   "author": "Andrew Powell <[email protected]>",
   "homepage": "https://jsx.email/",
-  "main": "./dist/commonjs/index.js",
   "bin": {
     "email": "./bin/email"
   },
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/index.d.ts",
-        "default": "./dist/commonjs/index.js"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./compile": {
-      "import": {
-        "types": "./dist/esm/compile.d.ts",
-        "default": "./dist/esm/compile.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/compile.d.ts",
-        "default": "./dist/commonjs/compile.js"
-      }
+      "types": "./dist/compile.d.ts",
+      "default": "./dist/compile.js"
     },
     "./config": {
-      "import": {
-        "types": "./dist/esm/config.d.ts",
-        "default": "./dist/esm/config.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/config.d.ts",
-        "default": "./dist/commonjs/config.js"
-      }
+      "types": "./dist/config.d.ts",
+      "default": "./dist/config.js"
     }
   },
   "engines": {
@@ -70,54 +51,55 @@
     "react-dom": "^18.2.0 || ^19"
   },
   "dependencies": {
-    "@dot/log": "^0.1.5",
+    "@dot/log": "^0.2.0",
     "@jsx-email/doiuse-email": "^1.0.1",
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/colors": "3.0.0",
-    "@radix-ui/react-collapsible": "1.1.1",
+    "@radix-ui/react-collapsible": "1.1.4",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-popover": "1.1.2",
+    "@radix-ui/react-popover": "1.1.7",
     "@radix-ui/react-select": "^2.0.0",
-    "@radix-ui/react-slot": "1.1.0",
-    "@radix-ui/react-toggle-group": "1.1.0",
-    "@unocss/core": "^0.65.1",
-    "@unocss/preset-rem-to-px": "^0.65.1",
-    "@unocss/preset-typography": "^0.65.1",
-    "@unocss/preset-uno": "^0.65.1",
-    "@unocss/preset-wind": "^0.65.1",
-    "@unocss/transformer-compile-class": "^0.65.1",
-    "@unocss/transformer-variant-group": "^0.65.1",
+    "@radix-ui/react-slot": "1.2.0",
+    "@radix-ui/react-toggle-group": "1.1.3",
+    "@unocss/core": "^66.0.0",
+    "@unocss/preset-rem-to-px": "^66.0.0",
+    "@unocss/preset-typography": "^66.0.0",
+    "@unocss/preset-uno": "^66.0.0",
+    "@unocss/preset-wind": "^66.0.0",
+    "@unocss/transformer-compile-class": "^66.0.0",
+    "@unocss/transformer-variant-group": "^66.0.0",
     "@vitejs/plugin-react": "^4.3.0",
     "autoprefixer": "^10.4.16",
-    "chalk": "4.1.2",
+    "chalk": "5.4.1",
+    "chalk-template": "^1.1.0",
     "classnames": "2.5.1",
     "debug": "^4.3.4",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.2",
     "find-up": "^7.0.0",
-    "framer-motion": "11.12.0",
-    "globby": "14.0.2",
+    "framer-motion": "12.7.3",
+    "globby": "14.1.0",
     "hash-it": "^6.0.0",
     "html-to-text": "9.0.5",
     "lilconfig": "^3.1.2",
     "magic-string": "^0.30.5",
-    "md-to-react-email": "5.0.4",
+    "md-to-react-email": "5.0.5",
     "micromatch": "^4.0.5",
-    "mime-types": "^2.1.35",
+    "mime-types": "^3.0.1",
     "mustache": "^4.2.0",
     "postcss": "^8.4.32",
     "postcss-var-replace": "^1.0.0",
     "pretty-bytes": "^6.1.1",
-    "react-router-dom": "7.0.1",
+    "react-router-dom": "7.5.0",
     "rehype": "^13.0.1",
     "rehype-stringify": "^10.0.0",
-    "shiki": "^1.18.0",
+    "shiki": "^3.2.2",
     "source-map-support": "^0.5.21",
     "std-env": "^3.6.0",
-    "tailwindcss": "3.4.15",
+    "tailwindcss": "4.1.4",
     "titleize": "^4.0.0",
     "unist-util-visit": "^5.0.0",
-    "valibot": "^0.42.1",
-    "vite": "^5.2.11",
+    "valibot": "^1.0.0",
+    "vite": "^6.2.6",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
@@ -136,7 +118,7 @@
     "hast": "^1.0.0",
     "unified": "^11.0.4"
   },
-  "types": "./dist/commonjs/index.d.ts",
+  "types": "./dist/index.d.ts",
   "funding": {
     "type": "github",
     "url": "https://github.com/sponsors/shellscape"

packages/jsx-email/src/cli/commands/build.mts

@@ -4,7 +4,7 @@ import os from 'node:os';
 import { dirname, basename, extname, join, resolve, win32, posix } from 'path';
 import { pathToFileURL } from 'url';
 
-import chalk from 'chalk';
+import chalkTmpl from 'chalk-template';
 import { globby } from 'globby';
 import micromatch from 'micromatch';
 import { isWindows } from 'std-env';
@@ -64,7 +64,7 @@ export interface BuildTempatesResult extends BuildResult {
   fileName: string;
 }
 
-export const help = chalk`
+export const help = chalkTmpl`
 {blue email build}
 
 Builds a template and saves the result
@@ -110,7 +110,7 @@ export const build = async (options: BuildOptions): Promise<BuildResult> => {
 
   if (typeof componentExport !== 'function') {
     log.error(
-      chalk`{red Template Export Problem:} ${path} doesn't have an export  of a JSX Element named \`Template\`. If you feel this is a bug, please open a new issue.`
+      chalkTmpl`{red Template Export Problem:} ${path} doesn't have an export  of a JSX Element named \`Template\`. If you feel this is a bug, please open a new issue.`
     );
     process.exit(1);
   }
@@ -175,9 +175,9 @@ export const buildTemplates = async ({ targetPath, buildOptions }: BuildTemplate
 
   if (!silent) {
     const suffix = targetFiles.length > 1 ? 's' : '';
-    log.info(chalk`{cyan Found}`, targetFiles.length, `file${suffix}:`);
+    log.info(chalkTmpl`{cyan Found}`, targetFiles.length, `file${suffix}:`);
     log.info('  ', targetFiles.join('\n  '), '\n');
-    log.info(chalk`{blue Starting build...}`);
+    log.info(chalkTmpl`{blue Starting build...}`);
   }
 
   const compiledFiles = await compile({
@@ -215,14 +215,14 @@ export const buildTemplates = async ({ targetPath, buildOptions }: BuildTemplate
   if (!silent) {
     if (showStats && largeCount > 0) {
       log.warn('');
-      log.warn(chalk`${largeCount} template(s) exceed the 102kb Gmail Clipping limit`);
+      log.warn(chalkTmpl`${largeCount} template(s) exceed the 102kb Gmail Clipping limit`);
     }
     if (writeToFile) {
       log.info('');
-      log.info(chalk`{green Build complete}. File(s) written to:`, outputPath);
+      log.info(chalkTmpl`{green Build complete}. File(s) written to:`, outputPath);
     } else {
       log.info('');
-      log.info(chalk`{green Build complete}`);
+      log.info(chalkTmpl`{green Build complete}`);
     }
   }
 
@@ -235,7 +235,7 @@ export const command: CommandFn = async (argv: BuildCommandOptions, input) => {
   const [targetPath] = input;
 
   if (!existsSync(targetPath)) {
-    log.error(chalk`{red The provided build target '${targetPath}' does not exist}`);
+    log.error(chalkTmpl`{red The provided build target '${targetPath}' does not exist}`);
     process.exit(1);
   }
 

packages/jsx-email/src/cli/commands/check.mts

@@ -2,6 +2,7 @@ import { lstat } from 'node:fs/promises';
 
 import { doIUseEmail } from '@jsx-email/doiuse-email';
 import chalk from 'chalk';
+import chalkTmpl from 'chalk-template';
 import { parse as assert, object, type InferOutput as Infer } from 'valibot';
 
 import { formatBytes, gmailByteLimit, gmailBytesSafe } from '../helpers.mjs';
@@ -25,7 +26,7 @@ const emailClients = [
 ];
 
 const formatSubject = (what: string) =>
-  what.replace(/`([\s\w<>.-]+)`/g, (_, bit) => chalk`{bold ${bit}}`).trim();
+  what.replace(/`([\s\w<>.-]+)`/g, (_, bit) => chalkTmpl`{bold ${bit}}`).trim();
 
 const combine = (lines: string[]) => {
   const rePreamble = /(`([\s\w<>.-]+)`[\s\w]+)/;
@@ -46,7 +47,7 @@ const combine = (lines: string[]) => {
   return result;
 };
 
-export const help = chalk`
+export const help = chalkTmpl`
 {blue email check}
 
 Check jsx-email templates for client compatibility
@@ -67,14 +68,14 @@ const runCheck = (fileName: string, html: string) => {
 
   if (success && !result.warnings) return;
 
-  log(chalk`{underline ${fileName}} → HTML: ${htmlSize}\n`);
+  log(chalkTmpl`{underline ${fileName}} → HTML: ${htmlSize}\n`);
 
   if (!success && result.errors?.length) {
     const errors = combine(result.errors);
     const indent = '           ';
     for (const [preamble, clients] of Object.entries(errors)) {
       log(
-        chalk`  {red error}  ${formatSubject(preamble)}:\n${indent}{dim ${clients.join(
+        chalkTmpl`  {red error}  ${formatSubject(preamble)}:\n${indent}{dim ${clients.join(
           `\n${indent}`
         )}}\n`
       );
@@ -84,7 +85,7 @@ const runCheck = (fileName: string, html: string) => {
   }
 
   if (bytes >= gmailByteLimit) {
-    log(chalk`  {red error}  HTML content is over the Gmail Clipping Limit: ${htmlSize}\n`);
+    log(chalkTmpl`  {red error}  HTML content is over the Gmail Clipping Limit: ${htmlSize}\n`);
     counts.errors += 1;
   }
 
@@ -93,7 +94,7 @@ const runCheck = (fileName: string, html: string) => {
     const indent = '          ';
     for (const [preamble, clients] of Object.entries(warnings)) {
       log(
-        chalk`  {yellow warn}  ${formatSubject(preamble)}:\n${indent}{dim ${clients.join(
+        chalkTmpl`  {yellow warn}  ${formatSubject(preamble)}:\n${indent}{dim ${clients.join(
           `\n${indent}`
         )}}\n`
       );
@@ -102,21 +103,22 @@ const runCheck = (fileName: string, html: string) => {
   }
 
   if (bytes > gmailBytesSafe && bytes < gmailByteLimit) {
-    log(chalk`  {red warn}  HTML content is near the Gmail Clipping Limit: ${htmlSize}\n`);
+    log(chalkTmpl`  {red warn}  HTML content is near the Gmail Clipping Limit: ${htmlSize}\n`);
     counts.warnings += 1;
   }
 
   const errors = counts.errors > 0 ? chalk.red(counts.errors) : chalk.green(counts.errors);
   const warnings =
     counts.warnings > 0 ? chalk.yellow(counts.warnings) : chalk.green(counts.warnings);
 
-  log(chalk`{green Check Complete:} ${errors} error(s), ${warnings} warning(s)`);
+  log(chalkTmpl`{green Check Complete:} ${errors} error(s), ${warnings} warning(s)`);
 };
 
 export const command: CommandFn = async (argv: CheckOptions, input) => {
   if (input.length !== 1) return false;
 
-  const noExists = () => error(chalk`{red '${input}' doesn't appear to be a file which exists}`);
+  const noExists = () =>
+    error(chalkTmpl`{red '${input}' doesn't appear to be a file which exists}`);
 
   try {
     const stat = await lstat(input[0]);
@@ -128,7 +130,7 @@ export const command: CommandFn = async (argv: CheckOptions, input) => {
 
   assert(CheckOptionsStruct, argv);
 
-  log(chalk`{blue Checking email template for Client Compatibility...}\n`);
+  log(chalkTmpl`{blue Checking email template for Client Compatibility...}\n`);
 
   const [file] = await buildTemplates({
     buildOptions: { showStats: false, writeToFile: false },

packages/jsx-email/src/cli/commands/create.mts

@@ -2,7 +2,7 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import mustache from 'mustache';
 import {
   parse as assert,

packages/jsx-email/src/cli/commands/help.mts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 
 import { name, version } from '../../package-info.cjs';