@patternfly/react-tokens 4.71.2 → 4.72.2

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.72.2 (2022-05-31)
+
+**Note:** Version bump only for package @patternfly/react-tokens
+
+
+
+
+
+## 4.72.1 (2022-05-31)
+
+**Note:** Version bump only for package @patternfly/react-tokens
+
+
+
+
+
+# 4.72.0 (2022-05-31)
+
+
+### Features
+
+* **table:** add fullscreen demo for error state ([#7443](https://github.com/patternfly/patternfly-react/issues/7443)) ([eeab219](https://github.com/patternfly/patternfly-react/commit/eeab2197765589262ee7c328e57dbf1606da6d7f))
+
+
+
+
+
 ## 4.71.2 (2022-05-27)
 
 **Note:** Version bump only for package @patternfly/react-tokens

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-tokens",
-  "version": "4.71.2",
+  "version": "4.72.2",
   "description": "This library provides access to the design tokens of PatternFly 4 from JavaScript",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -35,5 +35,5 @@
     "glob": "^7.1.2",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "5b818b06af7c427e8b6b1fe87a6642e52072e477"
+  "gitHead": "a8c59ffa9bb424d46036dabe35c777b999fb11d6"
 }

package/scripts/generateTokens.js

@@ -1,6 +1,6 @@
 const glob = require('glob');
 const { dirname, basename, sep } = require('path');
-const { parse } = require('css');
+const { parse, stringify } = require('css');
 const { readFileSync } = require('fs');
 
 const pfStylesDir = dirname(require.resolve('@patternfly/patternfly/patternfly.css'));
@@ -19,7 +19,12 @@ const getRegexMatches = (string, regex) => {
 
 const getDeclarations = cssAst =>
   cssAst.stylesheet.rules
-    .filter(node => node.type === 'rule' && !node.selectors.includes('.pf-t-dark'))
+    .filter(
+      node =>
+        node.type === 'rule' &&
+        !node.selectors.includes('.pf-t-dark') &&
+        (!node.selectors || !node.selectors.some(item => item.includes('.pf-theme-dark'))) // exclude dark theme blocks since dark theme variable values override default token values
+    )
     .map(node => node.declarations.filter(decl => decl.type === 'declaration'))
     .reduce((acc, val) => acc.concat(val), []); // flatten
 
@@ -100,11 +105,15 @@ function generateTokens() {
   const scssColorsMap = getRegexMatches(scssColorVariables, /(\$.*):\s*([^\s]+)\s*(?:!default);/g);
 
   // contains default values and mappings to colors.scss for color values
-  const cssGlobalVariables = readFileSync(
-    require.resolve('@patternfly/patternfly/base/patternfly-variables.css'),
-    'utf8'
+  const cssGlobalVariablesAst = parse(
+    readFileSync(require.resolve('@patternfly/patternfly/base/patternfly-variables.css'), 'utf8')
+  );
+
+  cssGlobalVariablesAst.stylesheet.rules = cssGlobalVariablesAst.stylesheet.rules.filter(
+    node => !node.selectors || !node.selectors.some(item => item.includes('.pf-theme-dark'))
   );
-  const cssGlobalVariablesMap = getRegexMatches(cssGlobalVariables, /(--pf-[\w-]*):\s*([\w -_]+);/g);
+
+  const cssGlobalVariablesMap = getRegexMatches(stringify(cssGlobalVariablesAst), /(--pf-[\w-]*):\s*([\w -_]+);/g);
 
   const combinedScssVarsColorsMap = {
     ...scssVarsMap,