feat: prefer esm format

sonofmagic · sonofmagic · commit 68797825a08d · 2024-10-27T14:51:40.000+08:00
diff --git a/.changeset/purple-pumas-listen.md b/.changeset/purple-pumas-listen.md
@@ -0,0 +1,5 @@
+---
+"@tailwindcss-mangle/config": major
+---
+
+feat: prefer esm module
diff --git a/.changeset/selfish-foxes-learn.md b/.changeset/selfish-foxes-learn.md
@@ -0,0 +1,5 @@
+---
+"@tailwindcss-mangle/shared": major
+---
+
+feat: prefer esm module
diff --git a/package.json b/package.json
@@ -45,10 +45,10 @@
     "@icebreakers/eslint-config": "^0.6.1",
     "@icebreakers/monorepo": "^0.6.11",
     "@icebreakers/stylelint-config": "^0.1.2",
-    "@rollup/pluginutils": "^5.1.2",
+    "@rollup/pluginutils": "^5.1.3",
     "@tailwindcss-mangle/core": "workspace:*",
     "@tailwindcss-mangle/shared": "workspace:*",
-    "@tsconfig/recommended": "^1.0.7",
+    "@tsconfig/recommended": "^1.0.8",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__helper-plugin-utils": "^7.10.3",
     "@types/babel__traverse": "^7.20.6",
@@ -61,7 +61,7 @@
     "@types/lodash": "^4.17.12",
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
-    "@types/node": "^22.7.7",
+    "@types/node": "^22.8.1",
     "@types/resolve": "^1.20.6",
     "@types/semver": "^7.5.8",
     "@types/set-value": "^4.0.3",
@@ -80,7 +80,7 @@
     "fs-extra": "^11.2.0",
     "get-value": "^3.0.1",
     "html-minifier-terser": "^7.2.0",
-    "html-webpack-plugin": "^5.6.2",
+    "html-webpack-plugin": "^5.6.3",
     "husky": "^9.1.6",
     "klaw": "^4.1.0",
     "lint-staged": "^15.2.10",
@@ -104,14 +104,14 @@
     "tailwindcss-patch": "workspace:*",
     "tailwindcss2": "npm:@tailwindcss/postcss7-compat@^2.2.17",
     "tslib": "^2.8.0",
-    "tsup": "^8.3.0",
-    "tsx": "^4.19.1",
+    "tsup": "^8.3.5",
+    "tsx": "^4.19.2",
     "turbo": "^2.2.1",
     "typescript": "^5.6.3",
     "unbuild": "^2.0.0",
     "unplugin": "^1.14.1",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^5.4.9",
+    "vite": "^5.4.10",
     "vite-tsconfig-paths": "^5.0.1",
     "vitest": "~2.1.3",
     "webpack": "^5.95.0",
diff --git a/packages/config/build.config.ts b/packages/config/build.config.ts
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@tailwindcss-mangle/config",
+  "type": "module",
   "version": "3.0.0",
   "description": "The config and load function of tailwindcss-mangle",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
