Merge pull request #9 from sonofmagic/dev

sonofmagic · web-flow · commit 9ce246a8ba88 · 2023-04-27T19:27:31.000+08:00
Chore: add test github action
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,46 @@
+name: test
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    # https://github.com/webpack/webpack/blob/main/.github/workflows/test.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [10.x, 18.x]
+        part: [a, b]
+        include:
+          - os: ubuntu-latest
+            node-version: 18.x
+            part: a
+          - os: ubuntu-latest
+            node-version: 16.x
+            part: a
+          - os: ubuntu-latest
+            node-version: 14.x
+            part: a
+          - os: ubuntu-latest
+            node-version: 12.x
+            part: a
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: ^7.27.1
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          cache: 'pnpm'
+
+      - run: pnpm i
+      - run: pnpm build:pkg
+      - run: pnpm test
+
+      - uses: codecov/codecov-action@v3
+        with:
+          directory: coverage
diff --git a/apps/solid-app/package.json b/apps/solid-app/package.json
@@ -18,7 +18,7 @@
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2",
+    "vite": "^4.3.3",
     "vite-plugin-solid": "^2.5.0"
   },
   "dependencies": {
diff --git a/apps/vite-lit/package.json b/apps/vite-lit/package.json
@@ -27,6 +27,6 @@
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2"
+    "vite": "^4.3.3"
   }
 }
diff --git a/apps/vite-react/package.json b/apps/vite-react/package.json
@@ -23,6 +23,6 @@
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2"
+    "vite": "^4.3.3"
   }
 }
diff --git a/apps/vite-svelte/package.json b/apps/vite-svelte/package.json
@@ -21,6 +21,6 @@
     "tslib": "^2.5.0",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2"
+    "vite": "^4.3.3"
   }
 }
diff --git a/apps/vite-vanilla/package.json b/apps/vite-vanilla/package.json
@@ -16,6 +16,6 @@
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2"
+    "vite": "^4.3.3"
   }
 }
diff --git a/apps/vite-vue/package.json b/apps/vite-vue/package.json
@@ -20,7 +20,7 @@
     "tailwindcss-patch": "workspace:*",
     "typescript": "^5.0.4",
     "unplugin-tailwindcss-mangle": "workspace:*",
-    "vite": "^4.3.2",
-    "vue-tsc": "^1.4.4"
+    "vite": "^4.3.3",
+    "vue-tsc": "^1.6.0"
   }
 }
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@icebreakers/eslint-config-ts": "^1.0.4",
-    "@icebreakers/rollup": "^0.3.0",
+    "@icebreakers/rollup": "^0.4.0",
     "@icebreakers/tsconfig": "^0.0.6",
     "@tsconfig/recommended": "^1.0.2",
     "@types/jest": "^29.5.1",
diff --git a/packages/tailwindcss-patch/package.json b/packages/tailwindcss-patch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "patch tailwindcss for exposing context",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
@@ -18,9 +18,6 @@
     "dev:tsc": "tsc -p tsconfig.json --sourceMap",
     "build:tsc": "tsc -p tsconfig.json",
     "test": "npm run patch && jest",
