Merge pull request #2489 from Urigo/guild-components-dependency-bump2

Bump @theguild/components
Urigo · Mar 21, 2024 · 9bec51c · 9bec51c
2 parents bb33bf3 + b8be116
commit 9bec51c
Show file tree

Hide file tree

Showing 6 changed files with 204 additions and 271 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -19,11 +19,3 @@ jobs:
     uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
-
-  algolia:
-    uses: the-guild-org/shared-config/.github/workflows/algolia-integrity.yml@main
-    with:
-      domain: https://www.the-guild.dev/graphql/modules/
-      source: 'Modules'
-    secrets:
-      githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -36,5 +36,5 @@ jobs:
           projectName: graphql-modules
           prId: ${{ github.event.pull_request.number }}
           websiteDirectory: ./
-          buildScript: yarn build && cd website && yarn build && yarn next export
+          buildScript: yarn build && cd website && yarn build
           artifactDir: website/out
diff --git a/website/next.config.mjs b/website/next.config.mjs
@@ -1,29 +1,33 @@
 import { withGuildDocs } from '@theguild/components/next.config';
 
-export default withGuildDocs({
-  redirects: () =>
-    Object.entries({
-      '/di/introduction': '/docs/di/introduction',
-      '/docs/di': '/docs/di/introduction',
-      '/docs/legacy/recipes/type-graphql': '/docs/get-started',
-      '/docs/introduction/getting-started': '/docs/get-started',
-      '/docs/guides/development-environment': '/docs/get-started',
-      '/docs/recipes/db-connection-pooling': '/docs/get-started',
-      '/docs/legacy/recipes/development-environment': '/docs/get-started',
-      '/docs/legacy/recipes/file-uploads': '/docs/get-started',
-      '/docs/api.md': '/docs/api',
-      '/docs/api/api.md': '/docs/api',
-      '/docs/essentials': '/docs/essentials/type-definitions',
-      '/docs/introduction/context': '/docs/essentials/context',
-      '/docs/advanced': '/docs/advanced/subscriptions',
-      '/docs/next/recipes/migration': '/docs/recipes/migration',
-      '/docs/legacy/introduction/context': '/docs/get-started',
-      '/docs/guides/data-sources': '/docs/get-started',
-      '/docs/introduction/dependency-injection': '/docs/di/introduction',
-      '/docs/introduction/resolvers-composition': '/docs/essentials/resolvers',
-    }).map(([from, to]) => ({
-      source: from,
-      destination: to,
-      permanent: true,
-    })),
-});
+export default {
+  ...withGuildDocs({
+    redirects: () =>
+      Object.entries({
+        '/di/introduction': '/docs/di/introduction',
+        '/docs/di': '/docs/di/introduction',
+        '/docs/legacy/recipes/type-graphql': '/docs/get-started',
+        '/docs/introduction/getting-started': '/docs/get-started',
+        '/docs/guides/development-environment': '/docs/get-started',
+        '/docs/recipes/db-connection-pooling': '/docs/get-started',
+        '/docs/legacy/recipes/development-environment': '/docs/get-started',
+        '/docs/legacy/recipes/file-uploads': '/docs/get-started',
+        '/docs/api.md': '/docs/api',
+        '/docs/api/api.md': '/docs/api',
+        '/docs/essentials': '/docs/essentials/type-definitions',
+        '/docs/introduction/context': '/docs/essentials/context',
+        '/docs/advanced': '/docs/advanced/subscriptions',
+        '/docs/next/recipes/migration': '/docs/recipes/migration',
+        '/docs/legacy/introduction/context': '/docs/get-started',
+        '/docs/guides/data-sources': '/docs/get-started',
+        '/docs/introduction/dependency-injection': '/docs/di/introduction',
+        '/docs/introduction/resolvers-composition':
+          '/docs/essentials/resolvers',
+      }).map(([from, to]) => ({
+        source: from,
+        destination: to,
+        permanent: true,
+      })),
+  }),
+  output: 'export',
+};
diff --git a/website/package.json b/website/package.json
@@ -11,8 +11,8 @@
     "analyze": "cross-env ANALYZE=true next build"
   },
   "dependencies": {
-    "@theguild/components": "^6.3.0",
-    "next": "^13.5.4",
+    "@theguild/components": "^6.4.0",
+    "next": "^14.1.4",
     "next-sitemap": "^4.2.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/website/theme.config.tsx b/website/theme.config.tsx
@@ -1,10 +1,12 @@
 /* eslint sort-keys: error */
-import { defineConfig, Giscus, useTheme } from '@theguild/components';
+import { defineConfig, Giscus, PRODUCTS, useTheme } from '@theguild/components';
 import { useRouter } from 'next/router';
 
 export default defineConfig({
+  description: PRODUCTS.MODULES.title,
   docsRepositoryBase:
     'https://github.com/Urigo/graphql-modules/tree/master/website',
+  logo: PRODUCTS.MODULES.logo({ className: 'w-9' }),
   main({ children }) {
     const { resolvedTheme } = useTheme();
     const { route } = useRouter();
@@ -28,5 +30,5 @@ export default defineConfig({
       </>
     );
   },
-  siteName: 'MODULES',
+  websiteName: 'MODULES',
 });