Fix CI issues (#725)

* Fix initial CI issue * Linting * Fix naming error * Fix issues badly, need to work out why theme is empty * Fix components used on contributing page * Roll back styled-components to v5 * Remove null check, we'd rather it fails if theme is wonky --------- Co-authored-by: Owen Niblock <[email protected]>
primer · Apr 19, 2024 · bce195c · bce195c
1 parent bfa14b3
commit bce195c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/theme/package.json b/theme/package.json
@@ -84,7 +84,7 @@
     "react-measure": "^2.3.0",
     "read-pkg-up": "^6.0.0",
     "sentence-case": "^2.1.1",
-    "styled-components": "^6.1.0",
+    "styled-components": "^5.3.11",
     "styled-system": "^5.0.18",
     "worker-loader": "^3.0.2"
   }

diff --git a/theme/src/components/header.js b/theme/src/components/header.js
@@ -149,14 +149,14 @@ function PrimerNavItems({siteMetadata, items, path, pathPrefix}) {
       <UnderlineNav aria-label="Main navigation" sx={{border: 'none'}}>
         {items.map((item, index) => {
           return (
-            <UnderlineNav.Link
+            <UnderlineNav.Item
               key={index}
               href={item.url}
               selected={item.url === siteMetadata.header.url + (pathPrefix || '') + (path || '')}
               sx={{fontSize: 2, lineHeight: 'condensed'}}
             >
               {item.title}
-            </UnderlineNav.Link>
+            </UnderlineNav.Item>
           )
         })}
       </UnderlineNav>

diff --git a/theme/src/components/list.js b/theme/src/components/list.js
@@ -23,4 +23,7 @@ const List = styled.ul`
   }
 `
 
+export const UL = List
+export const OL = styled(List).attrs({as: 'ol'})``
+
 export default List
diff --git a/theme/src/components/wrap-root-element.js b/theme/src/components/wrap-root-element.js
@@ -14,7 +14,7 @@ import HorizontalRule from './horizontal-rule'
 import Image from './image'
 import ImageContainer from './image-container'
 import InlineCode from './inline-code'
-import List from './list'
+import {OL, UL} from './list'
 import Note from './note'
 import Paragraph from './paragraph'
 import Superscript from './superscript'
@@ -37,8 +37,8 @@ const components = {
   h4: H4,
   h5: H5,
   h6: H6,
-  ul: List,
-  ol: List.withComponent('ol'),
+  ul: UL,
+  ol: OL,
   dl: DescriptionList,
 
   // Custom components