Update dependencies (#574)

graphprotocol · Jan 11, 2024 · 7627c4b · 7627c4b
1 parent 7830fda
commit 7627c4b
Show file tree

Hide file tree

Showing 16 changed files with 1,602 additions and 1,751 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@edgeandnode/eslint-config": "^2.0.3",
     "eslint": "^8.56.0",
-    "eslint-plugin-mdx": "^2.2.0",
+    "eslint-plugin-mdx": "^2.3.2",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.1",
@@ -33,7 +33,7 @@
     "remark-lint-heading-increment": "^3.1.2",
     "remark-lint-no-heading-punctuation": "^3.1.2",
     "remark-lint-restrict-elements": "workspace:*",
-    "turbo": "^1.11.2",
+    "turbo": "^1.11.3",
     "typescript": "^5.3.3"
   },
   "lint-staged": {

diff --git a/packages/nextra-theme/package.json b/packages/nextra-theme/package.json
@@ -25,8 +25,8 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@edgeandnode/gds": "3.0.0-global-header-1703180036960-6b16dd059ed284aceacf266e91ef74c6e7a1ee3b",
-    "@edgeandnode/go": "4.0.0-global-header-1703180036960-6b16dd059ed284aceacf266e91ef74c6e7a1ee3b",
+    "@edgeandnode/gds": "3.0.0-global-header-1704926172780-5df793a0095123eacaf0e9c364758f71bbc99e44",
+    "@edgeandnode/go": "4.0.0-global-header-1704926172780-5df793a0095123eacaf0e9c364758f71bbc99e44",
     "@emotion/react": "^11.11",
     "next": "^13",
     "next-seo": "^6",
@@ -43,11 +43,11 @@
     "react-use": "^17.4.2"
   },
   "devDependencies": {
-    "@edgeandnode/gds": "3.0.0-global-header-1703180036960-6b16dd059ed284aceacf266e91ef74c6e7a1ee3b",
-    "@edgeandnode/go": "4.0.0-global-header-1703180036960-6b16dd059ed284aceacf266e91ef74c6e7a1ee3b",
-    "@emotion/react": "^11.11.1",
+    "@edgeandnode/gds": "3.0.0-global-header-1704926172780-5df793a0095123eacaf0e9c364758f71bbc99e44",
+    "@edgeandnode/go": "4.0.0-global-header-1704926172780-5df793a0095123eacaf0e9c364758f71bbc99e44",
+    "@emotion/react": "^11.11.3",
     "@types/lodash": "^4.14.202",
-    "@types/react": "^18.2.45",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
     "next": "^14.0.4",
     "next-seo": "^6.4.0",

diff --git a/packages/nextra-theme/src/components/EditPageLink.tsx b/packages/nextra-theme/src/components/EditPageLink.tsx
@@ -1,22 +1,12 @@
 import { HTMLAttributes, useContext } from 'react'
 
-import {
-  BorderRadius,
-  buildTransition,
-  ButtonOrLink,
-  Flex,
-  Icon,
-  Opacity,
-  Spacing,
-  Text,
-  useI18n,
-} from '@edgeandnode/gds'
+import { Icon, Link, useI18n } from '@edgeandnode/gds'
 
 import { NavContext } from '@/layout/NavContext'
 
 export type EditPageLinkProps = {
   mobile?: boolean
-} & Omit<HTMLAttributes<HTMLElement>, 'children'>
+} & Omit<HTMLAttributes<HTMLElement>, 'color' | 'children'>
 
 export const EditPageLink = ({ mobile = false, ...props }: EditPageLinkProps) => {
   const { t } = useI18n<any>()
@@ -30,31 +20,9 @@ export const EditPageLink = ({ mobile = false, ...props }: EditPageLinkProps) =>
         fileLocale && ['en', '[locale]'].includes(fileLocale) ? fileLocale : 'en'
       }/${filePathSegments.join('/')}`
   return (
-    <ButtonOrLink
-      href={path}
-      target="_blank"
-      sx={{
-        display: 'block',
-        py: Spacing['4px'],
-        borderRadius: BorderRadius.S,
-        '&:hover': { color: 'White' },
-        transition: buildTransition(),
-      }}
-      {...props}
-    >
-      <Flex.Row as="span" align="center" gap={Spacing['8px']}>
-        <Icon.LogoGitHub title="" />
-        <Text weight="SEMIBOLD" size={mobile ? '16px' : '14px'}>
-          {t('global.editPage')}
-        </Text>
-        <Icon.ExternalLink
-          sx={{
-            opacity: Opacity['0%'],
-            'a:hover &': { opacity: Opacity['32%'] },
-            transition: buildTransition('OPACITY'),
-          }}
-        />
-      </Flex.Row>
-    </ButtonOrLink>
+    <Link href={path} target="_blank" size={mobile ? '16px' : '14px'} {...props}>
+      <Icon.LogoGitHub title="" />
+      {t('global.editPage')}
+    </Link>
   )
 }
diff --git a/packages/nextra-theme/src/components/Link.tsx b/packages/nextra-theme/src/components/Link.tsx
@@ -2,7 +2,7 @@ import { AnchorHTMLAttributes } from 'react'
 
 import { Link } from '@edgeandnode/gds'
 
-export type LinkInlineProps = Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'type'>
+export type LinkInlineProps = Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'color' | 'type'>
 
 export const LinkInline = (props: LinkInlineProps) => {
   return <Link.Inline href="#" {...props} />

diff --git a/packages/nextra-theme/src/components/NavTree.tsx b/packages/nextra-theme/src/components/NavTree.tsx
@@ -5,12 +5,11 @@ import { SxProp } from 'theme-ui'
 
 import {
   buildTransition,
-  ButtonOrLink,
-  ButtonOrLinkProps,
   Divider,
   Flex,
   Icon,
   IconProps,
+  Link,
   Spacing,
   Text,
   TextProps,
@@ -30,12 +29,13 @@ const animationCollapse = keyframes({
 export type NavTreeProps = HTMLAttributes<HTMLElement> & {
   textProps?: TextProps
 }
-export type NavTreeItemProps = HTMLAttributes<HTMLElement> &
-  Pick<AnchorHTMLAttributes<HTMLAnchorElement>, 'href' | 'target'> & {
-    active?: boolean
-    linkProps?: HTMLAttributes<HTMLElement> & SxProp
-    diamondProps?: Partial<IconProps> & SxProp
-  }
+export type NavTreeItemProps = HTMLAttributes<HTMLElement> & {
+  href: NonNullable<AnchorHTMLAttributes<HTMLAnchorElement>['href']>
+  target?: AnchorHTMLAttributes<HTMLAnchorElement>['target']
+  active?: boolean
+  linkProps?: HTMLAttributes<HTMLElement> & SxProp
+  diamondProps?: Partial<IconProps> & SxProp
+}
 export type NavTreeGroupProps = HTMLAttributes<HTMLElement> & {
   active?: boolean
 }
@@ -69,7 +69,7 @@ const NavTreeItem = ({
   const { sx: diamondSx, ...diamondOtherProps } = diamondProps
   return (
     <li {...props}>
-      <ButtonOrLink
+      <Link.Unstyled
         href={href}
         target={target}
         sx={{
@@ -100,7 +100,7 @@ const NavTreeItem = ({
             {...diamondOtherProps}
           />
         ) : null}
-      </ButtonOrLink>
+      </Link.Unstyled>
     </li>
   )
 }
@@ -125,7 +125,7 @@ const NavTreeGroup = ({ active = false, children, ...props }: NavTreeGroupProps)
 
 const NavTreeGroupHeading = ({ children, buttonProps = {}, ...props }: NavTreeGroupHeadingProps) => {
   const { sx: buttonSx, ...buttonOtherProps } = buttonProps
-  const context = useContext(NavTreeGroupContext)
+  const { open, active } = useContext(NavTreeGroupContext)
   const { t } = useI18n<any>()
 
   return (
@@ -135,7 +135,7 @@ const NavTreeGroupHeading = ({ children, buttonProps = {}, ...props }: NavTreeGr
           width: '100%',
           paddingInline: Spacing['24px'],
           py: Spacing['12px'],
-          color: context.open || context.active ? 'White88' : 'White64',
+          color: open || active ? 'White88' : 'White64',
           '&:hover': { color: 'White' },
           transition: buildTransition('COLORS'),
           ...buttonSx,
@@ -148,12 +148,15 @@ const NavTreeGroupHeading = ({ children, buttonProps = {}, ...props }: NavTreeGr
             as="span"
             sx={{
               flexShrink: 0,
-              transform: context.open ? 'rotate(90deg)' : 'rotate(0deg)',
               transition: buildTransition('TRANSFORM'),
+              transform: open ? 'rotate(90deg)' : 'rotate(0deg)',
+              '&:dir(rtl)': {
+                transform: open ? 'rotate(-90deg)' : 'rotate(0deg)',
+              },
             }}
           >
             <Icon.CaretRight
-              title={context.open ? t('global.collapse') : t('global.expand')}
+              title={open ? t('global.collapse') : t('global.expand')}
               size={['16px', null, null, '14px']}
             />
           </Flex.Column>

diff --git a/packages/nextra-theme/src/layout/MDXLayoutNav.tsx b/packages/nextra-theme/src/layout/MDXLayoutNav.tsx
@@ -8,9 +8,9 @@ import { Fragment, PropsWithChildren, useContext, useEffect, useState } from 're
 import {
   BorderRadius,
   buildTransition,
-  ButtonOrLink,
   Flex,
   Icon,
+  Link,
   NestedStrings,
   Spacing,
   Text,
@@ -99,8 +99,11 @@ const MobileWrapper = ({ title, children }: PropsWithChildren<{ title?: string }
             as="span"
             sx={{
               flexShrink: 0,
-              transform: open ? 'rotate(90deg)' : 'rotate(0deg)',
               transition: buildTransition('TRANSFORM'),
+              transform: open ? 'rotate(90deg)' : 'rotate(0deg)',
+              '&:dir(rtl)': {
+                transform: open ? 'rotate(-90deg)' : 'rotate(0deg)',
+              },
             }}
           >
             <Icon.CaretRight title={open ? t('global.collapse') : t('global.expand')} />
@@ -127,7 +130,7 @@ const MobileWrapper = ({ title, children }: PropsWithChildren<{ title?: string }
 }
 
 const DocSearchHit = ({ hit, children }: PropsWithChildren<{ hit: { url: string } }>) => (
-  <ButtonOrLink href={removeBasePathFromUrl(hit.url)}>{children}</ButtonOrLink>
+  <Link.Unstyled href={removeBasePathFromUrl(hit.url)}>{children}</Link.Unstyled>
 )
 
 export const MDXLayoutNav = ({ mobile = false }: { mobile?: boolean }) => {

diff --git a/packages/nextra-theme/src/layout/MDXLayoutOutline.tsx b/packages/nextra-theme/src/layout/MDXLayoutOutline.tsx
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useState } from 'react'
 
-import { buildTransition, ButtonOrLink, Divider, Flex, Spacing, Text, useI18n } from '@edgeandnode/gds'
+import { buildTransition, Divider, Flex, Link, Spacing, Text, useI18n } from '@edgeandnode/gds'
 
 import { EditPageLink } from '@/components'
 import { DocumentContext } from '@/layout'
@@ -44,7 +44,7 @@ export const MDXLayoutOutline = () => {
                 }
                 return (
                   <li key={outlineItemIndex}>
-                    <ButtonOrLink
+                    <Link.Unstyled
                       href={`#${heading.id}`}
                       sx={{
                         display: 'block',
@@ -56,7 +56,7 @@ export const MDXLayoutOutline = () => {
                       }}
                     >
                       {heading.value}
-                    </ButtonOrLink>
+                    </Link.Unstyled>
                   </li>
                 )
               })}

