Merge remote-tracking branch 'origin/dev/rc' into rc

master-co · Apr 29, 2024 · 6db802d · 6db802d
2 parents ad97755 + eaa6b5e
commit 6db802d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/core/src/common.ts b/packages/core/src/common.ts
@@ -17,7 +17,7 @@ export const AT_SIGN = '@'
 export const VALUE_UNITS = ['%', 'cm', 'mm', 'q', 'in', 'pt', 'pc', 'px', 'em', 'rem', 'ex', 'rex', 'cap', 'rcap', 'ch', 'rch', 'ic', 'ric', 'lh', 'rlh', 'vw', 'svw', 'lvw', 'dvw', 'vh', 'svh', 'lvh', 'dvh', 'vi', 'svi', 'lvi', 'dvi', 'vb', 'svb', 'lvb', 'dvb', 'vmin', 'svmin', 'lvmin', 'dvmin', 'vmax', 'svmax', 'lvmax', 'dvmax', 'cqw', 'cqh', 'cqi', 'cqb', 'cqmin', 'cqmax', 'deg', 'grad', 'rad', 'turn', 's', 'ms', 'hz', 'khz', 'dpi', 'dpcm', 'dppx', 'x', 'fr', 'db', 'st']
 export const UNIT_REGEX = /^([+-.]?\d+(\.?\d+)?)(%|cm|mm|q|in|pt|pc|px|em|rem|ex|rex|cap|rcap|ch|rch|ic|ric|lh|rlh|vw|svw|lvw|dvw|vh|svh|lvh|dvh|vi|svi|lvi|dvi|vb|svb|lvb|dvb|vmin|svmin|lvmin|dvmin|vmax|svmax|lvmax|dvmax|cqw|cqh|cqi|cqb|cqmin|cqmax|deg|grad|rad|turn|s|ms|hz|khz|dpi|dpcm|dppx|x|fr|db|st)?$/
 export const IMAGE_VALUE_REGEX = /(?:url|linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|conic-gradient)\(.*\)/
-export const COLOR_VALUE_REGEX = /(?:#|(?:color|color-contrast|color-mix|hwb|lab|lch|oklab|oklch|rgb|rgba|hsl|hsla)\\(.*\\)|(?:\$colors)(?![a-zA-Z0-9-]))/
+export const COLOR_VALUE_REGEX = /(?:#|(?:color|color-contrast|color-mix|hwb|lab|lch|oklab|oklch|rgb|rgba|hsl|hsla)\(.*\)|(?:\$colors)(?![a-zA-Z0-9-]))/
 export const NUMBER_VALUE_REGEX = /(?:[\d.]|(?:max|min|calc|clamp)\(.*\))/
 export const OFFICIAL_URL = new URL('https://rc.css.master.co')
 export const CLASS_ATTRIBUTES = ['class', 'className']

diff --git a/packages/core/tests/rules/border-color.test.ts b/packages/core/tests/rules/border-color.test.ts
@@ -1,25 +1,31 @@
 it('validates border-color rules', () => {
     expect(new MasterCSS().create('b:white')?.text).toContain('border-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('b:rgb(0,0,0,0.75)')?.text).toContain('border-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border:white')?.text).toContain('border-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-color:white')?.text).toContain('border-color:rgb(255 255 255)')
 
     expect(new MasterCSS().create('bb:white')?.text).toContain('border-bottom-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('bb:rgb(0,0,0,0.75)')?.text).toContain('border-bottom-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border-bottom:white')?.text).toContain('border-bottom-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-bottom-color:white')?.text).toContain('border-bottom-color:rgb(255 255 255)')
 
     expect(new MasterCSS().create('bt:white')?.text).toContain('border-top-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('bt:rgb(0,0,0,0.75)')?.text).toContain('border-top-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border-top:white')?.text).toContain('border-top-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-top-color:white')?.text).toContain('border-top-color:rgb(255 255 255)')
 
     expect(new MasterCSS().create('bl:white')?.text).toContain('border-left-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('bl:rgb(0,0,0,0.75)')?.text).toContain('border-left-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border-left:white')?.text).toContain('border-left-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-left-color:white')?.text).toContain('border-left-color:rgb(255 255 255)')
 
     expect(new MasterCSS().create('br:white')?.text).toContain('border-right-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('br:rgb(0,0,0,0.75)')?.text).toContain('border-right-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border-right:white')?.text).toContain('border-right-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-right-color:white')?.text).toContain('border-right-color:rgb(255 255 255)')
 
     expect(new MasterCSS().create('bx:white')?.text).toContain('border-left-color:rgb(255 255 255);border-right-color:rgb(255 255 255)')
+    expect(new MasterCSS().create('bx:rgb(0,0,0,0.75)')?.text).toContain('border-left-color:rgb(0,0,0,0.75);border-right-color:rgb(0,0,0,0.75)')
     expect(new MasterCSS().create('border-x:white')?.text).toContain('border-left-color:rgb(255 255 255);border-right-color:rgb(255 255 255)')
     expect(new MasterCSS().create('border-x-color:white')?.text).toContain('border-left-color:rgb(255 255 255);border-right-color:rgb(255 255 255)')