Merge pull request #16 from sonofmagic/dev

feat(utils): use new shared utils

Author: sonofmagic

.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: Release
+
+permissions:
+  contents: write
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Set node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: pnpm
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npx changelogithub
+        continue-on-error: true
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Install Dependencies
+        run: pnpm i
+
+      - name: PNPM build
+        run: pnpm run build:pkg
+
+      - name: Publish to NPM
+        run: pnpm -r publish --access public --no-git-checks
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NPM_CONFIG_PROVENANCE: true

package.json

@@ -1,21 +1,22 @@
 {
   "name": "tailwindcss-mangle",
-  "version": "0.0.0",
+  "version": "1.2.0",
   "private": true,
   "workspaces": [
     "apps/*",
     "packages/*"
   ],
   "scripts": {
     "build": "pnpm run -r build",
-    "build:pkg": "pnpm run -r --filter ./packages/* build",
-    "build:app": "pnpm run -r --filter ./apps/* build ",
-    "dev": "pnpm run -r --parallel dev",
-    "dev:pkg": "pnpm run -r --parallel --filter ./packages/* dev  ",
-    "test": "pnpm run -r --filter ./packages/* test ",
+    "build:pkg": "pnpm run -r --filter=./packages/* build",
+    "build:app": "pnpm run -r --filter=./apps/* build ",
+    "dev": "pnpm -r --parallel run dev",
+    "dev:pkg": "pnpm -r --filter=./packages/* --parallel run dev",
+    "test": "pnpm run -r --filter=./packages/* test ",
     "lint": "pnpm run -r lint",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "preinstall": "npx only-allow pnpm",
+    "release": "bumpp -r",
     "sync": "cnpm sync tailwindcss-patch unplugin-tailwindcss-mangle tailwindcss-mangle-core"
   },
   "devDependencies": {
@@ -25,6 +26,7 @@
     "@tsconfig/recommended": "^1.0.2",
     "@types/jest": "^29.5.1",
     "@types/node": "^20.1.3",
+    "bumpp": "^9.1.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.40.0",
     "jest": "^29.5.0",
@@ -39,4 +41,4 @@
     "node": ">=14.0.0"
   },
   "packageManager": "[email protected]"
-}
+}

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-mangle-core",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "The core of tailwindcss-mangle",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
@@ -32,7 +32,8 @@
     "@babel/types": "^7.21.5",
     "parse5": "^7.1.2",
     "postcss": "^8.4.23",
-    "postcss-selector-parser": "^6.0.12"
+    "postcss-selector-parser": "^6.0.12",
+    "tailwindcss-mangle-shared": "workspace:^"
   },
   "devDependencies": {
     "@parse5/tools": "^0.1.0",
@@ -44,4 +45,4 @@
     "type": "git",
     "url": "git+https://github.com/sonofmagic/tailwindcss-mangle.git"
   }
-}
+}

packages/core/src/html/index.ts

@@ -1,6 +1,7 @@
 import { parse, serialize } from 'parse5'
 import { traverse } from '@parse5/tools'
 import { IHtmlHandlerOptions } from '../types'
+import { makeRegex, splitCode } from '../shared'
 
 export function htmlHandler(rawSource: string, options: IHtmlHandlerOptions) {
   const { runtimeSet, classGenerator } = options
@@ -9,15 +10,15 @@ export function htmlHandler(rawSource: string, options: IHtmlHandlerOptions) {
     element(node, parent) {
       const attr = node.attrs.find((x) => x.name === 'class')
       if (attr) {
-        const arr = attr.value.split(/\s/).filter((x) => x)
-        attr.value = arr
-          .map((x) => {
-            if (runtimeSet.has(x)) {
-              return classGenerator.generateClassName(x).name
-            }
-            return x
-          })
-          .join(' ')
+        const arr = splitCode(attr.value, {
+          splitQuote: false
+        })
+        for (let i = 0; i < arr.length; i++) {
+          const v = arr[i]
+          if (runtimeSet.has(v)) {
+            attr.value = attr.value.replace(makeRegex(v), classGenerator.generateClassName(v).name)
+          }
+        }
       }
     }
   })

packages/core/src/index.ts

@@ -1,4 +1,5 @@
 export * from './css'
 export * from './html'
 export * from './js'
-export { default as ClassGenerator } from './classGenerator'
+export { ClassGenerator } from './shared'
+export * from './types'

packages/core/src/js/index.ts

@@ -2,12 +2,7 @@ import type { StringLiteral, TemplateElement, CallExpression } from '@babel/type
 import * as t from '@babel/types'
 import { transformSync, type BabelFileResult, type NodePath } from '@babel/core'
 import type { IJsHandlerOptions } from '../types'
-import { escapeStringRegexp } from '../utils'
-import { splitCode } from './split'
-
-export function makeRegex(str: string) {
-  return new RegExp('(?<=^|[\\s"])' + escapeStringRegexp(str), 'g')
-}
+import { makeRegex, splitCode } from '../shared'
 
 export function handleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions) {
   const { runtimeSet: set, classGenerator: clsGen, splitQuote = true } = options

packages/core/src/shared.ts

@@ -0,0 +1 @@
+export * from 'tailwindcss-mangle-shared'

packages/core/src/types.ts

@@ -1,4 +1,4 @@
-import ClassGenerator from './classGenerator'
+import { ClassGenerator } from './shared'
 
 export interface IClassGeneratorContextItem {
   name: string
@@ -15,12 +15,6 @@ export interface IClassGeneratorOptions {
   classPrefix?: string
 }
 
-export interface IClassGenerator {
-  newClassMap: Record<string, IClassGeneratorContextItem>
-  newClassSize: number
-  context: Record<string, any>
-}
-
 export interface IHandlerOptions {
   runtimeSet: Set<string>
   classGenerator: ClassGenerator

packages/core/test/css.test.ts

@@ -1,5 +1,5 @@
 import { cssHandler } from '../src/css'
-import ClassGenerator from '../src/classGenerator'
+import { ClassGenerator } from '../src/shared'
 import { getTestCase } from './utils'
 describe('css', () => {
   let classGenerator: ClassGenerator

packages/core/test/exports.test.ts

@@ -1,8 +1,8 @@
-import { ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler, makeRegex } from '../'
+import { ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler } from '../'
 
 describe('exports', () => {
   it('exports should be defined', () => {
-    ;[ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler, makeRegex].forEach((x) => {
+    ;[ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler].forEach((x) => {
       expect(x).toBeDefined()
     })
   })