Merge branch 'main' into dsw-2208-modal-props

justeattakeaway · Jul 31, 2024 · 96440a0 · 96440a0
2 parents 45ce838 + 7cda496
commit 96440a0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/.changeset/real-clocks-swim.md b/.changeset/real-clocks-swim.md
@@ -0,0 +1,5 @@
+---
+"pie-storybook": minor
+---
+
+[Changed] - Alphabetically sort components in Storybook sidebar
diff --git a/.changeset/thirty-carrots-heal.md b/.changeset/thirty-carrots-heal.md
@@ -0,0 +1,5 @@
+---
+"pie-docs": patch
+---
+
+[Fixed] - Conflict in ordering of pages in Foundations section
diff --git a/apps/pie-docs/src/foundations/radius/radius.md b/apps/pie-docs/src/foundations/radius/radius.md
@@ -3,6 +3,6 @@ eleventyNavigation:
     key: Radius
     parent: Foundations
     url: /foundations/radius/
-    order: 5
+    order: 6
 permalink: false
 ---
diff --git a/apps/pie-docs/src/foundations/spacing/spacing.md b/apps/pie-docs/src/foundations/spacing/spacing.md
@@ -3,6 +3,6 @@ eleventyNavigation:
     key: Spacing
     parent: Foundations
     url: /foundations/spacing/
-    order: 6
+    order: 7
 permalink: false
 ---
diff --git a/apps/pie-docs/src/foundations/typography/typography.md b/apps/pie-docs/src/foundations/typography/typography.md
@@ -3,6 +3,6 @@ eleventyNavigation:
     key: Typography
     parent: Foundations
     url: /foundations/typography/
-    order: 7
+    order: 8
 permalink: false
 ---
diff --git a/apps/pie-docs/test/accessibility/accessibility.spec.js b/apps/pie-docs/test/accessibility/accessibility.spec.js
@@ -15,6 +15,7 @@ expectedRoutesJson.forEach((route) => {
 
         const results = await makeAxeBuilder()
             .include(`[data-test-id=${selector}]`)
+            .exclude('iframe')
             .analyze();
 
         expect(results.violations).toEqual([]);

diff --git a/apps/pie-storybook/.storybook/preview.ts b/apps/pie-storybook/.storybook/preview.ts
@@ -90,6 +90,11 @@ export default {
         viewport: {
             viewports: CUSTOM_VIEWPORTS
         },
-        layout: 'centered'
+        layout: 'centered',
+        options: {
+            storySort: {
+                method: 'alphabetical',
+            }
+        }
     }
 };