@primer/stylelint-config 12.7.1-rc.c4a4e27 → 12.7.1-rc.ff27b7e

package/CHANGELOG.md

@@ -4,12 +4,24 @@
 
 ### Patch Changes
 
+- [#338](https://github.com/primer/stylelint-config/pull/338) [`7cc4c08`](https://github.com/primer/stylelint-config/commit/7cc4c08f6465f495df89fc0609d3cdf012480dec) Thanks [@langermank](https://github.com/langermank)! - Add more tests to `no-deprecated-colors`
+
 - [#328](https://github.com/primer/stylelint-config/pull/328) [`5ae7400`](https://github.com/primer/stylelint-config/commit/5ae7400340afc2cd21006093ce7b33206a00372e) Thanks [@langermank](https://github.com/langermank)! - Fix failing tests in no-deprecated-colors
 
+- [#337](https://github.com/primer/stylelint-config/pull/337) [`6bf0fd6`](https://github.com/primer/stylelint-config/commit/6bf0fd624a69b21e48803ba62a5b2b9dc21b8d8c) Thanks [@langermank](https://github.com/langermank)! - Remove inline fallback var for no-deprecated-colors
+
 - [#332](https://github.com/primer/stylelint-config/pull/332) [`6485cf0`](https://github.com/primer/stylelint-config/commit/6485cf053f502d71a8ce8c407ad01a939038959c) Thanks [@langermank](https://github.com/langermank)! - Updated deprecated json color file
 
+- [#333](https://github.com/primer/stylelint-config/pull/333) [`485ce04`](https://github.com/primer/stylelint-config/commit/485ce047d75a635134919678a776ea808604cf4a) Thanks [@langermank](https://github.com/langermank)! - Adding more color replacements for deprecated colors
+
+- [#340](https://github.com/primer/stylelint-config/pull/340) [`4688bb4`](https://github.com/primer/stylelint-config/commit/4688bb4c0ea7975672b76af8706b80278f00f1a4) Thanks [@langermank](https://github.com/langermank)! - add inlineFallback prop to no-deprecated-colors
+
 - [#322](https://github.com/primer/stylelint-config/pull/322) [`726d7d1`](https://github.com/primer/stylelint-config/commit/726d7d1bf4eac82a032c448cb0be32d5bf66b29a) Thanks [@jonrohan](https://github.com/jonrohan)! - Updating no-deprecated-colors for primitives v8
 
+- [#334](https://github.com/primer/stylelint-config/pull/334) [`b14c154`](https://github.com/primer/stylelint-config/commit/b14c154174ddd7190e62fe1d26698fc9cfe75c17) Thanks [@langermank](https://github.com/langermank)! - More tests for `no-deprecated-colors`
+
+- [#339](https://github.com/primer/stylelint-config/pull/339) [`36fade4`](https://github.com/primer/stylelint-config/commit/36fade45bdc431d223165f5d7226c10cf6591d83) Thanks [@langermank](https://github.com/langermank)! - Update plugins to support Primitives v8
+
 ## 12.7.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/stylelint-config",
-  "version": "12.7.1-rc.c4a4e27",
+  "version": "12.7.1-rc.ff27b7e",
   "description": "Sharable stylelint config used by GitHub's CSS",
   "homepage": "http://primer.style/css/tools/linting",
   "author": "GitHub, Inc.",
@@ -42,9 +42,9 @@
     "@changesets/cli": "2.26.1",
     "@github/prettier-config": "0.0.4",
     "@primer/css": "^20.0.0",
-    "@primer/primitives": "^7.8.3",
+    "@primer/primitives": "^7.11.11",
     "dedent": "0.7.0",
-    "eslint": "8.22.0",
+    "eslint": "8.39.0",
     "eslint-plugin-github": "4.3.5",
     "eslint-plugin-jest": "27.0.1",
     "eslint-plugin-prettier": "4.2.1",

package/plugins/borders.js

@@ -31,9 +31,11 @@ module.exports = createVariableRule(
         '$border-*',
         'transparent',
         'currentColor',
-        // Match variables in any of the following formats: --color-border-*, --color-*-border-*, --color-*-border
+        // Match variables in any of the following formats: --color-border-*, --color-*-border-*, --color-*-border, --borderColor-, *borderColor*
         /var\(--color-(.+-)*border(-.+)*\)/,
-        /var\(--color-[^)]+\)/
+        /var\(--color-[^)]+\)/,
+        /var\(--borderColor-[^)]+\)/,
+        /var\((.+-)*borderColor(-.+)*\)/
       ],
       replacements: {
         '$border-gray': '$border-color'

package/plugins/box-shadow.js

@@ -10,8 +10,10 @@ module.exports = createVariableRule(
         '$box-shadow*',
         '$*-shadow',
         'none',
-        // Match variables in any of the following formats: --color-shadow-*, --color-*-shadow-*, --color-*-shadow
-        /var\(--color-(.+-)*shadow(-.+)*\)/
+        // Match variables in any of the following formats: --color-shadow-*, --color-*-shadow-*, --color-*-shadow, --shadow-*, *shadow*
+        /var\(--color-(.+-)*shadow(-.+)*\)/,
+        /var\(--shadow(-.+)*\)/,
+        /var\((.+-)*shadow(-.+)*\)/
       ],
       singular: true
     }

package/plugins/colors.js

@@ -3,9 +3,13 @@ const {createVariableRule} = require('./lib/variable-rules')
 const bgVars = [
   '$bg-*',
   '$tooltip-background-color',
-  // Match variables in any of the following formats: --color-bg-*, --color-*-bg-*, --color-*-bg
+  // Match variables in any of the following formats: --color-bg-*, --color-*-bg-*, --color-*-bg, *bgColor*, *fgColor*, *borderColor*, *iconColor*
   /var\(--color-(.+-)*bg(-.+)*\)/,
-  /var\(--color-[^)]+\)/
+  /var\(--color-[^)]+\)/,
+  /var\((.+-)*bgColor(-.+)*\)/,
+  /var\((.+-)*fgColor(-.+)*\)/,
+  /var\((.+-)*borderColor(-.+)*\)/,
+  /var\((.+-)*iconColor(-.+)*\)/
 ]
 
 module.exports = createVariableRule(
@@ -26,10 +30,12 @@ module.exports = createVariableRule(
         '$text-*',
         '$tooltip-text-color',
         'inherit',
-        // Match variables in any of the following formats: --color-text-*, --color-*-text-*, --color-*-text
+        // Match variables in any of the following formats: --color-text-*, --color-*-text-*, --color-*-text, *fgColor*, *iconColor*
         /var\(--color-(.+-)*text(-.+)*\)/,
         /var\(--color-(.+-)*fg(-.+)*\)/,
-        /var\(--color-[^)]+\)/
+        /var\(--color-[^)]+\)/,
+        /var\((.+-)*fgColor(-.+)*\)/,
+        /var\((.+-)*iconColor(-.+)*\)/
       ]
     }
   },

package/plugins/lib/primitives-v8.json

@@ -219,7 +219,7 @@
   ],
   "--color-header-divider": [
     {
-      "props": ["border", "background"],
+      "props": ["border", "background", "color"],
       "replacement": "--header-borderColor-divider"
     }
   ],
