@primer/stylelint-config 12.7.1-rc.3de7c40 → 12.7.1-rc.410391d

package/CHANGELOG.md

@@ -4,14 +4,22 @@
 
 ### 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`
+
 ## 12.7.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/stylelint-config",
-  "version": "12.7.1-rc.3de7c40",
+  "version": "12.7.1-rc.410391d",
   "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/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"
     }
   ],
@@ -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,7 +811,16 @@
       "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"],
@@ -821,27 +835,35 @@
     {
       "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"],
-      "replacement": "--bgColor-default"
-    },
-    {
-      "props": ["border", "box-shadow"],
+      "props": ["background", "border", "box-shadow", "fill", "stroke"],
       "replacement": "--bgColor-default"
     }
   ],
@@ -859,19 +881,19 @@
   ],
   "--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", "outline"],
+      "props": ["border", "background", "outline", "box-shadow", "stroke"],
       "replacement": "--borderColor-muted"
     }
   ],
@@ -883,7 +905,7 @@
   ],
   "--color-neutral-emphasis-plus": [
     {
-      "props": ["background", "border", "color"],
+      "props": ["background", "border", "color", "stroke"],
       "replacement": "--bgColor-emphasis"
     }
   ],
@@ -897,7 +919,7 @@
       "replacement": "--borderColor-neutral-emphasis"
     },
     {
-      "props": ["color"],
+      "props": ["color", "fill"],
       "replacement": "--fgColor-neutral"
     }
   ],
@@ -915,11 +937,15 @@
     {
       "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"
     },
     {
@@ -929,6 +955,10 @@
     {
       "props": ["background"],
       "replacement": "--bgColor-accent-emphasis"
+    },
+    {
+      "props": ["outline"],
+      "replacement": "--focus-outlineColor"
     }
   ],
   "--color-accent-emphasis": [
@@ -941,8 +971,12 @@
       "replacement": "--borderColor-accent-emphasis"
     },
     {
-      "props": ["color", "fill"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-accent"
+    },
+    {
+      "props": ["outline"],
+      "replacement": "--focus-outlineColor"
     }
   ],
   "--color-accent-muted": [
@@ -959,11 +993,15 @@
     {
       "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"
     },
     {
@@ -989,6 +1027,10 @@
     {
       "props": ["border", "box-shadow"],
       "replacement": "--borderColor-success-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-success-muted"
     }
   ],
   "--color-success-subtle": [
@@ -1017,7 +1059,7 @@
       "replacement": "--borderColor-attention-emphasis"
     },
     {
-      "props": ["color"],
+      "props": ["color", "fill"],
       "replacement": "--fgColor-attention"
     }
   ],
@@ -1053,7 +1095,7 @@
       "replacement": "--borderColor-severe-emphasis"
     },
     {
-      "props": ["color"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-severe"
     }
   ],
@@ -1085,11 +1127,11 @@
       "replacement": "--bgColor-danger-emphasis"
     },
     {
-      "props": ["border", "box-shadow"],
+      "props": ["border", "box-shadow", "outline"],
       "replacement": "--borderColor-danger-emphasis"
     },
     {
-      "props": ["color"],
+      "props": ["color", "fill"],
       "replacement": "--fgColor-danger"
     }
   ],
@@ -1097,6 +1139,10 @@
     {
       "props": ["border", "box-shadow"],
       "replacement": "--borderColor-danger-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-danger-muted"
     }
   ],
   "--color-danger-subtle": [
@@ -1197,7 +1243,7 @@
       "replacement": "--borderColor-done-emphasis"
     },
     {
-      "props": ["color"],
+      "props": ["color", "fill", "stroke"],
       "replacement": "--fgColor-done"
     }
   ],
@@ -1205,6 +1251,10 @@
     {
       "props": ["border", "box-shadow"],
       "replacement": "--borderColor-done-muted"
+    },
+    {
+      "props": ["background"],
+      "replacement": "--bgColor-done-muted"
     }
   ],
   "--color-done-subtle": [
@@ -1279,7 +1329,7 @@
       "replacement": "--avatar-shadow"
     }
   ],
-  "color-btn-text": [
+  "--color-btn-text": [
     {
       "props": ["color"],
       "replacement": "--button-default-fgColor-rest"

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') {