Skip to content

Commit

Permalink
Merge branch 'main' into fix-version-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm authored Oct 21, 2024
2 parents 65df923 + a89ca88 commit bc48d3a
Show file tree
Hide file tree
Showing 14 changed files with 344 additions and 409 deletions.
4 changes: 2 additions & 2 deletions 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.0",
"eslint-plugin-testing-library": "6.3.4",
"prettier": "3.3.3"
},
"peerDependencies": {
Expand All @@ -43,7 +43,7 @@
},
"devDependencies": {
"eslint": "9.12.0",
"eslint-plugin-tailwindcss": "3.17.4",
"eslint-plugin-tailwindcss": "3.17.5",
"typescript": "5.5.4"
}
}
2 changes: 1 addition & 1 deletion config/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@babel/core": "7.25.8",
"@swc/core": "1.7.26",
"@swc/core": "1.7.36",
"@swc/jest": "0.2.36",
"@types/jest": "29.5.13",
"babel-jest": "29.7.0",
Expand Down
4 changes: 2 additions & 2 deletions config/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@storybook/addon-interactions": "^8.1.11",
"@storybook/source-loader": "^8.1.11",
"@storybook/test": "^8.1.11",
"@types/react": "18.3.9",
"@types/react": "18.3.11",
"@vitejs/plugin-react": "4.3.1",
"vite-tsconfig-paths": "5.0.1"
},
Expand All @@ -44,7 +44,7 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"storybook": "^8.1.11",
"tailwindcss": "3.4.13",
"tailwindcss": "3.4.14",
"typescript": "5.5.4",
"vite": "5.4.6"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,12 @@ Unlike modal dialogs, which interrupt the user's workflow, section messages rema

<Do>
<Do.Description>
{/* prettier-ignore */}
<ul>
<li>
The section message title should make the topic or purpose of the
message clear.
</li>
<li>
The content provides a brief description of the event that has occurred
on the page
</li>
<li>The section message title should make the topic or purpose of the
message clear.</li>
<li>The content provides a brief description of the event that has occurred
on the page.</li>
</ul>
</Do.Description>
</Do>
Expand Down
14 changes: 7 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build:changelog": "zx ./scripts/build-changelog.mjs"
},
"dependencies": {
"@emotion/is-prop-valid": "1.3.0",
"@emotion/is-prop-valid": "1.3.1",
"@marigold/components": "workspace:*",
"@marigold/eslint-config": "workspace:*",
"@marigold/icons": "workspace:*",
Expand All @@ -22,7 +22,7 @@
"@marigold/theme-preset": "workspace:*",
"@react-aria/i18n": "3.12.3",
"@tailwindcss/typography": "0.5.15",
"@tanstack/react-query": "5.56.2",
"@tanstack/react-query": "5.59.15",
"@vercel/analytics": "1.3.1",
"autoprefixer": "10.4.20",
"cmdk": "1.0.0",
Expand Down Expand Up @@ -50,16 +50,16 @@
"shiki": "1.9.0",
"simple-git": "3.25.0",
"tailwind-scrollbar": "3.1.0",
"tailwindcss": "3.4.13",
"tailwindcss": "3.4.14",
"zod": "3.22.4",
"zod-form-data": "2.0.2",
"zx": "8.1.8"
"zx": "8.1.9"
},
"devDependencies": {
"@internationalized/date": "3.5.6",
"@types/node": "20.16.9",
"@types/react": "18.3.9",
"@types/react-dom": "18.3.0",
"@types/node": "20.16.12",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.1",
"tailwindcss-animate": "1.0.7",
"typescript": "5.5.4",
"unist-builder": "4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"@marigold/tsconfig": "workspace:*",
"@parcel/watcher": "2.4.1",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/jest-dom": "6.6.2",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@types/node": "20.16.9",
"@types/node": "20.16.12",
"all-contributors-cli": "6.26.1",
"autoprefixer": "10.4.20",
"concurrently": "8.2.2",
Expand All @@ -36,10 +36,10 @@
"prettier": "3.3.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"tailwindcss": "3.4.13",
"tailwindcss": "3.4.14",
"turbo": "2.0.14",
"typescript": "5.5.4",
"zx": "8.1.8"
"zx": "8.1.9"
},
"scripts": {
"start": "pnpm --filter @marigold/docs dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"@types/react": "18.3.9",
"@types/react": "18.3.11",
"react": "18.3.1",
"react-dom": "18.3.1",
"tsup": "8.1.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"class-variance-authority": "0.7.0",
"deepmerge": "4.3.1",
"react-fast-compare": "3.2.2",
"tailwind-merge": "2.5.3"
"tailwind-merge": "2.5.4"
},
"peerDependencies": {
"react": "18.x",
Expand All @@ -40,7 +40,7 @@
"@marigold/tsconfig": "workspace:*",
"postcss": "8.4.47",
"react": "18.3.1",
"tailwindcss": "3.4.13",
"tailwindcss": "3.4.14",
"tsup": "8.1.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"postcss": "8.4.47",
"tailwindcss": "3.4.13",
"tailwindcss": "3.4.14",
"tsup": "8.1.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/react": "18.x"
},
"devDependencies": {
"@types/react": "18.3.9"
"@types/react": "18.3.11"
},
"scripts": {
"build": "echo types only",
Expand Down
Loading

0 comments on commit bc48d3a

Please sign in to comment.