@@ -231,7 +231,7 @@
   ],
   "--color-header-search-bg": [
     {
-      "props": ["background"],
+      "props": ["background", "background-color"],
       "replacement": "--headerSearch-bgColor"
     }
   ],
@@ -249,7 +249,7 @@
   ],
   "--color-avatar-border": [
     {
-      "props": ["border", "background"],
+      "props": ["border", "background", "box-shadow"],
       "replacement": "--avatar-borderColor"
     }
   ],
@@ -604,7 +604,7 @@
   "--color-action-list-item-inline-divider": [
     {
       "props": ["border", "background"],
-      "replacement": "--borderColor-decorative"
+      "replacement": "--borderColor-muted"
     }
   ],
   "--color-action-list-item-default-hover-bg": [
@@ -727,7 +727,12 @@
       "replacement": "--control-checked-fgColor-disabled"
     }
   ],
-  "--color-switch-track-checked-border": [],
+  "--color-switch-track-checked-border": [
+    {
+      "props": ["border"],
+      "replacement": "--borderColor-transparent"
+    }
+  ],
   "--color-switch-knob-bg": [
     {
       "props": ["background"],
@@ -806,34 +811,59 @@
       "replacement": "--treeViewItem-leadingVisual-bgColor-rest"
     }
   ],
