Skip to content

Commit

Permalink
Merge branch 'main' into dependabot-npm_and_yarn-inquirer-prompts-5.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nmerget authored Jul 30, 2024
2 parents 5d082e7 + 06e9211 commit 230e310
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 12 deletions.
39 changes: 30 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"fs-extra": "^11.2.0",
"glob": "^11.0.0",
"http-server": "14.1.1",
"husky": "9.1.3",
"husky": "9.1.4",
"jscpd": "^4.0.5",
"lint-staged": "^15.2.7",
"markdownlint-cli": "^0.41.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"devDependencies": {
"@inquirer/prompts": "5.3.5",
"glob": "^11.0.0",
"inquirer": "^10.1.4",
"inquirer": "^10.1.5",
"replace-in-file": "^8.1.0"
}
}
5 changes: 4 additions & 1 deletion showcases/react-showcase/src/components/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ export const getVariants = (
): ReactDefaultComponentVariants[] =>
defaultComponentVariants.map((variant, variantIndex) => ({
...variant,
SlotCode: codeSlots?.[variant.name.replaceAll(' ', '')],
SlotCode:
codeSlots?.[
variant.codeFileName ?? variant.name.replaceAll(' ', '')
],
examples: variant.examples.map((example, exampleIndex) => ({
...example,
example: getExample({
Expand Down
1 change: 1 addition & 0 deletions showcases/shared/default-component-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export type DefaultComponentExample = {

export type DefaultComponentVariants = {
name: string;
codeFileName?: string;
children?: DefaultComponentExample[];
examples: DefaultComponentExample[];
color?: string;
Expand Down
3 changes: 3 additions & 0 deletions showcases/shared/notification.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
},
{
"name": "Content - Variant:Docked",
"codeFileName": "ContentVariantDocked",
"examples": [
{
"name": "Text",
Expand Down Expand Up @@ -279,6 +280,7 @@
},
{
"name": "Content - Variant:Standalone",
"codeFileName": "ContentVariantStandalone",
"examples": [
{
"name": "Text",
Expand Down Expand Up @@ -411,6 +413,7 @@
},
{
"name": "Content - Variant:Overlay",
"codeFileName": "ContentVariantOverlay",
"examples": [
{
"name": "Text",
Expand Down

0 comments on commit 230e310

Please sign in to comment.