@@ -20,14 +21,14 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "types": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts"
     }
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "typesVersions": {
     "*": {
       "*": [
@@ -40,14 +41,24 @@
     "dist"
   ],
   "scripts": {
-    "dev": "unbuild --sourcemap",
-    "build": "unbuild",
+    "dev": "tsup --watch --sourcemap",
+    "build": "tsup",
     "test": "vitest run --coverage.enabled",
     "test:dev": "vitest"
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org/",
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.js",
+        "require": "./dist/index.cjs"
+      }
+    },
+    "main": "./dist/index.cjs",
+    "module": "./dist/index.js",
+    "types": "./dist/index.d.ts"
   },
   "dependencies": {
     "@tailwindcss-mangle/shared": "workspace:^",
diff --git a/packages/config/src/defaults.ts b/packages/config/src/defaults.ts
@@ -5,7 +5,7 @@ import { CSS_LANGS_RE } from 'is-css-request'
 
 const defaultPipelineInclude = ['**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}', CSS_LANGS_RE]
 
-const defaultPipelineExclude = [/[\\/](node_modules|dist|\.temp|\.cache|\.vscode)[\\/]/]
+const defaultPipelineExclude: string[] = []
 
 export function getDefaultPatchConfig(): PatchUserConfig {
   return {
diff --git a/packages/config/test/__snapshots__/defaults.test.ts.snap b/packages/config/test/__snapshots__/defaults.test.ts.snap
@@ -21,9 +21,7 @@ exports[`defaults > getDefaultUserConfig 1`] = `
       "loose": true,
     },
     "disabled": false,
-    "exclude": [
-      /\\[\\\\\\\\/\\]\\(node_modules\\|dist\\|\\\\\\.temp\\|\\\\\\.cache\\|\\\\\\.vscode\\)\\[\\\\\\\\/\\]/,
-    ],
+    "exclude": [],
     "include": [
       "**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}",
       /\\\\\\.\\(css\\|less\\|sass\\|scss\\|styl\\|stylus\\|pcss\\|postcss\\|sss\\)\\(\\?:\\$\\|\\\\\\?\\)/,
diff --git a/packages/config/test/__snapshots__/index.test.ts.snap b/packages/config/test/__snapshots__/index.test.ts.snap
@@ -13,9 +13,7 @@ exports[`config > 2.mangle-options 1`] = `
       "loose": false,
     },
     "disabled": false,
-    "exclude": [
-      /\\[\\\\\\\\/\\]\\(node_modules\\|dist\\|\\\\\\.temp\\|\\\\\\.cache\\|\\\\\\.vscode\\)\\[\\\\\\\\/\\]/,
-    ],
+    "exclude": [],
     "include": [
       "**/*.{html,js,ts,jsx,tsx,vue,svelte,astro,elm,php,phtml,mdx,md}",
       /\\\\\\.\\(css\\|less\\|sass\\|scss\\|styl\\|stylus\\|pcss\\|postcss\\|sss\\)\\(\\?:\\$\\|\\\\\\?\\)/,
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -52,9 +52,9 @@
   },
   "dependencies": {
     "@ast-core/escape": "^1.0.1",
-    "@babel/parser": "^7.25.9",
+    "@babel/parser": "^7.26.1",
     "@babel/traverse": "^7.25.9",
-    "@babel/types": "^7.25.9",
+    "@babel/types": "^7.26.0",
     "@tailwindcss-mangle/config": "workspace:^",
     "@tailwindcss-mangle/shared": "workspace:^",
     "fast-sort": "^3.4.1",
@@ -63,6 +63,6 @@
     "magic-string": "^0.30.12",
     "pathe": "^1.1.2",
     "postcss": "^8.4.47",
-    "postcss-selector-parser": "^6.1.2"
+    "postcss-selector-parser": "^7.0.0"
   }
 }
diff --git a/packages/core/src/css/index.ts b/packages/core/src/css/index.ts
@@ -1,4 +1,4 @@
-import type { ICssHandlerOptions, IHandlerTransformResult } from '@/types'
+import type { ICssHandlerOptions, IHandlerTransformResult } from '../types'
 import postcss from 'postcss'
 import { transformSelectorPostcssPlugin } from './plugins'
 
diff --git a/packages/core/src/css/plugins.ts b/packages/core/src/css/plugins.ts
@@ -1,5 +1,5 @@
-import type { ICssHandlerOptions } from '@/types'
 import type { PluginCreator } from 'postcss'
+import type { ICssHandlerOptions } from '../types'
 import defu from 'defu'
 import parser from 'postcss-selector-parser'
 
@@ -42,7 +42,6 @@ export const transformSelectorPostcssPlugin: PluginCreator<ICssHandlerOptions> =
                 if (ctx.isPreserveClass(s.value)) {
                   rule.cloneBefore()
                 }
-                // ctx.addToUsedBy(s.value, id)
                 s.value = v
               }
             }
diff --git a/packages/core/src/ctx/index.ts b/packages/core/src/ctx/index.ts
@@ -1,12 +1,11 @@
 import type { ClassMapOutputItem, MangleUserConfig } from '@tailwindcss-mangle/config'
 import process from 'node:process'