-  "--color-canvas-default-transparent": [],
+  "--color-canvas-default-transparent": [
+    {
+      "props": ["background", "color"],
+      "replacement": "--bgColor-transparent"
+    },
+    {
+      "props": ["border"],
+      "replacement": "--borderColor-transparent"
+    }
+  ],
   "--color-fg-default": [
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-default"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--fgColor-default"
     }
   ],
   "--color-fg-muted": [
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-neutral-emphasis"
+    },
+    {
+      "props": ["border"],
+      "replacement": "--borderColor-neutral-emphasis"
     }
   ],
   "--color-fg-subtle": [
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-muted"
+    },
+    {
+      "props": ["border"],
+      "replacement": "--borderColor-neutral-emphasis"
     }
   ],
   "--color-fg-on-emphasis": [
     {
-      "props": ["color", "fill"],
+      "props": ["color", "fill", "border"],
       "replacement": "--fgColor-onEmphasis"
     }
   ],
   "--color-canvas-default": [
     {
-      "props": ["background"],
+      "props": ["background", "border", "box-shadow", "fill", "stroke"],
       "replacement": "--bgColor-default"
     }
   ],
@@ -851,31 +881,31 @@
   ],
   "--color-canvas-subtle": [
     {
-      "props": ["background"],
+      "props": ["background", "fill", "border"],
       "replacement": "--bgColor-muted"
     }
   ],
   "--color-border-default": [
     {
-      "props": ["border", "background", "box-shadow"],
+      "props": ["border", "background", "box-shadow", "stroke", "outline", "fill"],
       "replacement": "--borderColor-default"
     }
   ],
   "--color-border-muted": [
     {
-      "props": ["border", "background"],
+      "props": ["border", "background", "outline", "box-shadow", "stroke"],
       "replacement": "--borderColor-muted"
     }
   ],
   "--color-border-subtle": [
     {
-      "props": ["border", "background"],
+      "props": ["border", "background", "outline"],
       "replacement": "--borderColor-muted"
     }
   ],
   "--color-neutral-emphasis-plus": [
     {
-      "props": ["background", "border", "color"],
+      "props": ["background", "border", "color", "stroke"],
       "replacement": "--bgColor-emphasis"
     }
   ],
@@ -885,13 +915,17 @@
       "replacement": "--bgColor-neutral-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-neutral-emphasis"
+    },
+    {
+      "props": ["color", "fill"],
+      "replacement": "--fgColor-neutral"
     }
   ],
   "--color-neutral-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-neutral-muted"
     },
     {
@@ -903,16 +937,28 @@
     {
       "props": ["background"],
       "replacement": "--bgColor-neutral-muted"
+    },
+    {
+      "props": ["border", "box-shadow"],
+      "replacement": "--borderColor-neutral-muted"
     }
   ],
   "--color-accent-fg": [
     {
-      "props": ["color", "fill"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-accent"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-accent-emphasis"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-accent-emphasis"
+    },
+    {
+      "props": ["outline"],
+      "replacement": "--focus-outlineColor"
     }
   ],
   "--color-accent-emphasis": [
@@ -921,30 +967,46 @@
       "replacement": "--bgColor-accent-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-accent-emphasis"
     },
     {
-      "props": ["color", "fill"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-accent"
+    },
+    {
+      "props": ["outline"],
+      "replacement": "--focus-outlineColor"
     }
   ],
   "--color-accent-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-accent-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-accent-muted"
     }
   ],
   "--color-accent-subtle": [
     {
       "props": ["background"],
       "replacement": "--bgColor-accent-muted"
+    },
+    {
+      "props": ["border", "box-shadow"],
+      "replacement": "--borderColor-accent-muted"
     }
   ],
   "--color-success-fg": [
     {
-      "props": ["color", "fill"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-success"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-success-emphasis"
     }
   ],
   "--color-success-emphasis": [
@@ -953,14 +1015,22 @@
       "replacement": "--bgColor-success-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-success-emphasis"
+    },
+    {
+      "props": ["color"],
+      "replacement": "--fgColor-success"
     }
   ],
   "--color-success-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-success-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-success-muted"
     }
   ],
   "--color-success-subtle": [
@@ -973,6 +1043,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-attention"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-attention-emphasis"
     }
   ],
   "--color-attention-emphasis": [
@@ -981,13 +1055,17 @@
       "replacement": "--bgColor-attention-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-attention-emphasis"
+    },
+    {
+      "props": ["color", "fill"],
+      "replacement": "--fgColor-attention"
     }
   ],
   "--color-attention-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-attention-muted"
     }
   ],
