Merge branch 'main' into changeset-release/main

marigold-ui · May 27, 2024 · 86e017d · 86e017d
2 parents 323c893 + 82ee5cd
commit 86e017d
Show file tree

Hide file tree

Showing 9 changed files with 2,383 additions and 1,623 deletions.
diff --git a/config/jest/package.json b/config/jest/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "jest": "29.7.0",
     "jest-transform-css": "6.0.1",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "typescript": "5.3.3"
   }
 }
diff --git a/config/storybook/package.json b/config/storybook/package.json
@@ -27,7 +27,7 @@
     "@storybook/addon-interactions": "^8.0.6",
     "@storybook/source-loader": "^8.0.6",
     "@storybook/test": "^8.0.6",
-    "@types/react": "18.2.73",
+    "@types/react": "18.3.3",
     "@vitejs/plugin-react": "4.2.1",
     "vite-tsconfig-paths": "4.3.2"
   },
@@ -41,8 +41,8 @@
     "autoprefixer": "10.4.19",
     "postcss": "8.4.35",
     "postcss-loader": "8.1.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "storybook": "^8.0.6",
     "tailwindcss": "3.4.1",
     "typescript": "5.3.3",

diff --git a/docs/package.json b/docs/package.json
@@ -15,7 +15,7 @@
     "@marigold/theme-b2b": "workspace:*",
     "@marigold/theme-core": "workspace:*",
     "@marigold/theme-preset": "workspace:*",
-    "@react-aria/i18n": "3.11.0",
+    "@react-aria/i18n": "3.11.1",
     "@tailwindcss/typography": "0.5.10",
     "@tanstack/react-query": "5.28.9",
     "@vercel/analytics": "1.2.2",
@@ -28,8 +28,8 @@
     "next": "14.1.4",
     "next-contentlayer": "0.3.4",
     "postcss": "8.4.35",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-hook-form": "7.51.2",
     "react-use": "17.5.0",
     "react-use-clipboard": "1.0.9",
@@ -45,9 +45,9 @@
     "zx": "7.2.3"
   },
   "devDependencies": {
-    "@internationalized/date": "3.5.3",
+    "@internationalized/date": "3.5.4",
     "@types/node": "20.12.7",
-    "@types/react": "18.2.73",
+    "@types/react": "18.3.3",
     "@types/react-dom": "18.2.23",
     "typescript": "5.3.3",
     "unist-builder": "4.0.0",

diff --git a/package.json b/package.json
@@ -28,8 +28,8 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "prettier": "3.2.5",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "typescript": "5.3.3",
     "zx": "7.2.3"
   },

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -23,39 +23,39 @@
     "directory": "packages/components"
   },
   "dependencies": {
-    "@internationalized/date": "3.5.3",
+    "@internationalized/date": "3.5.4",
     "@marigold/icons": "workspace:*",
     "@marigold/system": "workspace:*",
     "@marigold/types": "workspace:*",
-    "@react-aria/accordion": "3.0.0-alpha.28",
-    "@react-aria/button": "3.9.4",
-    "@react-aria/calendar": "3.5.7",
-    "@react-aria/focus": "3.17.0",
-    "@react-aria/i18n": "3.11.0",
-    "@react-aria/interactions": "3.21.2",
-    "@react-aria/overlays": "3.22.0",
-    "@react-aria/selection": "3.18.0",
-    "@react-aria/ssr": "3.9.3",
-    "@react-aria/table": "3.14.0",
-    "@react-aria/utils": "3.24.0",
-    "@react-aria/visually-hidden": "3.8.11",
-    "@react-stately/collections": "3.10.6",
-    "@react-stately/data": "3.11.3",
-    "@react-stately/table": "3.11.7",
-    "@react-stately/tree": "3.8.0",
-    "@react-types/shared": "3.23.0",
-    "@react-types/table": "3.9.4",
-    "react-aria-components": "1.2.0"
+    "@react-aria/accordion": "3.0.0-alpha.29",
+    "@react-aria/button": "3.9.5",
+    "@react-aria/calendar": "3.5.8",
+    "@react-aria/focus": "3.17.1",
+    "@react-aria/i18n": "3.11.1",
+    "@react-aria/interactions": "3.21.3",
+    "@react-aria/overlays": "3.22.1",
+    "@react-aria/selection": "3.18.1",
+    "@react-aria/ssr": "3.9.4",
+    "@react-aria/table": "3.14.1",
+    "@react-aria/utils": "3.24.1",
+    "@react-aria/visually-hidden": "3.8.12",
+    "@react-stately/collections": "3.10.7",
+    "@react-stately/data": "3.11.4",
+    "@react-stately/table": "3.11.8",
+    "@react-stately/tree": "3.8.1",
+    "@react-types/shared": "3.23.1",
+    "@react-types/table": "3.9.5",
+    "react-aria-components": "1.2.1"
   },
   "peerDependencies": {
     "react": "18.x",
     "react-dom": "18.x"
   },
   "devDependencies": {
     "@marigold/tsconfig": "workspace:*",
-    "@types/react": "18.2.73",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "@types/react": "18.3.3",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "tsup": "8.0.2"
   },
   "scripts": {

diff --git a/packages/components/src/Calendar/Calendar.stories.tsx b/packages/components/src/Calendar/Calendar.stories.tsx
@@ -53,9 +53,7 @@ export const Basic: Story = {
 
 export const Controlled: Story = {
   render: args => {
-    const [value, setValue] = useState(
-      new CalendarDate(2019, 6, 5) as DateValue
-    );
+    const [value, setValue] = useState<DateValue>(new CalendarDate(2019, 6, 5));
     return (
       <>
         <Calendar value={value} onChange={setValue} {...args} />

diff --git a/packages/system/package.json b/packages/system/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@marigold/types": "workspace:*",
-    "@react-aria/i18n": "3.11.0",
+    "@react-aria/i18n": "3.11.1",
     "class-variance-authority": "0.7.0",
     "deepmerge": "4.2.2",
     "react-fast-compare": "3.2.0",
@@ -39,7 +39,7 @@
     "@babel/core": "7.24.4",
     "@marigold/tsconfig": "workspace:*",
     "postcss": "8.4.35",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "tailwindcss": "3.4.1",
     "tsup": "8.0.2"
   },

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -24,7 +24,7 @@
     "@types/react": "18.x"
   },
   "devDependencies": {
-    "@types/react": "18.2.73"
+    "@types/react": "18.3.3"
   },
   "scripts": {
     "build": "echo types only",