chore(test): add expect.extend

package.json

@@ -109,7 +109,7 @@
     "@commitlint/prompt-cli": "^19.7.0",
     "@commitlint/types": "^19.5.0",
     "@eslint/config-inspector": "^0.7.0",
-    "@icebreakers/eslint-config": "^0.7.8",
+    "@icebreakers/eslint-config": "^0.7.9",
     "@icebreakers/monorepo": "^0.6.21",
     "@icebreakers/readme": "0.1.0",
     "@icebreakers/stylelint-config": "^0.1.3",
@@ -210,7 +210,7 @@
     "prettier": "^3.4.2",
     "promisify-loader-runner": "^1.0.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.29.2",
+    "rollup": "^4.30.0",
     "rollup-plugin-visualizer": "^5.13.1",
     "sass": "^1.83.1",
     "sass-embedded": "^1.83.1",

packages/tailwind-merge-weapp-plugin/src/default-config.ts

@@ -1,3 +1,4 @@
+import type { Config, DefaultClassGroupIds, DefaultThemeGroupIds } from './types'
 // import type { Config, DefaultClassGroupIds, DefaultThemeGroupIds } from 'tailwind-merge'
 // import type { ThemeGetter } from 'tailwind-merge'
 import { fromTheme } from './from-theme'
@@ -77,6 +78,7 @@ export function getDefaultConfig() {
 
   return {
     // cacheSize: 500,
+    // separator: SimpleMappingChars2String[':'],
     // separator: ':',
     theme: {
       colors: [isAny],
@@ -1859,5 +1861,5 @@ export function getDefaultConfig() {
     conflictingClassGroupModifiers: {
       'font-size': ['leading'],
     },
-  }// as const  satisfies Omit<Config<DefaultClassGroupIds, DefaultThemeGroupIds>, 'cacheSize' | 'prefix' | 'separator'>
+  } as const satisfies Config<DefaultClassGroupIds, DefaultThemeGroupIds>// Omit<Config<DefaultClassGroupIds, DefaultThemeGroupIds>, 'cacheSize' | 'prefix' | 'separator'>
 }

packages/tailwind-merge-weapp-plugin/src/index.ts

@@ -2,13 +2,18 @@
 // https://github.com/dcastil/tailwind-merge/blob/main/src/lib/default-config.ts
 
 import type { Config } from 'tailwind-merge'
+import { SimpleMappingChars2String } from '@weapp-core/escape'
 import { mergeConfigs } from 'tailwind-merge'
 import { getDefaultConfig } from './default-config'
-
 // https://github.com/vltansky/tailwind-merge-rtl-plugin
 // https://github.com/kaelansmith/tailwind-extended-shadows-merge
 export function withWeapp(config: Config<string, string>): Config<string, string> {
   return mergeConfigs(config, {
+    separator: SimpleMappingChars2String[':'],
     extend: getDefaultConfig(),
   })
 }
+
+export {
+  getDefaultConfig,
+}

packages/tailwind-merge-weapp-plugin/test/arbitrary-properties.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('handles arbitrary property conflicts correctly', () => {
   expect(twMerge('[paint-order:markers] [paint-order:normal]')).toBe('[paint-order:normal]')

packages/tailwind-merge-weapp-plugin/test/arbitrary-values.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('handles simple conflicts with arbitrary values correctly', () => {
   expect(twMerge('m-[2px] m-[10px]')).toBe('m-[10px]')

packages/tailwind-merge-weapp-plugin/test/arbitrary-variants.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('basic arbitrary variants', () => {
   expect(twMerge('[&>*]:underline [&>*]:line-through')).toBe('[&>*]:line-through')

packages/tailwind-merge-weapp-plugin/test/class-group-conflicts.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('merges classes from same group correctly', () => {
   expect(twMerge('overflow-x-auto overflow-x-hidden')).toBe('overflow-x-hidden')

packages/tailwind-merge-weapp-plugin/test/colors.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('handles color conflicts properly', () => {
   expect(twMerge('bg-grey-5 bg-hotpink')).toBe('bg-hotpink')

packages/tailwind-merge-weapp-plugin/test/conflicts-across-class-groups.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('handles conflicts across class groups correctly', () => {
   expect(twMerge('inset-1 inset-x-1')).toBe('inset-1 inset-x-1')

packages/tailwind-merge-weapp-plugin/test/content-utilities.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('merges content utilities correctly', () => {
   expect(twMerge('content-[\'hello\'] content-[attr(data-content)]')).toBe(

packages/tailwind-merge-weapp-plugin/test/important-modifier.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('merges tailwind classes with important modifier correctly', () => {
   expect(twMerge('!font-medium !font-bold')).toBe('!font-bold')

packages/tailwind-merge-weapp-plugin/test/modifiers.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { createTailwindMerge, twMerge } from './utils'
+import { createTailwindMerge, replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('conflicts across prefix modifiers', () => {
   expect(twMerge('hover:block hover:inline')).toBe('hover:inline')

packages/tailwind-merge-weapp-plugin/test/negative-values.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('handles negative value conflicts correctly', () => {
   expect(twMerge('-m-2 -m-5')).toBe('-m-5')

packages/tailwind-merge-weapp-plugin/test/non-conflicting-classes.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('merges non-conflicting classes correctly', () => {
   expect(twMerge('border-t border-white/10')).toBe('border-t border-white/10')

packages/tailwind-merge-weapp-plugin/test/non-tailwind-classes.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('does not alter non-tailwind classes', () => {
   expect(twMerge('non-tailwind-class inline block')).toBe('non-tailwind-class block')

packages/tailwind-merge-weapp-plugin/test/per-side-border-colors.test.ts

@@ -1,6 +1,24 @@
 import { expect, it } from 'vitest'
 
-import { twMerge } from './utils'
+import { replaceJs, twMergeReplaceJs as twMerge } from './utils'
+
+expect.extend({
+  toBe: (received, expected) => {
+    const target = replaceJs(expected)
+    if (received !== target) {
+      return {
+        message: () => `expected ${received} to be ${target}`,
+        pass: false,
+      }
+    }
+    else {
+      return {
+        message: () => ``,
+        pass: true,
+      }
+    }
+  },
+})
 
 it('merges classes with per-side border colors correctly', () => {
   expect(twMerge('border-t-some-blue border-t-other-blue')).toBe('border-t-other-blue')