rei · benjag · Jan 24, 2024 · Sep 11, 2023 · Oct 13, 2023 · Oct 13, 2023
diff --git a/.eslintrc b/.eslintrc
@@ -23,6 +23,7 @@
       "ignoreComments": true,
       "ignoreTrailingComments": true
     }],
-    "vue/multiline-html-element-content-newline": 0
+    "vue/multiline-html-element-content-newline": 0,
+    "@typescript-eslint/no-explicit-any": 0
   }
 }
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -26,6 +26,6 @@ jobs:
       - run: npm run lint
       - run: npm run unit
       - name: Run headless test
-        uses: GabrielBB/xvfb-action@v1
+        uses: coactions/setup-xvfb@v1
         with:
           run: npm run e2e
diff --git a/browserTargets.mjs b/browserTargets.mjs
@@ -1,7 +1,7 @@
 export default [
-  'Chrome >= 103',
-  'Firefox >= 103',
-  'iOS >= 14',
-  'Safari >= 14',
-  'Edge >= 104',
+  'Chrome >= 109',
+  'Firefox >= 108',
+  'iOS >= 15',
+  'Safari >= 15',
+  'Edge >= 115',
 ];
diff --git a/build/extract-css.js b/build/extract-css.js
diff --git a/docgen.mjs b/docgen.mjs
@@ -5,7 +5,16 @@ import _ from 'lodash-es';
 import path from 'path';
 import parseSCSS from './docgen-scss.mjs';
 
-const componentFiles = glob.sync("./src/components/*/*.vue");
+const componentFiles = glob.sync(
+  "./src/components/**/*.vue",
+  { 
+    ignore: [
+      './src/components/**/examples/**/*',
+      './src/components/**/components/*',
+      './src/components/icon/comps/*.vue'
+    ]
+  }
+);
 const iconFiles = glob.sync("./src/components/icon/comps/*.vue");
 const componentObj = {};
 const iconComponentsObj = {};
@@ -21,7 +30,7 @@ await Promise.all(iconFiles.map(async (filePath) => {
 }))
 
 async function createDocgenObj(filePath, docgenObj) {
-    let parsedComponentFile = await parse(filePath);
+    const parsedComponentFile = await parse(filePath);
     docgenObj[parsedComponentFile.displayName] = parsedComponentFile;
 
     _.forIn(docgenObj, (component) => {
@@ -38,6 +47,12 @@ async function createDocgenObj(filePath, docgenObj) {
                 }
                 prop.defaultValue.value = trimApostrophes(prop.defaultValue.value);
             }
+            if (prop.tags && prop.tags.values && prop.tags.values[0].description) {
+                prop.values = prop.tags.values[0].description.split(',').map((value)=>{
+                    return value.trim();
+                });
+                delete prop.tags.values;
+            }
         });
     });
 }
@@ -49,8 +64,6 @@ function trimApostrophes(str) {
     return str;
 }
 
-const components = Object.keys(componentObj); // Replace with your actual component names
-
 
 // Iterate over components
 for (const component in componentObj) {
@@ -69,6 +82,7 @@ for (const component in componentObj) {
             // Check if UIProperties already exists for this component
             if(componentObj[component].UIProperties) {
                 // If it does, concatenate the new parsed SCSS with the existing ones
+                // eslint-disable-next-line max-len
                 componentObj[component].UIProperties = componentObj[component].UIProperties.concat(parsedSCSS);
             } else {
                 // If it doesn't, assign the parsed SCSS to UIProperties

diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
     <meta name="author" content="REI">
     <meta name="viewport" content="width=device-width">
     <link rel="stylesheet" href="cdr-fonts.css">
-    <link rel="stylesheet" href="reset.css">
+    <link rel="stylesheet" href="cdr-reset.css">
     <!-- <link rel="stylesheet" href="./dist/cedar-compiled.css"> -->
   </head>
   <body>