-    "prepare": "echo prepare",
-    "postinstall": "echo postinstall",
-    "preinstall": "npx only-allow pnpm",
     "patch": "ts-node src/cli.ts"
   },
   "keywords": [
@@ -35,7 +32,7 @@
   },
   "devDependencies": {
     "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.18.4",
+    "@types/babel__traverse": "^7.18.5",
     "@types/resolve": "^1.20.2",
     "@types/semver": "^7.3.13",
     "defu": "^6.1.2",
diff --git a/packages/unplugin-tailwindcss-mangle/README.md b/packages/unplugin-tailwindcss-mangle/README.md
@@ -116,9 +116,11 @@ export interface IClassGeneratorOptions {
 
 ### include / exclude
 
-type: glob string
+Type: `string | string[]`  
 
-allow you to control the mangle range of bundles.
+Default: `undefined`
+
+`glob string` allow you to control the mangle range of bundles.
 
 ## Notice
 
diff --git a/packages/unplugin-tailwindcss-mangle/package.json b/packages/unplugin-tailwindcss-mangle/package.json
@@ -52,8 +52,7 @@
     "dev:tsc": "tsc -p tsconfig.json --sourceMap",
     "build:tsc": "tsc -p tsconfig.json",
     "test": "jest",
-    "preinstall": "npx only-allow pnpm",
-    "prepare": "tw-patch"
+    "_prepare": "tw-patch"
   },
   "files": [
     "dist"
@@ -69,9 +68,7 @@
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@babel/generator": "^7.21.4",
-    "@babel/parser": "^7.21.4",
-    "@babel/traverse": "^7.21.4",
+    "@babel/core": "^7.21.4",
     "@babel/types": "^7.21.4",
     "micromatch": "^4.0.5",
     "parse5": "^7.1.2",
@@ -87,16 +84,15 @@
   },
   "devDependencies": {
     "@parse5/tools": "^0.1.0",
-    "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.18.4",
+    "@types/babel__core": "^7.20.0",
     "@types/escodegen": "^0.0.7",
     "@types/micromatch": "^4.0.2",
     "@types/semver": "^7.3.13",
     "pkg-types": "^1.0.2",
     "tailwindcss": "^3.3.2",
     "tslib": "^2.5.0",
-    "vite": "^4.3.2",
-    "webpack": "^5.80.0"
+    "vite": "^4.3.3",
+    "webpack": "^5.81.0"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {
diff --git a/packages/unplugin-tailwindcss-mangle/src/css/plugins.ts b/packages/unplugin-tailwindcss-mangle/src/css/plugins.ts
@@ -20,13 +20,29 @@ const postcssMangleTailwindcssPlugin: PostcssMangleTailwindcssPlugin = (options)
     postcssPlugin,
     Rule(rule, helper) {
       rule.selector = parser((selectors) => {
-        selectors.walk((s) => {
+        selectors.walkClasses((s) => {
           if (s.value) {
             const hit = newClassMap[s.value]
             if (hit) {
               // console.log(s.value, hit.name)
               s.value = hit.name
             }
+            // for vue scoped gap-y-4[data-v-0f84999b]
+            // const idx = s.value.indexOf('[data-v-')
+            // const isVueScoped = idx > -1
+            // if (isVueScoped) {
+            //   const prefixCls = s.value.substring(0, idx)
+            //   const hit = newClassMap[prefixCls]
+            //   if (hit) {
+            //     s.value = hit.name + s.value.substring(idx)
+            //   }
+            // } else {
+            //   const hit = newClassMap[s.value]
+            //   if (hit) {
+            //     // console.log(s.value, hit.name)
+            //     s.value = hit.name
+            //   }
+            // }
           }
         })
       }).processSync(rule.selector)
diff --git a/packages/unplugin-tailwindcss-mangle/src/index.ts b/packages/unplugin-tailwindcss-mangle/src/index.ts
@@ -51,10 +51,13 @@ export const unplugin = createUnplugin((options: Options | undefined = {}, meta)
             for (let i = 0; i < groupedEntries.js.length; i++) {
               const [file, chunk] = groupedEntries.js[i] as [string, OutputChunk]
               if (isInclude(file)) {
-                chunk.code = jsHandler(chunk.code, {
+                const code = jsHandler(chunk.code, {
                   runtimeSet,
                   classGenerator
                 }).code
+                if (code) {
+                  chunk.code = code
+                }
               }
             }
           }
@@ -155,8 +158,10 @@ export const unplugin = createUnplugin((options: Options | undefined = {}, meta)
                     runtimeSet,
                     classGenerator
                   }).code
-                  const source = new ConcatSource(code)
-                  compilation.updateAsset(file, source)
+                  if (code) {
+                    const source = new ConcatSource(code)
+                    compilation.updateAsset(file, source)
+                  }
                 }
               }
             }
@@ -197,8 +202,9 @@ export const unplugin = createUnplugin((options: Options | undefined = {}, meta)
                       runtimeSet,
                       classGenerator
                     }).code
-
-                    overwriteServerSideAsset(key, file, code)
+                    if (code) {
+                      overwriteServerSideAsset(key, file, code)
+                    }
                   }
                 })
                 js.clear()
