Merge branch 'main' into fix-date-in-changelog

marigold-ui · Oct 31, 2024 · 4d74d11 · 4d74d11
2 parents 28cb857 + a24bfca
commit 4d74d11
Show file tree

Hide file tree

Showing 13 changed files with 286 additions and 166 deletions.
diff --git a/.changeset/popular-files-destroy.md b/.changeset/popular-files-destroy.md
@@ -0,0 +1,5 @@
+---
+"@marigold/storybook-config": patch
+---
+
+docs: Added/activated a11y addon to storybook. In all components is now a panel called Accessibility which shows how accessible our components are and if there are some violations or incomplete issues.
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -23,8 +23,6 @@ jobs:
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm install
-      - name: Build docs for generated files
-        run: pnpm build:docs
 
       # Action
       - name: Typecheck

diff --git a/config/eslint/package.json b/config/eslint/package.json
@@ -39,11 +39,11 @@
   },
   "peerDependencies": {
     "eslint": "9.x.x",
-    "typescript": "5.3.x || 5.5.x"
+    "typescript": "5.3.x || 5.5.x || 5.6.x"
   },
   "devDependencies": {
     "eslint": "9.13.0",
     "eslint-plugin-tailwindcss": "3.17.5",
-    "typescript": "5.5.4"
+    "typescript": "5.6.3"
   }
 }
diff --git a/config/jest/package.json b/config/jest/package.json
@@ -40,6 +40,6 @@
     "jest": "29.7.0",
     "jest-transform-css": "6.0.1",
     "react": "18.3.1",
-    "typescript": "5.5.4"
+    "typescript": "5.6.3"
   }
 }
diff --git a/config/storybook/.storybook/main.ts b/config/storybook/.storybook/main.ts
@@ -16,6 +16,7 @@ const config: StorybookConfig = {
     getAbsolutePath('@storybook/addon-interactions'),
     getAbsolutePath('@storybook/addon-themes'),
     getAbsolutePath('@storybook/addon-storysource'),
+    getAbsolutePath('@storybook/addon-a11y'),
   ],
   framework: {
     name: getAbsolutePath('@storybook/react-vite'),

diff --git a/config/storybook/.storybook/preview.tsx b/config/storybook/.storybook/preview.tsx
@@ -11,6 +11,8 @@ import '@marigold/theme-b2b/styles.css';
 import core from '@marigold/theme-core';
 import '@marigold/theme-core/styles.css';
 
+// Helpers
+
 // Helpers
 // ---------------
 const THEME = {
@@ -26,7 +28,7 @@ type ThemeNames = keyof typeof THEME;
 export const parameters: Preview['parameters'] = {
   layout: 'fullscreen',
   a11y: {
-    element: '#root',
+    element: '#storybook-root',
   },
   options: {
     storySort: {

diff --git a/config/storybook/package.json b/config/storybook/package.json
@@ -22,7 +22,7 @@
     "@marigold/theme-b2b": "workspace:*",
     "@marigold/theme-core": "workspace:*",
     "@mdx-js/react": "3.0.1",
-    "@storybook/addon-a11y": "^8.1.11",
+    "@storybook/addon-a11y": "^8.2.9",
     "@storybook/addon-essentials": "^8.1.11",
     "@storybook/addon-interactions": "^8.1.11",
     "@storybook/source-loader": "^8.1.11",
@@ -45,14 +45,14 @@
     "react-dom": "18.3.1",
     "storybook": "^8.1.11",
     "tailwindcss": "3.4.14",
-    "typescript": "5.5.4",
+    "typescript": "5.6.3",
     "vite": "5.4.10"
   },
   "peerDependencies": {
     "@storybook/react": "8.0.x || 8.1.x || 8.2.x || 8.3.x",
     "react": "18.x",
     "react-dom": "18.x",
-    "typescript": "5.3.x || 5.5.x"
+    "typescript": "5.3.x || 5.5.x || 5.6.x"
   },
   "scripts": {
     "start": "storybook dev -p 6006 -c .storybook/",

diff --git a/docs/package.json b/docs/package.json
@@ -8,7 +8,8 @@
     "start": "next start",
     "registry": "zx ./scripts/build-registry.mjs",
     "build:component-props": "zx ./scripts/build-component-props.mjs",
-    "build:changelog": "zx ./scripts/build-changelog.mjs"
+    "build:changelog": "zx ./scripts/build-changelog.mjs",
+    "build:contentlayer": "pnpm contentlayer2 build"
   },
   "dependencies": {
     "@emotion/is-prop-valid": "1.3.1",
@@ -63,7 +64,7 @@
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",
     "tailwindcss-animate": "1.0.7",
-    "typescript": "5.5.4",
+    "typescript": "5.6.3",
     "unist-builder": "4.0.0",
     "unist-util-visit": "5.0.0"
   }

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "react-dom": "18.3.1",
     "tailwindcss": "3.4.14",
     "turbo": "2.2.3",
-    "typescript": "5.5.4",
+    "typescript": "5.6.3",
     "zx": "8.1.9"
   },
   "scripts": {
@@ -60,7 +60,7 @@
     "lint": "eslint . --ignore-pattern node_modules --ignore-pattern dist --ignore-pattern packages/types/src/index.ts --ignore-pattern \".cache\" --ignore-pattern public",
     "format": "prettier --write \"**/*\"",
     "format:fix": "prettier --write \"**/*\" --fix",
-    "typecheck": "tsc --noEmit --resolveJsonModule --project tsconfig.check.json",
+    "typecheck": "pnpm --filter @marigold/docs build && tsc --noEmit --resolveJsonModule --project tsconfig.check.json",
     "contributor": "all-contributors",
     "changeset": "changeset",
     "release:notification": "zx scripts/create-slack-notification.mjs",