fix: 移除 uni-app x 的 space 布局支持

Author: sonofmagic

packages/postcss/test/uni-app-x.test.ts

@@ -111,6 +111,12 @@ describe('uni-app-x', () => {
       .gap-4 {
         gap: 1rem;
       }
+      .gap-x-3 {
+        column-gap: 0.75rem;
+      }
+      .gap-y-2 {
+        row-gap: 0.5rem;
+      }
       .min-h-screen {
         min-height: 100vh;
       }
@@ -134,6 +140,8 @@ describe('uni-app-x', () => {
     expect(result.css).not.toContain('display: grid')
     expect(result.css).not.toContain('grid-template-columns')
     expect(result.css).not.toContain('gap: 1rem')
+    expect(result.css).not.toContain('column-gap: 0.75rem')
+    expect(result.css).not.toContain('row-gap: 0.5rem')
     expect(result.css).not.toContain('min-height: 100vh')
     expect(result.css).toContain('.flex')
     expect(result.css).toContain('display: flex')
@@ -146,6 +154,8 @@ describe('uni-app-x', () => {
       expect.stringContaining('grid'),
       expect.stringContaining('grid-cols-2'),
       expect.stringContaining('gap-4'),
+      expect.stringContaining('gap-x-3'),
+      expect.stringContaining('gap-y-2'),
       expect.stringContaining('min-h-screen'),
     ]))
     expect(warningTexts.every(item => item.includes('/src/App.uvue'))).toBe(true)

packages/weapp-tailwindcss/src/uni-app-x/space-style.ts

@@ -1,4 +1,4 @@
-import type { AttributeNode, DirectiveNode, ElementNode, ParentNode } from '@vue/compiler-dom'
+import type { AttributeNode, DirectiveNode, ParentNode } from '@vue/compiler-dom'
 import type { TransformResult } from 'vite'
 import type { CreateJsHandlerOptions, ICustomAttributesEntities, JsHandler } from '@/types'
 import { NodeTypes } from '@vue/compiler-dom'
@@ -7,7 +7,6 @@ import MagicString from 'magic-string'
 import { generateCode, replaceWxml } from '@/wxml'
 import { createAttributeMatcher } from '@/wxml/custom-attributes'
 import { shouldEnableComponentLocalStyle, UniAppXComponentLocalStyleCollector } from './component-local-style'
-import { UniAppXSpaceStyleCollector } from './space-style'
 
 function traverse(node: ParentNode, visitor: (node: ParentNode) => void): void {
   visitor(node)
@@ -128,11 +127,6 @@ const defaultCreateJsHandlerOptions: CreateJsHandlerOptions = {
 }
 const UVUE_NVUE_RE = /\.(?:uvue|nvue)(?:\?.*)?$/
 
-function insertClassAttribute(ms: MagicString, node: ElementNode, className: string) {
-  const insertOffset = node.loc.start.offset + 1 + node.tag.length
-  ms.appendLeft(insertOffset, ` class="${className}"`)
-}
-
 export function transformUVue(
   code: string,
   id: string,
@@ -147,18 +141,11 @@ export function transformUVue(
   const matchCustomAttribute = createAttributeMatcher(customAttributesEntities)
   const ms = new MagicString(code)
   const { descriptor, errors } = parse(code)
-  const spaceStyleCollector = new UniAppXSpaceStyleCollector(id)
   const localStyleCollector = options.enableComponentLocalStyle && shouldEnableComponentLocalStyle(id)
     ? new UniAppXComponentLocalStyleCollector(id, runtimeSet)
     : undefined
   if (errors.length === 0) {
     if (descriptor.template?.ast) {
-      traverse(descriptor.template.ast, (node) => {
-        if (node.type === NodeTypes.ELEMENT) {
-          spaceStyleCollector.collect(node)
-        }
-      })
-
       traverse(descriptor.template.ast, (node) => {
         if (node.type !== NodeTypes.ELEMENT) {
           return
@@ -175,14 +162,11 @@ export function transformUVue(
             if (!shouldHandle) {
               continue
             }
-            const staticClassRewrite = shouldHandleDefault
-              ? spaceStyleCollector.getStaticClassRewrite(prop)
-              : undefined
             if (shouldHandleDefault && localStyleCollector) {
-              updateStaticAttributeWithLocalStyle(ms, prop, localStyleCollector, staticClassRewrite)
+              updateStaticAttributeWithLocalStyle(ms, prop, localStyleCollector)
             }
             else {
-              updateStaticAttribute(ms, prop, staticClassRewrite)
+              updateStaticAttribute(ms, prop)
             }
             if (shouldHandleDefault) {
               continue
@@ -204,29 +188,20 @@ export function transformUVue(
             if (!shouldHandle) {
               continue
             }
-            const directiveExpressionRewrite = attrName.toLowerCase() === 'class'
-              ? spaceStyleCollector.getDirectiveExpressionRewrite(prop)
-              : undefined
             if (attrName.toLowerCase() === 'class' && localStyleCollector) {
               updateDirectiveExpressionWithLocalStyle(
                 ms,
                 prop,
                 jsHandler,
                 localStyleCollector,
                 runtimeSet,
-                directiveExpressionRewrite,
               )
             }
             else {
-              updateDirectiveExpression(ms, prop, jsHandler, runtimeSet, directiveExpressionRewrite)
+              updateDirectiveExpression(ms, prop, jsHandler, runtimeSet)
             }
           }
         }
-
-        const insertedClass = spaceStyleCollector.getInsertedClass(node)
-        if (insertedClass) {
-          insertClassAttribute(ms, node, insertedClass)
-        }
       })
     }
 
@@ -252,9 +227,6 @@ export function transformUVue(
     if (localStyleCollector?.hasStyles()) {
       ms.append(`\n${localStyleCollector.toStyleBlock()}`)
     }
-    if (spaceStyleCollector.hasStyles()) {
-      ms.append(`\n${spaceStyleCollector.toStyleBlock()}`)
-    }
   }
   return {
     code: ms.toString(),