-import { defaultMangleClassFilter, escapeStringRegexp } from '@/utils'
 import { getConfig } from '@tailwindcss-mangle/config'
-import { ClassGenerator } from '@tailwindcss-mangle/shared'
 import { defu } from 'defu'
 import { sort } from 'fast-sort'
 import fs from 'fs-extra'
 import { dirname, isAbsolute, resolve } from 'pathe'
+import { ClassGenerator, defaultMangleClassFilter, escapeStringRegexp } from '../shared'
 
 interface InitConfigOptions {
   cwd?: string
diff --git a/packages/core/src/js/index.ts b/packages/core/src/js/index.ts
@@ -49,7 +49,7 @@ export function jsHandler(rawSource: string | MagicString, options: IJsHandlerOp
       sourceType: 'unambiguous',
     })
   }
-  catch (error) {
+  catch {
     return {
       code: ms.original,
     }
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
diff --git a/packages/shared/build.config.ts b/packages/shared/build.config.ts
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@tailwindcss-mangle/shared",
+  "type": "module",
   "version": "3.0.0",
   "description": "The shared utils of tailwindcss-mangle",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
@@ -19,14 +20,14 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "types": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts"
     }
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
   "typesVersions": {
     "*": {
       "*": [
@@ -39,15 +40,23 @@
     "dist"
   ],
   "scripts": {
-    "dev": "unbuild --sourcemap",
-    "build": "unbuild",
+    "dev": "tsup --watch --sourcemap",
+    "build": "tsup",
     "test": "vitest run --coverage.enabled",
     "test:dev": "vitest"
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {},
-  "devDependencies": {}
+    "registry": "https://registry.npmjs.org/",
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.js",
+        "require": "./dist/index.cjs"
+      }
+    },
+    "main": "./dist/index.cjs",
+    "module": "./dist/index.js",
+    "types": "./dist/index.d.ts"
+  }
 }
diff --git a/packages/shared/src/regex.ts b/packages/shared/src/regex.ts
@@ -5,11 +5,19 @@ export function escapeStringRegexp(str: string) {
   return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&').replaceAll('-', '\\x2d')
 }
 
+export interface MakeRegexOptions {
+  /**
+   * 这是为了进行精确提取用的
+   * 比如同时出现了 bg-500 bg-500/50,
+   * true 只会提取 bg-500
+   * 而 false 会提取 2 个 bg-500
+   */
+  exact?: boolean
+}
+
 export function makeRegex(
   str: string,
-  options: {
-    exact: boolean
-  } = {
+  options: MakeRegexOptions = {
     exact: true,
   },
 ) {
diff --git a/packages/tailwindcss-patch/package.json b/packages/tailwindcss-patch/package.json
@@ -49,10 +49,10 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.25.9",
-    "@babel/parser": "^7.25.9",
+    "@babel/generator": "^7.26.0",
+    "@babel/parser": "^7.26.1",
     "@babel/traverse": "^7.25.9",
-    "@babel/types": "^7.25.9",
+    "@babel/types": "^7.26.0",
     "@tailwindcss-mangle/config": "workspace:^",
     "cac": "^6.7.14",
     "consola": "^3.2.3",
diff --git a/packages/unplugin-tailwindcss-mangle/package.json b/packages/unplugin-tailwindcss-mangle/package.json
@@ -66,7 +66,7 @@
     "test:dev": "vitest"
   },
   "dependencies": {
-    "@rollup/pluginutils": "^5.1.2",
+    "@rollup/pluginutils": "^5.1.3",
     "@tailwindcss-mangle/config": "workspace:^",
     "@tailwindcss-mangle/core": "workspace:^",
     "@tailwindcss-mangle/shared": "workspace:^",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@tailwindcss-mangle/config": major
 +---
++
 +feat: prefer esm module
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ICssHandlerOptions, IHandlerTransformResult } from '@/types'`
	`1`	`+import type { ICssHandlerOptions, IHandlerTransformResult } from '../types'`
`2`	`2`	`import postcss from 'postcss'`
`3`	`3`	`import { transformSelectorPostcssPlugin } from './plugins'`
`4`	`4`