Skip to content

Commit 9bec51c

Browse files
authored
Merge pull request #2489 from Urigo/guild-components-dependency-bump2
Bump @theguild/components
2 parents bb33bf3 + b8be116 commit 9bec51c

File tree

6 files changed

+204
-271
lines changed

6 files changed

+204
-271
lines changed

.github/workflows/pr.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,3 @@ jobs:
1919
uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main
2020
secrets:
2121
githubToken: ${{ secrets.GITHUB_TOKEN }}
22-
23-
algolia:
24-
uses: the-guild-org/shared-config/.github/workflows/algolia-integrity.yml@main
25-
with:
26-
domain: https://www.the-guild.dev/graphql/modules/
27-
source: 'Modules'
28-
secrets:
29-
githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ jobs:
3636
projectName: graphql-modules
3737
prId: ${{ github.event.pull_request.number }}
3838
websiteDirectory: ./
39-
buildScript: yarn build && cd website && yarn build && yarn next export
39+
buildScript: yarn build && cd website && yarn build
4040
artifactDir: website/out

website/next.config.mjs

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
import { withGuildDocs } from '@theguild/components/next.config';
22

3-
export default withGuildDocs({
4-
redirects: () =>
5-
Object.entries({
6-
'/di/introduction': '/docs/di/introduction',
7-
'/docs/di': '/docs/di/introduction',
8-
'/docs/legacy/recipes/type-graphql': '/docs/get-started',
9-
'/docs/introduction/getting-started': '/docs/get-started',
10-
'/docs/guides/development-environment': '/docs/get-started',
11-
'/docs/recipes/db-connection-pooling': '/docs/get-started',
12-
'/docs/legacy/recipes/development-environment': '/docs/get-started',
13-
'/docs/legacy/recipes/file-uploads': '/docs/get-started',
14-
'/docs/api.md': '/docs/api',
15-
'/docs/api/api.md': '/docs/api',
16-
'/docs/essentials': '/docs/essentials/type-definitions',
17-
'/docs/introduction/context': '/docs/essentials/context',
18-
'/docs/advanced': '/docs/advanced/subscriptions',
19-
'/docs/next/recipes/migration': '/docs/recipes/migration',
20-
'/docs/legacy/introduction/context': '/docs/get-started',
21-
'/docs/guides/data-sources': '/docs/get-started',
22-
'/docs/introduction/dependency-injection': '/docs/di/introduction',
23-
'/docs/introduction/resolvers-composition': '/docs/essentials/resolvers',
24-
}).map(([from, to]) => ({
25-
source: from,
26-
destination: to,
27-
permanent: true,
28-
})),
29-
});
3+
export default {
4+
...withGuildDocs({
5+
redirects: () =>
6+
Object.entries({
7+
'/di/introduction': '/docs/di/introduction',
8+
'/docs/di': '/docs/di/introduction',
9+
'/docs/legacy/recipes/type-graphql': '/docs/get-started',
10+
'/docs/introduction/getting-started': '/docs/get-started',
11+
'/docs/guides/development-environment': '/docs/get-started',
12+
'/docs/recipes/db-connection-pooling': '/docs/get-started',
13+
'/docs/legacy/recipes/development-environment': '/docs/get-started',
14+
'/docs/legacy/recipes/file-uploads': '/docs/get-started',
15+
'/docs/api.md': '/docs/api',
16+
'/docs/api/api.md': '/docs/api',
17+
'/docs/essentials': '/docs/essentials/type-definitions',
18+
'/docs/introduction/context': '/docs/essentials/context',
19+
'/docs/advanced': '/docs/advanced/subscriptions',
20+
'/docs/next/recipes/migration': '/docs/recipes/migration',
21+
'/docs/legacy/introduction/context': '/docs/get-started',
22+
'/docs/guides/data-sources': '/docs/get-started',
23+
'/docs/introduction/dependency-injection': '/docs/di/introduction',
24+
'/docs/introduction/resolvers-composition':
25+
'/docs/essentials/resolvers',
26+
}).map(([from, to]) => ({
27+
source: from,
28+
destination: to,
29+
permanent: true,
30+
})),
31+
}),
32+
output: 'export',
33+
};

website/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"analyze": "cross-env ANALYZE=true next build"
1212
},
1313
"dependencies": {
14-
"@theguild/components": "^6.3.0",
15-
"next": "^13.5.4",
14+
"@theguild/components": "^6.4.0",
15+
"next": "^14.1.4",
1616
"next-sitemap": "^4.2.3",
1717
"react": "^18.2.0",
1818
"react-dom": "^18.2.0"

website/theme.config.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/* eslint sort-keys: error */
2-
import { defineConfig, Giscus, useTheme } from '@theguild/components';
2+
import { defineConfig, Giscus, PRODUCTS, useTheme } from '@theguild/components';
33
import { useRouter } from 'next/router';
44

55
export default defineConfig({
6+
description: PRODUCTS.MODULES.title,
67
docsRepositoryBase:
78
'https://github.com/Urigo/graphql-modules/tree/master/website',
9+
logo: PRODUCTS.MODULES.logo({ className: 'w-9' }),
810
main({ children }) {
911
const { resolvedTheme } = useTheme();
1012
const { route } = useRouter();
@@ -28,5 +30,5 @@ export default defineConfig({
2830
</>
2931
);
3032
},
31-
siteName: 'MODULES',
33+
websiteName: 'MODULES',
3234
});

0 commit comments

Comments
 (0)