Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaMachina committed Aug 8, 2022
1 parent 44b6a2e commit 598c285
Show file tree
Hide file tree
Showing 8 changed files with 1,647 additions and 2,913 deletions.
1 change: 0 additions & 1 deletion website/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default withGuildDocs({
ignoreBuildErrors: true,
},
swcMinify: true,
reactStrictMode: true,
webpack(config) {
config.resolve.fallback = {
...config.resolve.fallback,
Expand Down
12 changes: 5 additions & 7 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"devDependencies": {
"@guild-docs/algolia": "0.2.0",
"@theguild/tailwind-config": "0.0.2",
"@types/classnames": "2.3.1",
"@types/dedent": "0.7.0",
"@types/jsonpath": "0.2.0",
"@types/node": "18.6.2",
Expand Down Expand Up @@ -65,17 +64,16 @@
"@graphql-codegen/typescript-vue-apollo-smart-ops": "2.3.3",
"@graphql-codegen/typescript-vue-urql": "2.3.3",
"@monaco-editor/react": "4.4.5",
"@theguild/components": "2.0.0",
"@theguild/components": "2.0.3",
"classnames": "2.3.1",
"date-fns": "2.29.1",
"dedent": "0.7.0",
"graphql": "16.5.0",
"guild-docs": "3.1.1-alpha-d6fed75.0",
"guild-docs": "3.1.1",
"js-yaml": "4.1.0",
"next": "12.2.3",
"next-mdx-remote": "4.0.3",
"next-sitemap": "3.1.10",
"node-polyfill-webpack-plugin": "2.0.0",
"next": "12.2.4",
"next-mdx-remote": "4.1.0",
"next-sitemap": "3.1.16",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-markdown": "8.0.3",
Expand Down
22 changes: 0 additions & 22 deletions website/patches/nextra-theme-docs+2.0.0-beta.10.patch

This file was deleted.

100 changes: 100 additions & 0 deletions website/public/config.schema.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions website/route-lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
/docs/getting-started/config-reference/codegen-config -> /docs/config-reference/codegen-config
/docs/getting-started/development-workflow
/docs/getting-started/documents-field -> /docs/config-reference/documents-field
/docs/getting-started/esm-typescript-usage
/docs/getting-started/how-does-it-work -> /docs/advanced/how-does-it-work
/docs/getting-started/installation
/docs/getting-started/lifecycle-hooks -> /docs/config-reference/lifecycle-hooks
Expand Down
4 changes: 2 additions & 2 deletions website/src/components/plugin.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactElement } from 'react';
import { useSSG } from 'nextra/ssg';
import { PackageCmd } from '@theguild/components';
import { components } from 'nextra-theme-docs';
import { getComponents } from 'nextra-theme-docs';
import { MDXRemote } from 'next-mdx-remote';
import { format } from 'date-fns';
import ClientNote from './client-note.mdx';
Expand Down Expand Up @@ -68,5 +68,5 @@ export const PluginHeader = ({
export const PluginApiDocs = (): ReactElement => {
// Get the data from SSG, and render it as a component.
const { compiledSource } = useSSG();
return <MDXRemote compiledSource={compiledSource} components={components} />;
return <MDXRemote compiledSource={compiledSource} components={getComponents()} />;
};
5 changes: 1 addition & 4 deletions website/src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ import 'guild-docs/style.css';

export default function App({ Component, pageProps, router }: AppProps): ReactElement {
const analytics = useGoogleAnalytics({ router, trackingId: 'G-0SE4YQR4K3' });
// @ts-expect-error -- getLayout is custom function from nextra
const { getLayout = page => page } = Component;

return (
<ThemeProvider attribute="class">
<Script src="https://the-guild.dev/static/crisp.js" />
<Script {...analytics.loadScriptProps} />
<Script {...analytics.configScriptProps} />
<Header accentColor="#0070f3" themeSwitch searchBarProps={{ version: 'v2' }} />
{getLayout(<Component {...pageProps} />)}
<Component {...pageProps} />
<FooterExtended />
</ThemeProvider>
);
Expand Down
4,415 changes: 1,538 additions & 2,877 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 598c285

Please sign in to comment.