Skip to content

Commit a8617cc

Browse files
committed
chore: merge latest from main
1 parent fec4349 commit a8617cc

File tree

3 files changed

+914
-1506
lines changed

3 files changed

+914
-1506
lines changed

.github/renovate.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
"matchDatasources": ["npm"],
1414
"minimumReleaseAge": "1 month"
1515
},
16-
{
17-
"matchUpdateTypes": ["major"],
18-
"matchBaseBranches": ["main"],
19-
"enabled": false
20-
},
2116
{
2217
"groupName": "storybook ecosystem",
2318
"matchPackageNames": ["storybook", "@storybook/*", "@types/storybook*"],

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Ignore dist directories except metadata.json
22
**/dist/*
33
!components/*/dist/metadata.json
4-
!tokens/dist/json/tokens.json
4+
!tokens/dist/json/*
55
!ui-icons/dist
66

77
# Not committing the map assets, these are dev-only

0 commit comments

Comments
 (0)