Skip to content

Commit

Permalink
Merge pull request #160 from rei/release/v15
Browse files Browse the repository at this point in the history
Release/v15
  • Loading branch information
benjag authored Jan 24, 2024
2 parents 447f0b8 + 5641631 commit 06a738d
Show file tree
Hide file tree
Showing 222 changed files with 17,800 additions and 33,117 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions browserTargets.mjs
Original file line number Diff line number Diff line change
@@ -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',
];
100 changes: 0 additions & 100 deletions build/extract-css.js

This file was deleted.

22 changes: 18 additions & 4 deletions docgen.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand All @@ -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) => {
Expand All @@ -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;
}
});
});
}
Expand All @@ -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) {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 06a738d

Please sign in to comment.