Update pnpm + dependencies (#345)

benface · web-flow · commit 415ade7fd598 · 2023-04-24T12:25:53.000+02:00
diff --git a/.github/workflows/ci-cd-pull-request.yml b/.github/workflows/ci-cd-pull-request.yml
@@ -21,13 +21,13 @@ jobs:
       - name: Set up pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 7.28.0
+          version: 8.2.0
 
       - name: Install dependencies
         run: pnpm install
 
-      - name: Lint
-        run: pnpm lint
+      - name: Lint and typecheck
+        run: pnpm check
 
       - name: Build Docker image
         uses: docker/build-push-action@v4
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.14
+18.15
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM node:18-alpine as builder
 ENV PNPM_HOME="/usr/bin"
 
 RUN apk add --no-cache git
-RUN npm install -g pnpm@7
+RUN npm install -g pnpm@8.2.0
 
 WORKDIR /app
 
diff --git a/package.json b/package.json
@@ -1,16 +1,18 @@
 {
   "name": "the-graph-docs-monorepo",
   "private": true,
-  "packageManager": "pnpm@7.28.0",
+  "packageManager": "pnpm@8.2.0",
   "scripts": {
     "build": "pnpm -r build",
+    "check": "pnpm typecheck && pnpm lint && pnpm prettier:check",
+    "check:fix": "pnpm typecheck; pnpm lint:fix; exit 0",
     "dev": "pnpm --filter @graphprotocol/docs dev",
     "docker:build": "DOCKER_BUILDKIT=1 docker build . -t docs --no-cache",
     "docker:clean": "docker builder prune",
     "docker:up": "docker run --rm -it -p 3000:80 -v \"$(pwd)/nginx.conf:/etc/nginx/nginx.conf\" docs",
     "export": "pnpm --filter @graphprotocol/docs export",
-    "lint": "pnpm typecheck && eslint --ignore-path .gitignore --cache --ext .js,.jsx,.ts,.tsx,.mjs --max-warnings 0 . && pnpm prettier:check",
-    "lint:fix": "pnpm typecheck && eslint --ignore-path .gitignore --cache --ext .js,.jsx,.ts,.tsx,.mjs --fix . && pnpm prettier",
+    "lint": "eslint . --cache --ext .js,.jsx,.ts,.tsx,.mjs --ignore-path .gitignore --max-warnings 0",
+    "lint:fix": "eslint . --cache --ext .js,.jsx,.ts,.tsx,.mjs --ignore-path .gitignore --fix && pnpm prettier",
     "pre-commit": "lint-staged --concurrent false",
     "pre-push": "pnpm build",
     "prepare": "husky install && chmod +x .husky/*",
@@ -21,12 +23,12 @@
   },
   "devDependencies": {
     "@edgeandnode/eslint-config": "^1.3.1",
-    "eslint": "^8.36.0",
+    "eslint": "^8.38.0",
     "husky": "^8.0.3",
-    "lint-staged": "^13.2.0",
-    "prettier": "^2.8.6",
+    "lint-staged": "^13.2.1",
+    "prettier": "^2.8.7",
     "prettier-plugin-pkg": "^0.17.1",
-    "typescript": "5.0.2"
+    "typescript": "5.0.4"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,mjs,cjs}": "eslint --fix",
diff --git a/packages/nextra-theme/package.json b/packages/nextra-theme/package.json
@@ -23,7 +23,7 @@
     "build": "tsup"
   },
   "peerDependencies": {
-    "@edgeandnode/components": "^27.4.1",
+    "@edgeandnode/gds": "^1.3.2",
     "@emotion/react": "^11.10.6",
     "next": "^13.2.4",
     "next-seo": "^5.15.0",
@@ -41,17 +41,17 @@
     "react-use": "^17.4.0"
   },
   "devDependencies": {
-    "@edgeandnode/components": "^27.4.1",
+    "@edgeandnode/gds": "^1.3.2",
     "@emotion/react": "^11.10.6",
-    "@types/lodash": "^4.14.191",
-    "@types/react": "^18.0.28",
+    "@types/lodash": "^4.14.194",
+    "@types/react": "^18.0.37",
     "@types/react-dom": "^18.0.11",
-    "next": "^13.2.4",
-    "next-seo": "^5.15.0",
+    "next": "^13.3.0",
+    "next-seo": "^6.0.0",
     "nextra": "2.3.0",
     "react": "18.2.0",
     "react-dom": "^18.2.0",
-    "theme-ui": "^0.15.5",
+    "theme-ui": "^0.15.7",
     "tsup": "6.7.0"
   },
   "sideEffects": false
diff --git a/packages/nextra-theme/src/components/Blockquote.tsx b/packages/nextra-theme/src/components/Blockquote.tsx
@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 
-import { buildBorder, Spacing, Text, TextProps } from '@edgeandnode/components'
+import { buildBorder, Spacing, Text, TextProps } from '@edgeandnode/gds'
 
 export type BlockquoteProps = Omit<TextProps & HTMLAttributes<HTMLQuoteElement>, 'color'>
 
diff --git a/packages/nextra-theme/src/components/Code.tsx b/packages/nextra-theme/src/components/Code.tsx
@@ -1,7 +1,7 @@
 import Highlight, { defaultProps, Language, PrismTheme } from 'prism-react-renderer'
 import { HTMLAttributes } from 'react'
 
-import { BorderRadius, FontFamily, Spacing } from '@edgeandnode/components'
+import { BorderRadius, FontFamily, Spacing } from '@edgeandnode/gds'
 
 export type CodeBlockProps = HTMLAttributes<HTMLPreElement>
 export type CodeInlineProps = HTMLAttributes<HTMLElement>
diff --git a/packages/nextra-theme/src/components/Difficulty.tsx b/packages/nextra-theme/src/components/Difficulty.tsx
@@ -1,4 +1,4 @@
-import { useI18n } from '@edgeandnode/components'
+import { useI18n } from '@edgeandnode/gds'
 
 // TODO: Refactor this component
 export const Difficulty = ({ level }: { level: string }) => {
diff --git a/packages/nextra-theme/src/components/DocSearch.tsx b/packages/nextra-theme/src/components/DocSearch.tsx
@@ -15,7 +15,7 @@ import {
   Opacity,
   Spacing,
   Text,
-} from '@edgeandnode/components'
+} from '@edgeandnode/gds'
 
 const BREAKPOINT = '751px'
 
@@ -69,7 +69,7 @@ export function DocSearch(props: DocSearchProps) {
         >
           <Icon.Search size="14px" title="" sx={{ flexShrink: 0 }} />
           <Text.P14 size="14px">{props.translations?.button?.buttonText ?? 'Search'}</Text.P14>
-          {/* TODO: Remove `fontFamily: 'inherit'` when it's included in `@edgeandnode/components`'s global styles */}
+          {/* TODO: Remove `fontFamily: 'inherit'` when it's included in `@edgeandnode/gds`'s global styles */}
           <Text.P14
             as="kbd"
             size="14px"
diff --git a/packages/nextra-theme/src/components/EditPageLink.tsx b/packages/nextra-theme/src/components/EditPageLink.tsx
@@ -10,7 +10,7 @@ import {
   Spacing,
   Text,
   useI18n,
-} from '@edgeandnode/components'
+} from '@edgeandnode/gds'
 
 import { Link } from '@/components'
 import { NavContext } from '@/layout/NavContext'
diff --git a/packages/nextra-theme/src/components/Heading.tsx b/packages/nextra-theme/src/components/Heading.tsx
@@ -3,7 +3,7 @@ import { HTMLAttributes, useContext } from 'react'
 import { useInView } from 'react-intersection-observer'
 import { useDebounce } from 'react-use'
 
-import { buildShadow, buildTransition, Opacity, Spacing, Text, TextProps, useI18n } from '@edgeandnode/components'
+import { buildShadow, buildTransition, Opacity, Spacing, Text, TextProps, useI18n } from '@edgeandnode/gds'
 
 import { LinkInline } from '@/components'
 import { DocumentContext } from '@/layout/DocumentContext'
diff --git a/packages/nextra-theme/src/components/Link.tsx b/packages/nextra-theme/src/components/Link.tsx
@@ -1,7 +1,7 @@
 import NextLink, { LinkProps as NextLinkProps } from 'next/link'
 import { AnchorHTMLAttributes } from 'react'
 
-import { buildShadow, buildTransition, useI18n, useTheme } from '@edgeandnode/components'
+import { buildShadow, buildTransition, useI18n, useTheme } from '@edgeandnode/gds'
 
 export type LinkProps = Pick<NextLinkProps, 'replace' | 'scroll' | 'shallow' | 'prefetch'> &
   Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'> & {
diff --git a/packages/nextra-theme/src/components/List.tsx b/packages/nextra-theme/src/components/List.tsx
@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 
-import { Spacing, Text, TextProps } from '@edgeandnode/components'
+import { Spacing, Text, TextProps } from '@edgeandnode/gds'
 
 export type ListProps = Omit<
   Omit<TextProps, 'as'> & {
diff --git a/packages/nextra-theme/src/components/NavTree.tsx b/packages/nextra-theme/src/components/NavTree.tsx
@@ -3,17 +3,7 @@ import * as Collapsible from '@radix-ui/react-collapsible'
 import { createContext, HTMLAttributes, useContext, useState } from 'react'
 import { SxProp } from 'theme-ui'
 
-import {
-  buildTransition,
-  Divider,
-  Flex,
-  Icon,
-  IconProps,
-  Spacing,
-  Text,
-  TextProps,
-  useI18n,
-} from '@edgeandnode/components'
+import { buildTransition, Divider, Flex, Icon, IconProps, Spacing, Text, TextProps, useI18n } from '@edgeandnode/gds'
 
 import { Link, LinkProps } from '@/components'
 
diff --git a/packages/nextra-theme/src/components/Paragraph.tsx b/packages/nextra-theme/src/components/Paragraph.tsx
@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 
-import { Spacing, Text, TextProps } from '@edgeandnode/components'
+import { Spacing, Text, TextProps } from '@edgeandnode/gds'
 
 export type ParagraphProps = Omit<TextProps & HTMLAttributes<HTMLParagraphElement>, 'color'>
 
diff --git a/packages/nextra-theme/src/components/Table.tsx b/packages/nextra-theme/src/components/Table.tsx
@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 
-import { buildBorder, buildColor, FontWeight, Spacing, Text } from '@edgeandnode/components'
+import { buildBorder, buildColor, FontWeight, Spacing, Text } from '@edgeandnode/gds'
 
 export type TableProps = Omit<HTMLAttributes<HTMLTableElement>, 'color'>
 
diff --git a/packages/nextra-theme/src/components/VideoEmbed.tsx b/packages/nextra-theme/src/components/VideoEmbed.tsx
@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 
-import { useI18n } from '@edgeandnode/components'
+import { useI18n } from '@edgeandnode/gds'
 
 export type VideoProps = (
   | {
diff --git a/packages/nextra-theme/src/index.tsx b/packages/nextra-theme/src/index.tsx
@@ -8,7 +8,7 @@ import { ReactElement, useCallback, useMemo } from 'react'
 import { useSet } from 'react-use'
 import { ThemeUIStyleObject } from 'theme-ui'
 
-import { Divider, DividerProps, Flex, Spacing, useI18n } from '@edgeandnode/components'
+import { Divider, DividerProps, Flex, Spacing, useI18n } from '@edgeandnode/gds'
 
 import {
   Blockquote,
diff --git a/packages/nextra-theme/src/layout/MDXLayoutNav.tsx b/packages/nextra-theme/src/layout/MDXLayoutNav.tsx
@@ -5,16 +5,7 @@ import { useRouter } from 'next/router'
 import { Item } from 'nextra/normalize-pages'
 import { PropsWithChildren, useContext, useEffect, useState } from 'react'
 
-import {
-  BorderRadius,
-  buildTransition,
-  Flex,
-  Icon,
-  NestedStrings,
-  Spacing,
-  Text,
-  useI18n,
-} from '@edgeandnode/components'
+import { BorderRadius, buildTransition, Flex, Icon, NestedStrings, Spacing, Text, useI18n } from '@edgeandnode/gds'
 
 import { DocSearch, Link, NavTree } from '@/components'
 import { NavContext } from '@/layout'
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, Divider, Flex, Spacing, Text, useI18n } from '@edgeandnode/components'
+import { buildTransition, Divider, Flex, Spacing, Text, useI18n } from '@edgeandnode/gds'
 
 import { EditPageLink, Link } from '@/components'
 import { DocumentContext } from '@/layout'
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 { buildShadow, buildTransition, Divider, Flex, Icon, Spacing, Text, useI18n } from '@edgeandnode/components'
+import { buildShadow, buildTransition, Divider, Flex, Icon, Spacing, Text, useI18n } from '@edgeandnode/gds'
 
 import { Link } from '@/components'
 import { NavContext } from '@/layout'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/website/components/IndexPage.tsx b/website/components/IndexPage.tsx
diff --git a/website/components/_app.tsx b/website/components/_app.tsx
diff --git a/website/i18n.ts b/website/i18n.ts
diff --git a/website/package.json b/website/package.json
diff --git a/website/pages/[locale]/[...404].tsx b/website/pages/[locale]/[...404].tsx
diff --git a/website/pages/_document.tsx b/website/pages/_document.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { useI18n } from '@edgeandnode/components'`
	`1`	`+import { useI18n } from '@edgeandnode/gds'`
`2`	`2`
`3`	`3`	`// TODO: Refactor this component`
`4`	`4`	`export const Difficulty = ({ level }: { level: string }) => {`