Skip to content

Commit

Permalink
Update pnpm + dependencies (#345)
Browse files Browse the repository at this point in the history
  • Loading branch information
benface authored Apr 24, 2023
1 parent e178a3e commit 415ade7
Show file tree
Hide file tree
Showing 28 changed files with 3,625 additions and 2,419 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-cd-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14
18.15
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -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/*",
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions packages/nextra-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Blockquote.tsx
Original file line number Diff line number Diff line change
@@ -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'>

Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Code.tsx
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Difficulty.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useI18n } from '@edgeandnode/components'
import { useI18n } from '@edgeandnode/gds'

// TODO: Refactor this component
export const Difficulty = ({ level }: { level: string }) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/nextra-theme/src/components/DocSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
Opacity,
Spacing,
Text,
} from '@edgeandnode/components'
} from '@edgeandnode/gds'

const BREAKPOINT = '751px'

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/EditPageLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Spacing,
Text,
useI18n,
} from '@edgeandnode/components'
} from '@edgeandnode/gds'

import { Link } from '@/components'
import { NavContext } from '@/layout/NavContext'
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Link.tsx
Original file line number Diff line number Diff line change
@@ -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'> & {
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/List.tsx
Original file line number Diff line number Diff line change
@@ -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'> & {
Expand Down
12 changes: 1 addition & 11 deletions packages/nextra-theme/src/components/NavTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Paragraph.tsx
Original file line number Diff line number Diff line change
@@ -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'>

Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/Table.tsx
Original file line number Diff line number Diff line change
@@ -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'>

Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/components/VideoEmbed.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HTMLAttributes } from 'react'

import { useI18n } from '@edgeandnode/components'
import { useI18n } from '@edgeandnode/gds'

export type VideoProps = (
| {
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 1 addition & 10 deletions packages/nextra-theme/src/layout/MDXLayoutNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/layout/MDXLayoutOutline.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/nextra-theme/src/layout/MDXLayoutPagination.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading

0 comments on commit 415ade7

Please sign in to comment.