Revert "Add custom-property-disallowed-list stylelint-polaris plugin"

stylelint-polaris/plugins/custom-property-allowed-list/index.js

@@ -16,25 +16,18 @@ const messages = stylelint.utils.ruleMessages(ruleName, {
    * @type {stylelint.RuleMessageFunc}
    */
   rejected: (prop, value, prefix, isInvalidProp, invalidValues) => {
-    const invalidPropertyMessage = isInvalidProp
-      ? `Unexpected prefix "${prefix}" for defined custom property "${prop}" - Properties with prefixes "--p-" or "--pc-" cannot be defined outside of Polaris"`
-      : null;
-
-    const plural = invalidValues?.length > 1;
-
-    const invalidValueMessage = invalidValues
-      ? `Unexpected value "${value}" for property "${prop}" - Token${
-          plural ? 's' : ''
-        } ${invalidValues.map((token) => `"${token}"`).join(', ')} ${
-          plural ? 'are' : 'is'
-        } either private or ${plural ? 'do' : 'does'} not exist`
-      : null;
-
-    const message = [invalidPropertyMessage, invalidValueMessage]
-      .filter(Boolean)
-      .join('. ');
+    if (isInvalidProp) {
+      return `Unexpected prefix "${prefix}" for defined custom property "${prop}" - Properties with prefixes "--p-" or "--pc-" cannot be defined outside of Polaris"`;
+    }
 
-    return message;
+    if (invalidValues) {
+      const plural = invalidValues.length > 1;
+      return `Unexpected value "${value}" for property "${prop}" - Token${
+        plural ? 's' : ''
+      } ${invalidValues.map((token) => `"${token}"`).join(', ')} ${
+        plural ? 'are' : 'is'
+      } either private or ${plural ? 'do' : 'does'} not exist`;
+    }
   },
 });
 
@@ -89,7 +82,7 @@ const {rule} = stylelint.createPlugin(
           value,
         );
 
-        if (isInvalidProperty || invalidValues) {
+        if (isInvalidProperty) {
           stylelint.utils.report({
             message: messages.rejected(
               prop,
@@ -103,6 +96,21 @@ const {rule} = stylelint.createPlugin(
             ruleName,
           });
         }
+
+        if (invalidValues) {
+          stylelint.utils.report({
+            message: messages.rejected(
+              prop,
+              value,
+              undefined,
+              isInvalidProperty,
+              invalidValues,
+            ),
+            node: decl,
+            result,
+            ruleName,
+          });
+        }
       });
     };
   },
@@ -114,9 +122,7 @@ const {rule} = stylelint.createPlugin(
  * @returns {string}
  */
 function getCustomPropertyPrefix(property) {
-  return isCustomProperty(property)
-    ? `--${property.split('-')[2]}-`
-    : undefined;
+  return `--${property.split('-')[2]}-`;
 }
 
 /**

stylelint-polaris/plugins/custom-property-allowed-list/index.test.js

@@ -96,31 +96,5 @@ testRule({
       endLine: 1,
       endColumn: 28,
     },
-    {
-      code: '.a { --p-foo: var(--p-bar); }',
-      description: 'Using disallowed --p- prefixed custom property and value',
-      message: messages.rejected('--p-foo', 'var(--p-bar)', '--p-', true, [
-        '--p-bar',
-      ]),
-      line: 1,
-      column: 6,
-      endLine: 1,
-      endColumn: 28,
-    },
-    {
-      code: '.a { --p-foo: var(--p-bar) solid var(--p-baz); }',
-      description: 'Using disallowed --p- prefixed custom property and values',
-      message: messages.rejected(
-        '--p-foo',
-        'var(--p-bar) solid var(--p-baz)',
-        '--p-',
-        true,
-        ['--p-bar', '--p-baz'],
-      ),
-      line: 1,
-      column: 6,
-      endLine: 1,
-      endColumn: 47,
-    },
   ],
 });