Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix-migration-tool
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	packages/foundations/package.json
  • Loading branch information
nmerget committed Dec 10, 2024
2 parents 3e4c8c3 + 6ebfb83 commit 0dfde9f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 33 deletions.
57 changes: 27 additions & 30 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 packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"dependencies": {
"@db-ui/foundations": "*",
"@db-ux/core-icons": "0.0.6"
"@db-ux/core-icons": "0.0.7"
},
"devDependencies": {
"@builder.io/eslint-plugin-mitosis": "0.0.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/foundations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@csstools/normalize.css": "12.1.1",
"@db-ux/core-icons": "^0.0.6",
"@db-ux/core-icons": "^0.0.7",
"cpr": "3.0.1",
"cssnano": "^7.0.6",
"dotenv": "^16.4.7",
Expand Down
2 changes: 1 addition & 1 deletion showcases/patternhub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:e2e": "npx playwright test --config=../playwright.patternhub-config.ts"
},
"dependencies": {
"@db-ux/core-icons": "0.0.6",
"@db-ux/core-icons": "0.0.7",
"dompurify": "3.2.3",
"highlight.js": "^11.10.0",
"next": "15.0.4",
Expand Down

0 comments on commit 0dfde9f

Please sign in to comment.