fix: issue 317 test

francoismassart · Mar 11, 2024 · a384e32 · a384e32
1 parent 6e3f995
commit a384e32
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/rules/enforces-shorthand.js b/lib/rules/enforces-shorthand.js
@@ -244,11 +244,11 @@ module.exports = {
           // Test if the body of the class matches, eg. 'h-' inside 'h-10'
           if (mode === 'value') {
             const bodyMatch = inputSet.some((inputClassPattern) => inputClassPattern === remainingClass.body);
-            if (mergedConfig.theme.size === undefined) {
+            if ([undefined, null].includes(mergedConfig.theme.size)) {
               return false;
             }
             // w-screen + h-screen ≠ size-screen (Issue #307)
-            const sizeKeys = Object.keys(mergedConfig.theme.size || {});
+            const sizeKeys = Object.keys(mergedConfig.theme.size);
             const isSize = ['w-', 'h-'].includes(remainingClass.body);
             const isValidSize = sizeKeys.includes(remainingClass.value);
             const wValue = mergedConfig.theme.width[remainingClass.value];

diff --git a/lib/rules/no-unnecessary-arbitrary-value.js b/lib/rules/no-unnecessary-arbitrary-value.js
@@ -194,6 +194,9 @@ module.exports = {
           const isNegativeValue = arbitraryValue.indexOf('-') === 0;
           const configurationKey = configKeys[groupIdx];
           const configuration = mergedConfig.theme[configurationKey];
+          if ([undefined, null].includes(configuration)) {
+            return false;
+          }
           const configurationKeys = Object.keys(configuration);
           const zeroValueWithOrWithoutUnitsPattern = new RegExp(validZeroRegEx, 'i');
           const isZeroArbitraryValue = zeroValueWithOrWithoutUnitsPattern.test(arbitraryValue);

diff --git a/tests/lib/rules/no-unnecessary-arbitrary-value.js b/tests/lib/rules/no-unnecessary-arbitrary-value.js
@@ -68,6 +68,12 @@ ruleTester.run("arbitrary-values", rule, {
       `,
       options: config,
     },
+    {
+      code: `
+      <pre class="![clip:rect(0,0,0,0)]">issue #317</pre>
+      `,
+      options: config,
+    },
   ],
 
   invalid: [