diff --git a/packages/nextra-theme/src/layout/MDXLayoutPagination.tsx b/packages/nextra-theme/src/layout/MDXLayoutPagination.tsx
@@ -1,6 +1,6 @@
 import { useContext } from 'react'
 
-import { buildTransition, ButtonOrLink, Divider, Flex, Icon, Spacing, Text, useI18n } from '@edgeandnode/gds'
+import { buildTransition, Divider, Flex, Icon, Link, Spacing, Text, useI18n } from '@edgeandnode/gds'
 
 import { NavContext } from '@/layout'
 
@@ -19,7 +19,7 @@ export const MDXLayoutPagination = () => {
       <Flex.Row justify="space-between" sx={{ my: Spacing['32px'] }}>
         <div>
           {prev ? (
-            <ButtonOrLink
+            <Link.Unstyled
               href={prev.route}
               sx={{
                 display: 'block',
@@ -52,12 +52,12 @@ export const MDXLayoutPagination = () => {
                   {prev.title}
                 </Text>
               </Flex.Column>
-            </ButtonOrLink>
+            </Link.Unstyled>
           ) : null}
         </div>
         <div>
           {next ? (
-            <ButtonOrLink
+            <Link.Unstyled
               href={next.route}
               sx={{
                 display: 'block',
@@ -90,7 +90,7 @@ export const MDXLayoutPagination = () => {
                   {next.title}
                 </Text>
               </Flex.Column>
-            </ButtonOrLink>
+            </Link.Unstyled>
           ) : null}
         </div>
       </Flex.Row>

diff --git a/packages/og-image/package.json b/packages/og-image/package.json
@@ -17,11 +17,11 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231218.0",
-    "@types/react": "^18.2.45",
+    "@types/react": "^18.2.47",
     "jest-image-snapshot": "^6.4.0",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "vitest": "^0.34.6",
-    "wrangler": "^3.22.1"
+    "wrangler": "^3.22.4"
   }
 }