Merge pull request #27 from sonofmagic/dev

sonofmagic · web-flow · commit 98f8a44760fd · 2023-06-18T19:42:53.000+08:00
Release: 1.2.6
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,10 +28,10 @@ jobs:
           cache: pnpm
           registry-url: 'https://registry.npmjs.org'
 
-      - run: npx changelogithub
-        continue-on-error: true
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      # - run: npx changelogithub
+      #   continue-on-error: true
+      #   env:
+      #     GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Install Dependencies
         run: pnpm i
diff --git a/README.md b/README.md
@@ -1,5 +1,13 @@
 # tailwindcss-mangle
 
+![star](https://badgen.net/github/stars/sonofmagic/tailwindcss-mangle)
+![dm0](https://badgen.net/npm/dm/tailwindcss-mangle-core)
+![dm1](https://badgen.net/npm/dm/tailwindcss-mangle-shared)
+![dm2](https://badgen.net/npm/dm/tailwindcss-patch)
+![dm3](https://badgen.net/npm/dm/unplugin-tailwindcss-mangle)
+[![test](https://github.com/sonofmagic/tailwindcss-mangle/actions/workflows/test.yml/badge.svg?branch=dev)](https://github.com/sonofmagic/tailwindcss-mangle/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/sonofmagic/tailwindcss-mangle/branch/main/graph/badge.svg?token=jPyNihT78U)](https://codecov.io/gh/sonofmagic/tailwindcss-mangle)
+
 A util for mangle tailwindcss
 
 - [tailwindcss-mangle](#tailwindcss-mangle)
diff --git a/apps/next-app/package.json b/apps/next-app/package.json
@@ -14,9 +14,9 @@
     "@types/react": "18.2.12",
     "@types/react-dom": "18.2.5",
     "autoprefixer": "10.4.14",
-    "eslint": "8.42.0",
-    "eslint-config-next": "13.4.5",
-    "next": "13.4.5",
+    "eslint": "8.43.0",
+    "eslint-config-next": "13.4.6",
+    "next": "13.4.6",
     "postcss": "8.4.24",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/apps/remix-app/package.json b/apps/remix-app/package.json
@@ -9,19 +9,19 @@
     "prepare": "tw-patch"
   },
   "dependencies": {
-    "@remix-run/node": "^1.17.0",
-    "@remix-run/react": "^1.17.0",
-    "@remix-run/serve": "^1.17.0",
+    "@remix-run/node": "^1.17.1",
+    "@remix-run/react": "^1.17.1",
+    "@remix-run/serve": "^1.17.1",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.17.0",
-    "@remix-run/eslint-config": "^1.17.0",
+    "@remix-run/dev": "^1.17.1",
+    "@remix-run/eslint-config": "^1.17.1",
     "@types/react": "^18.2.12",
     "@types/react-dom": "^18.2.5",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "tailwindcss": "^3.3.2",
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.1.3",
diff --git a/apps/vite-vue/package.json b/apps/vite-vue/package.json
@@ -21,6 +21,6 @@
     "typescript": "^5.1.3",
     "unplugin-tailwindcss-mangle": "workspace:*",
     "vite": "^4.3.9",
-    "vue-tsc": "^1.6.5"
+    "vue-tsc": "^1.8.0"
   }
 }
diff --git a/apps/webpack5-vue3/package.json b/apps/webpack5-vue3/package.json
@@ -25,7 +25,7 @@
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^11.0.3",
     "autoprefixer": "^10.4.14",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-mangle",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "private": true,
   "workspaces": [
     "apps/*",
@@ -22,14 +22,14 @@
   "devDependencies": {
     "@icebreakers/eslint-config-ts": "^1.1.0",
     "@icebreakers/rollup": "^0.4.0",
-    "@icebreakers/tsconfig": "^0.0.6",
+    "@icebreakers/tsconfig": "^0.0.7",
     "@tsconfig/recommended": "^1.0.2",
     "@types/jest": "^29.5.2",
     "@types/node": "^20.3.1",
-    "@vitest/coverage-v8": "^0.32.0",
+    "@vitest/coverage-v8": "^0.32.2",
     "bumpp": "^9.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "jest": "^29.5.0",
     "only-allow": "^1.1.1",
@@ -48,6 +48,6 @@
   },
   "packageManager": "pnpm@8.6.2",
   "dependencies": {
-    "vitest": "^0.32.0"
+    "vitest": "^0.32.2"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-mangle-core",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "The core of tailwindcss-mangle",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-mangle-shared",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "The shared utils of tailwindcss-mangle",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
diff --git a/packages/tailwindcss-patch/package.json b/packages/tailwindcss-patch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "patch tailwindcss for exposing context",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
@@ -47,7 +47,7 @@
     "@babel/traverse": "^7.22.5",
     "@babel/types": "^7.22.5",
     "resolve": "^1.22.2",
-    "semver": "^7.5.1"
+    "semver": "^7.5.2"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {
diff --git a/packages/tailwindcss-patch/src/cache.ts b/packages/tailwindcss-patch/src/cache.ts
@@ -22,7 +22,8 @@ export function getCacheOptions(options: CacheOptions = {}): Required<CacheOptio
     cwd,
     dir,
     file,
-    filename
+    filename,
+    strategy: 'merge'
   }
 }
 
diff --git a/packages/tailwindcss-patch/src/class.ts b/packages/tailwindcss-patch/src/class.ts
@@ -1,5 +1,5 @@
 import { getClassCacheSet, getContexts, getTailwindcssEntry } from './exposeContext'
-import type { CacheOptions, InternalCacheOptions, InternalPatchOptions, TailwindcssPatcherOptions } from './type'
+import type { CacheOptions, InternalCacheOptions, InternalPatchOptions, TailwindcssPatcherOptions, CacheStrategy } from './type'
 import { writeCache, readCache } from './cache'
 import { createPatch, getPatchOptions } from './patcher'
 
@@ -53,9 +53,34 @@ export class TailwindcssPatcher {
     // }
   }
 
-  getClassSet(basedir?: string) {
+  /**
+   * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
+   * 详见 taro weapp-tailwindcss 独立分包
+   * @param basedir
+   * @returns
+   */
+  getClassSet(
+    options: {
+      basedir?: string
+      cacheStrategy?: CacheStrategy
+    } = {
+      cacheStrategy: this.cacheOptions.strategy ?? 'merge'
+    }
+  ) {
+    const { basedir, cacheStrategy } = options
     const set = getClassCacheSet(basedir)
-    set.size > 0 && this.setCache(set)
+    if (cacheStrategy === 'overwrite') {
+      set.size > 0 && this.setCache(set)
+    } else if (cacheStrategy === 'merge') {
+      const cacheSet = this.getCache()
+      if (cacheSet) {
+        for (const x of cacheSet) {
+          set.add(x)
+        }
+      }
+      this.setCache(set)
+    }
+
     return set
   }
 
diff --git a/packages/tailwindcss-patch/src/exposeContext.ts b/packages/tailwindcss-patch/src/exposeContext.ts
@@ -45,7 +45,7 @@ export function getClassCacheSet(basedir?: string): Set<string> {
   for (const classCacheMap of classCaches) {
     const keys = classCacheMap.keys()
     for (const key of keys) {
-      classSet.add(key)
+      classSet.add(key.toString())
     }
   }
   return classSet
diff --git a/packages/tailwindcss-patch/src/type.ts b/packages/tailwindcss-patch/src/type.ts
@@ -1,8 +1,11 @@
+export type CacheStrategy = 'merge' | 'overwrite'
+
 export interface CacheOptions {
   // enable?: boolean
   dir?: string
   cwd?: string
   file?: string
+  strategy?: CacheStrategy
 }
 
 export type InternalCacheOptions = CacheOptions & { enable?: boolean }
diff --git a/packages/tailwindcss-patch/test/cache.test.ts b/packages/tailwindcss-patch/test/cache.test.ts
@@ -2,6 +2,9 @@ import { getCacheOptions, mkCacheDirectory, readCache, writeCache } from '../src
 import path from 'node:path'
 import { pkgName } from '../src/constants'
 import fs from 'node:fs'
+import { TailwindcssPatcher } from '../src/class'
+import { getCss } from './utils'
+
 describe('cache', () => {
   it('getCacheOptions', () => {
     expect(getCacheOptions).toBeDefined()
@@ -54,4 +57,33 @@ describe('cache', () => {
     expect(cache).toBe(undefined)
     expect(fs.existsSync(filepath)).toBe(false)
   })
+
+  it('multiple tw context merge cache', () => {
+    const dir = path.resolve(__dirname, './fixtures/cache')
+    const twPatcher = new TailwindcssPatcher({
+      cache: {
+        dir,
+        file: 'merge-multiple-context.json'
+      }
+    })
+    twPatcher.setCache(new Set())
+    getCss(['text-[100px]'])
+    let ctxs = twPatcher.getContexts()
+    expect(ctxs.length).toBe(1)
+    let set = twPatcher.getClassSet()
+    expect(set.size).toBeGreaterThan(0)
+    expect(set.size).toBe(2)
+    expect(set.has('text-[100px]')).toBe(true)
+
+    // 2 times
+    // 不累加
+    getCss(['text-[99px]'])
+    ctxs = twPatcher.getContexts()
+    expect(ctxs.length).toBe(1)
+    set = twPatcher.getClassSet()
+    expect(set.size).toBeGreaterThan(0)
+    expect(set.size).toBe(3)
+    expect(set.has('text-[99px]')).toBe(true)
+    expect(set.has('text-[100px]')).toBe(true)
+  })
 })
diff --git a/packages/tailwindcss-patch/test/class.test.ts b/packages/tailwindcss-patch/test/class.test.ts
@@ -31,7 +31,9 @@ describe('class', () => {
     getCss([getTestCase('hello-world.html'), getTestCase('hello-world.js')])
     const ctxs = twPatcher.getContexts()
     expect(ctxs.length).toBe(1)
-    const set = twPatcher.getClassSet()
+    const set = twPatcher.getClassSet({
+      cacheStrategy: 'overwrite'
+    })
     expect(set.size).toBeGreaterThan(0)
     expect(set.size).toBe(5)
   })
@@ -55,5 +57,7 @@ describe('class', () => {
     expect(set.size).toBeGreaterThan(0)
     expect(set.size).toBe(2)
     expect(set.has('text-[99px]')).toBe(true)
+
+    twPatcher.setCache(new Set())
   })
 })
diff --git a/packages/tailwindcss-patch/test/fixtures/cache/merge-multiple-context.json b/packages/tailwindcss-patch/test/fixtures/cache/merge-multiple-context.json
@@ -0,0 +1,5 @@
+[
+  "*",
+  "text-[99px]",
+  "text-[100px]"
+]
diff --git a/packages/unplugin-tailwindcss-mangle/package.json b/packages/unplugin-tailwindcss-mangle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "unplugin-tailwindcss-mangle",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "mangle tailwindcss utilities class plugin. support vite and webpack!",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -91,8 +91,8 @@
     "tailwindcss": "^3.3.2",
     "tslib": "^2.5.3",
     "vite": "^4.3.9",
-    "webpack": "^5.86.0",
-    "webpack-build-utils": "^0.0.1"
+    "webpack": "^5.87.0",
+    "webpack-build-utils": "^0.0.4"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@`
`21`	`21`	`"typescript": "^5.1.3",`
`22`	`22`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`23`	`23`	`"vite": "^4.3.9",`
`24`		`- "vue-tsc": "^1.6.5"`
	`24`	`+ "vue-tsc": "^1.8.0"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tailwindcss-mangle-core",`
`3`		`- "version": "1.2.5",`
	`3`	`+ "version": "1.2.6",`
`4`	`4`	`"description": "The core of tailwindcss-mangle",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"module": "./dist/index.mjs",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tailwindcss-mangle-shared",`
`3`		`- "version": "1.2.5",`
	`3`	`+ "version": "1.2.6",`
`4`	`4`	`"description": "The shared utils of tailwindcss-mangle",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"module": "./dist/index.mjs",`