Skip to content

Commit

Permalink
update guild-docs (#3379)
Browse files Browse the repository at this point in the history
* update guild-docs with new highlighter "shiki"

* fix TGC font

* add debug types
  • Loading branch information
PabloSzx authored Aug 16, 2021
1 parent c37b412 commit 9dfad28
Show file tree
Hide file tree
Showing 6 changed files with 1,110 additions and 989 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"@babel/preset-env": "7.15.0",
"@babel/preset-typescript": "7.15.0",
"@changesets/cli": "2.16.0",
"@types/debug": "^4.1.7",
"@types/jest": "27.0.1",
"@types/node": "14.17.9",
"@typescript-eslint/eslint-plugin": "4.29.1",
Expand Down Expand Up @@ -99,7 +100,7 @@
},
"resolutions": {
"graphql": "15.5.1",
"esbuild": "^0.12.8",
"esbuild": "^0.12.20",
"@changesets/apply-release-plan": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion website/docs/generate-schema.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ This [GraphQL schema language cheat sheet](https://raw.githubusercontent.com/sog

`makeExecutableSchema` takes a single argument: an object of options. Only the `typeDefs` option is required. It returns a new schema, modified as specified.

```
```js
import { makeExecutableSchema } from '@graphql-tools/schema';

const jsSchema = makeExecutableSchema({
Expand Down
3 changes: 3 additions & 0 deletions website/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/// <reference types="next" />
/// <reference types="next/types/global" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
17 changes: 11 additions & 6 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
"export": "next export",
"analyze": "cross-env ANALYZE=true next build"
},
"pnpm": { "overrides": { "esbuild": "^0.12.8" } },
"resolutions": { "esbuild": "0.12.20" },
"pnpm": {
"overrides": {
"esbuild": "^0.12.8"
}
},
"resolutions": {
"esbuild": "0.12.20"
},
"devDependencies": {
"@next/bundle-analyzer": "11.1.0",
"@types/concurrently": "6.2.1",
Expand All @@ -35,20 +41,19 @@
"@chakra-ui/utils": "1.8.2",
"@emotion/react": "11.4.1",
"@emotion/styled": "11.3.0",
"@guild-docs/client": "0.2.28",
"@guild-docs/server": "0.2.25",
"@guild-docs/client": "1.0.2",
"@guild-docs/server": "1.0.1",
"@mdx-js/react": "1.6.22",
"@theguild/components": "1.4.7",
"framer-motion": "4.1.17",
"next": "11.1.0",
"next-i18next": "8.6.0",
"next-seo": "4.26.0",
"prism-themes": "1.8.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-icons": "4.2.0",
"react-use": "17.2.4",
"remark-admonitions": "1.2.1",
"remark-prism": "1.3.6"
"shiki": "^0.9.6"
}
}
13 changes: 3 additions & 10 deletions website/src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
import 'remark-admonitions/styles/infima.css';
import 'prism-themes/themes/prism-atom-dark.css';
import '../../public/style.css';

import { appWithTranslation } from 'next-i18next';

import { extendTheme, theme as chakraTheme } from '@chakra-ui/react';
import { mode } from '@chakra-ui/theme-tools';
import { ExtendComponents, handlePushRoute, CombinedThemeProvider, DocsPage, AppSeoProps } from '@guild-docs/client';
import { handlePushRoute, CombinedThemeProvider, DocsPage, AppSeoProps } from '@guild-docs/client';
import { Header, Subheader, FooterExtended } from '@theguild/components';

import type { AppProps } from 'next/app';

ExtendComponents({
HelloWorld() {
return <p>Hello World!</p>;
},
});

const styles: typeof chakraTheme['styles'] = {
global: props => ({
body: {
Expand All @@ -42,8 +35,8 @@ const theme = extendTheme({
},
},
fonts: {
heading: '"Poppins", sans-serif',
body: '"Poppins", sans-serif',
heading: 'TGCFont, sans-serif',
body: 'TGCFont, sans-serif',
},
config: {
initialColorMode: 'light',
Expand Down
Loading

1 comment on commit 9dfad28

@vercel
Copy link

@vercel vercel bot commented on 9dfad28 Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.