@@ -228,28 +234,9 @@ export const unplugin = createUnplugin((options: Options | undefined = {}, meta)
 export const vitePlugin = unplugin.vite
 export const webpackPlugin = unplugin.webpack
 
-// export const nuxtPlugin = function (options: Options = {}, nuxt: any) {
-//   // install webpack plugin
-//   nuxt.hook('webpack:config', async (config: any) => {
-//     config.plugins = config.plugins || []
-//     config.plugins.unshift(unplugin.webpack(options))
-//   })
-
-//   // install vite plugin
-//   nuxt.hook('vite:extendConfig', async (config: any) => {
-//     config.plugins = config.plugins || []
-//     config.plugins.push(unplugin.vite(options))
-//   })
-// }
-
 // export default unplugin
 // export const vitePlugin = unplugin.vite
 // export const rollupPlugin = unplugin.rollup
 // export const webpackPlugin = unplugin.webpack
 // export const rspackPlugin = unplugin.rspack
 // export const esbuildPlugin = unplugin.esbuild
-// export const vitePlugin = unplugin.vite
-// export const rollupPlugin = unplugin.rollup
-// export const webpackPlugin = unplugin.webpack
-// export const rspackPlugin = unplugin.rspack
-// export const esbuildPlugin = unplugin.esbuild
diff --git a/packages/unplugin-tailwindcss-mangle/src/js/index.ts b/packages/unplugin-tailwindcss-mangle/src/js/index.ts
@@ -1,18 +1,9 @@
-import _generate from '@babel/generator'
-import { parse } from '@babel/parser'
-import _traverse from '@babel/traverse'
-
-import type { Node, StringLiteral, TemplateElement } from '@babel/types'
-import type { TraverseOptions, IHandlerOptions } from '../types'
+import type { StringLiteral, TemplateElement } from '@babel/types'
+import { transformSync, type BabelFileResult, type NodePath } from '@babel/core'
+import type { IHandlerOptions } from '../types'
 import { escapeStringRegexp } from '../utils'
 import { splitCode } from './split'
 
-function getDefaultExportFromNamespaceIfPresent(n: any) {
-  return n && Object.prototype.hasOwnProperty.call(n, 'default') ? n.default : n
-}
-const generate = getDefaultExportFromNamespaceIfPresent(_generate) as typeof _generate
-const traverse = getDefaultExportFromNamespaceIfPresent(_traverse) as typeof _traverse
-
 export function makeRegex(str: string) {
   return new RegExp('(?<=^|[\\s"])' + escapeStringRegexp(str), 'g')
 }
@@ -39,25 +30,33 @@ export function handleValue(str: string, node: StringLiteral | TemplateElement,
 }
 
 export function jsHandler(rawSource: string, options: IHandlerOptions) {
-  const ast = parse(rawSource)
-
-  const topt: TraverseOptions<Node> = {
-    StringLiteral: {
-      enter(p) {
-        const n = p.node
-        n.value = handleValue(n.value, n, options)
+  const result = transformSync(rawSource, {
+    babelrc: false,
+    ast: true,
+    plugins: [
+      () => {
+        return {
+          visitor: {
+            StringLiteral: {
+              enter(p: NodePath<StringLiteral>) {
+                const n = p.node
+                n.value = handleValue(n.value, n, options)
+              }
+            },
+            TemplateElement: {
+              enter(p: NodePath<TemplateElement>) {
+                const n = p.node
+                n.value.raw = handleValue(n.value.raw, n, options)
+              }
+            }
+            // noScope: true
+          }
+        }
       }
-    },
-    TemplateElement: {
-      enter(p) {
-        const n = p.node
-        n.value.raw = handleValue(n.value.raw, n, options)
-      }
-    },
-    noScope: true
-  }
-
-  traverse(ast, topt)
+    ],
+    sourceMaps: false,
+    configFile: false
+  })
 
-  return generate(ast)
+  return result as BabelFileResult
 }
diff --git a/packages/unplugin-tailwindcss-mangle/src/types.ts b/packages/unplugin-tailwindcss-mangle/src/types.ts
@@ -21,8 +21,6 @@ export interface IClassGenerator {
   context: Record<string, any>
 }
 
-export type { TraverseOptions } from '@babel/traverse'
-
 export interface IHandlerOptions {
   runtimeSet: Set<string>
   classGenerator: ClassGenerator
diff --git a/packages/unplugin-tailwindcss-mangle/src/utils.ts b/packages/unplugin-tailwindcss-mangle/src/utils.ts
@@ -1,5 +1,6 @@
 import type { IClassGeneratorOptions, IClassGenerator } from './types'
-import { isMatch } from 'micromatch'
+import micromatch from 'micromatch'
+const { isMatch } = micromatch
 export function groupBy<T>(arr: T[], cb: (arg: T) => string): Record<string, T[]> {
   if (!Array.isArray(arr)) {
     throw new Error('expected an array for first argument')
@@ -35,7 +36,7 @@ export function getGroupedEntries<T>(
       return /\.html?$/.test(file)
     },
     jsMatcher(file: string) {
-      return /\.js$/.test(file)
+      return /\.[cm]?js$/.test(file)
     }
   }
 ) {
diff --git a/packages/unplugin-tailwindcss-mangle/src/vite.ts b/packages/unplugin-tailwindcss-mangle/src/vite.ts
@@ -1,3 +1,3 @@
 import { unplugin } from '.'
-import type { } from 'vite'
+import type {} from 'vite'
 export default unplugin.vite
diff --git a/packages/unplugin-tailwindcss-mangle/test/__snapshots__/css.test.ts.snap b/packages/unplugin-tailwindcss-mangle/test/__snapshots__/css.test.ts.snap
diff --git a/packages/unplugin-tailwindcss-mangle/test/css.test.ts b/packages/unplugin-tailwindcss-mangle/test/css.test.ts
diff --git a/packages/unplugin-tailwindcss-mangle/test/fixtures/vue.scoped.css b/packages/unplugin-tailwindcss-mangle/test/fixtures/vue.scoped.css
diff --git a/packages/unplugin-tailwindcss-mangle/tsconfig.json b/packages/unplugin-tailwindcss-mangle/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`"tailwindcss-patch": "workspace:*",`
`28`	`28`	`"typescript": "^5.0.4",`
`29`	`29`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`30`		`- "vite": "^4.3.2"`
	`30`	`+ "vite": "^4.3.3"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`"tailwindcss-patch": "workspace:*",`
`24`	`24`	`"typescript": "^5.0.4",`
`25`	`25`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`26`		`- "vite": "^4.3.2"`
	`26`	`+ "vite": "^4.3.3"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@`
`21`	`21`	`"tslib": "^2.5.0",`
`22`	`22`	`"typescript": "^5.0.4",`
`23`	`23`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`24`		`- "vite": "^4.3.2"`
	`24`	`+ "vite": "^4.3.3"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`"tailwindcss-patch": "workspace:*",`
`17`	`17`	`"typescript": "^5.0.4",`
`18`	`18`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`19`		`- "vite": "^4.3.2"`
	`19`	`+ "vite": "^4.3.3"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"tailwindcss-patch": "workspace:*",`
`21`	`21`	`"typescript": "^5.0.4",`
`22`	`22`	`"unplugin-tailwindcss-mangle": "workspace:*",`
`23`		`- "vite": "^4.3.2",`
`24`		`- "vue-tsc": "^1.4.4"`
	`23`	`+ "vite": "^4.3.3",`
	`24`	`+ "vue-tsc": "^1.6.0"`
`25`	`25`	`}`
`26`	`26`	`}`