Merge pull request #70 from primer/mkt/fix-css-var-scan

Allow CSS variables with fallback values in no-undefined-vars
primer · Oct 29, 2020 · bf6099f · bf6099f
2 parents 0e07d72 + 4ec12d6
commit bf6099f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/__tests__/no-undefined-vars.js b/__tests__/no-undefined-vars.js
@@ -16,6 +16,7 @@ testRule({
 
   accept: [
     {code: '.x { color: var(--color-text-primary); }'},
+    {code: '.x { color: var(--color-text-primary, #000000); }'},
     {code: '.x { background-color: var(--color-counter-bg); }'},
     {code: '.x { margin: var(--spacing-spacer-1); }'}
   ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-primer",
-  "version": "9.2.2",
+  "version": "9.2.3",
   "description": "Sharable stylelint config used by GitHub's CSS",
   "homepage": "http://primer.style/css/tools/linting",
   "author": "GitHub, Inc.",

diff --git a/plugins/no-undefined-vars.js b/plugins/no-undefined-vars.js
@@ -14,7 +14,7 @@ const variableDefinitionRegex = /(--[\w|-]*):/g
 
 // Match CSS variable references (e.g var(--color-text-primary))
 // eslint-disable-next-line no-useless-escape
-const variableReferenceRegex = /var\(([^\)]*)\)/g
+const variableReferenceRegex = /var\(([^\),]*)\)/g
 
 module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}) => {
   if (!enabled) {