@primer/stylelint-config 12.7.1-rc.59e46db → 12.7.1-rc.7ed22ed

package/plugins/no-deprecated-colors.js

@@ -3,12 +3,12 @@ const matchAll = require('string.prototype.matchall')
 
 const ruleName = 'primer/no-deprecated-colors'
 const messages = stylelint.utils.ruleMessages(ruleName, {
-  rejected: (varName, replacement) => {
+  rejected: (varName, replacement, property) => {
     if (replacement === null) {
-      return `${varName} is a deprecated color variable. Please consult the primer color docs for a replacement. https://primer.style/primitives/storybook/?path=/story/migration-tables`
+      return `Variable ${varName} is deprecated for property ${property}. Please consult the primer color docs for a replacement. https://primer.style/primitives/storybook/?path=/story/migration-tables`
     }
 
-    return `${varName} is a deprecated color variable. Please use the replacement ${replacement}.`
+    return `Variable ${varName} is deprecated for property ${property}. Please use the replacement ${replacement}.`
   }
 })
 
@@ -32,7 +32,7 @@ module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, contex
   const seen = new WeakMap()
 
   // eslint-disable-next-line import/no-dynamic-require
-  const variableChecks = require(options.deprecatedFile || '../__tests__/__fixtures__/primitives-v8.json')
+  const variableChecks = require(options.deprecatedFile || './lib/primitives-v8.json')
 
   const lintResult = (root, result) => {
     // Walk all declarations
@@ -44,21 +44,21 @@ 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') {
-            for (const property of Object.keys(replacement)) {
-              if (node.prop.includes(property)) {
-                replacement = replacement[property]
-                break
+            if (node.prop) {
+              for (const prop of replacement) {
+                // Check if node.prop starts with one of the props array elements
+                if (prop['props'].some(p => node.prop.startsWith(p))) {
+                  replacement = prop['replacement']
+                  break
+                }
               }
             }
             if (typeof replacement === 'object') {
@@ -67,7 +67,7 @@ module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, contex
           }
 
           if (context.fix && replacement !== null) {
-            replacement = `${replacement}, var(${variableName})`
+            replacement = `${replacement}`
             replacedVars[variableName] = true
             newVars[replacement] = true
             if (node.type === 'atrule') {
@@ -79,7 +79,7 @@ module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}, contex
           }
 
           stylelint.utils.report({
-            message: messages.rejected(variableName, replacement),
+            message: messages.rejected(variableName, replacement, node.prop),
             node,
             ruleName,
             result