@@ -1001,6 +1079,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-severe"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-severe-emphasis"
     }
   ],
   "--color-severe-emphasis": [
@@ -1009,13 +1091,17 @@
       "replacement": "--bgColor-severe-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-severe-emphasis"
+    },
+    {
+      "props": ["color", "fill", "stroke"],
+      "replacement": "--fgColor-severe"
     }
   ],
   "--color-severe-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-severe-muted"
     }
   ],
@@ -1029,6 +1115,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-danger"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-danger-emphasis"
     }
   ],
   "--color-danger-emphasis": [
@@ -1037,14 +1127,22 @@
       "replacement": "--bgColor-danger-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow", "outline"],
       "replacement": "--borderColor-danger-emphasis"
+    },
+    {
+      "props": ["color", "fill"],
+      "replacement": "--fgColor-danger"
     }
   ],
   "--color-danger-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-danger-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-danger-muted"
     }
   ],
   "--color-danger-subtle": [
@@ -1057,6 +1155,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-open"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-open-emphasis"
     }
   ],
   "--color-open-emphasis": [
@@ -1065,13 +1167,17 @@
       "replacement": "--bgColor-open-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-open-emphasis"
+    },
+    {
+      "props": ["color"],
+      "replacement": "--fgColor-open"
     }
   ],
   "--color-open-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-open-muted"
     }
   ],
@@ -1085,6 +1191,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-closed"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-closed-emphasis"
     }
   ],
   "--color-closed-emphasis": [
@@ -1093,13 +1203,17 @@
       "replacement": "--bgColor-closed-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-closed-emphasis"
+    },
+    {
+      "props": ["color"],
+      "replacement": "--fgColor-closed"
     }
   ],
   "--color-closed-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-closed-muted"
     }
   ],
@@ -1113,6 +1227,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-done"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-done-emphasis"
     }
   ],
   "--color-done-emphasis": [
@@ -1121,14 +1239,22 @@
       "replacement": "--bgColor-done-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-done-emphasis"
+    },
+    {
+      "props": ["color", "fill", "stroke"],
+      "replacement": "--fgColor-done"
     }
   ],
   "--color-done-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-done-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-done-muted"
     }
   ],
   "--color-done-subtle": [
@@ -1141,6 +1267,10 @@
     {
       "props": ["color", "fill"],
       "replacement": "--fgColor-sponsors"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-sponsors-emphasis"
     }
   ],
   "--color-sponsors-emphasis": [
@@ -1149,13 +1279,17 @@
       "replacement": "--bgColor-sponsors-emphasis"
     },
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-sponsors-emphasis"
+    },
+    {
+      "props": ["color"],
+      "replacement": "--fgColor-sponsors"
     }
   ],
   "--color-sponsors-muted": [
     {
-      "props": ["border"],
+      "props": ["border", "box-shadow"],
       "replacement": "--borderColor-sponsors-muted"
     }
   ],
@@ -1195,6 +1329,12 @@
       "replacement": "--avatar-shadow"
     }
   ],
+  "--color-btn-text": [
+    {
+      "props": ["color"],
+      "replacement": "--button-default-fgColor-rest"
+    }
+  ],
   "--color-btn-shadow": [
     {
       "props": ["box-shadow"],

package/plugins/no-deprecated-colors.js

@@ -20,6 +20,8 @@ const replacedVars = {}
 const newVars = {}
 
 module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, context) => {
+  const {inlineFallback = false} = options
+
   if (!enabled) {
     return noop
   }
@@ -44,14 +46,11 @@ module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, contex
       }
 
       // walk these nodes
-      if (!(node.type === 'decl' || node.type === 'atrule')) {
+      if (node.type !== 'decl') {
         return
       }
 
-      for (const [, variableName] of matchAll(
-        node.type === 'atrule' ? node.params : node.value,
-        variableReferenceRegex
-      )) {
+      for (const [, variableName] of matchAll(node.value, variableReferenceRegex)) {
         if (variableName in variableChecks) {
           let replacement = variableChecks[variableName]
           if (typeof replacement === 'object') {
@@ -70,7 +69,7 @@ module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, contex
           }
 
           if (context.fix && replacement !== null) {
-            replacement = `${replacement}, var(${variableName})`
+            replacement = `${replacement}${inlineFallback ? `, var(${variableName})` : ''}`
             replacedVars[variableName] = true
             newVars[replacement] = true
             if (node.type === 'atrule') {