Skip to content

Commit

Permalink
Merge branch 'main' into ts-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm authored Oct 29, 2024
2 parents 54c5778 + 3cd1451 commit aad8175
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 176 deletions.
5 changes: 5 additions & 0 deletions .changeset/tender-beds-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marigold/docs": patch
---

docs: adjust menu demo with dialog
2 changes: 1 addition & 1 deletion config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "7.37.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-testing-library": "6.3.4",
"eslint-plugin-testing-library": "6.4.0",
"prettier": "3.3.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions config/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
},
"dependencies": {
"@babel/core": "7.25.9",
"@swc/core": "1.7.36",
"@swc/core": "1.7.40",
"@swc/jest": "0.2.36",
"@types/jest": "29.5.13",
"@types/jest": "29.5.14",
"babel-jest": "29.7.0",
"jest-watch-typeahead": "2.2.2",
"merge-deep": "3.0.3",
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
"contentlayer2": "0.5.1",
"dayjs": "1.11.13",
"eslint": "9.12.0",
"eslint-config-next": "14.2.15",
"eslint-config-next": "14.2.16",
"framer-motion": "11.11.10",
"github-slugger": "2.0.0",
"mdast-util-toc": "7.0.1",
"next": "14.2.15",
"next": "14.2.16",
"next-contentlayer2": "0.5.1",
"postcss": "8.4.47",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"husky": "9.0.11",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"next": "14.2.15",
"next": "14.2.16",
"postcss-import": "16.1.0",
"postcss-loader": "8.1.1",
"prettier": "3.3.3",
Expand Down
Loading

0 comments on commit aad8175

Please sign in to comment.