Update to latest website setup and use unified domain (#2247)

Author: TuvalSimha

.github/workflows/website.yml

@@ -1,26 +1,43 @@
-name: Build website
+name: website
+
 on:
-  [push, pull_request]
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
-  build_website:
-    name: Build Website
+  deployment:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'
     steps:
-      - name: Checkout Master
+      - name: checkout
         uses: actions/checkout@v3
-      - name: Use Node
-        uses: actions/setup-node@master
         with:
-          node-version: 18
-      - name: Cache Yarn
-        uses: actions/cache@v3
+          fetch-depth: 0
+
+      - uses: the-guild-org/shared-config/setup@main
+        name: setup env
+        with:
+          nodeVersion: 18
+          packageManager: yarn
+
+      - uses: the-guild-org/shared-config/website-cf@main
+        name: build and deploy website
+        env:
+          NEXT_BASE_PATH: ${{ github.ref == 'refs/heads/master' && '/graphql/modules' || '' }}
+          SITE_URL: ${{ github.ref == 'refs/heads/master' && 'https://the-guild.dev/graphql/modules' || '' }}
+          NEXT_PUBLIC_ALGOLIA_INDEX_NAME: ${{ secrets.NEXT_PUBLIC_ALGOLIA_INDEX_NAME }}
+          NEXT_PUBLIC_ALGOLIA_SEARCH_API_KEY: ${{ secrets.NEXT_PUBLIC_ALGOLIA_SEARCH_API_KEY }}
+          NEXT_PUBLIC_ALGOLIA_APP_ID: ${{ secrets.NEXT_PUBLIC_ALGOLIA_APP_ID }}
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-18-16-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-18-16-yarn-
-      - name: Install Dependencies using Yarn
-        run: yarn install --ignore-engines && git checkout yarn.lock
-      - name: Build
-        run: yarn workspace website run build
+          cloudflareApiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          cloudflareAccountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          projectName: graphql-modules
+          prId: ${{ github.event.pull_request.number }}
+          websiteDirectory: ./
+          buildScript: yarn build && cd website && yarn build && yarn next export
+          artifactDir: website/out

website/next-sitemap.config.cjs

@@ -0,0 +1,6 @@
+/** @type {import('next-sitemap').IConfig} */
+
+module.exports = {
+  siteUrl: process.env.SITE_URL || 'https://the-guild.dev/graphql/modules',
+  generateIndexSitemap: false,
+};

website/next.config.mjs

@@ -1,3 +1,14 @@
 import { withGuildDocs } from '@theguild/components/next.config';
 
-export default withGuildDocs();
+export default withGuildDocs({
+  images: {
+    unoptimized: true, // doesn't work with `next export`
+    allowFutureImage: true,
+  },
+  redirects: () =>
+    Object.entries({}).map(([from, to]) => ({
+      source: from,
+      destination: to,
+      permanent: true,
+    })),
+});

website/package.json

@@ -5,16 +5,19 @@
   "type": "module",
   "scripts": {
     "algolia-sync": "node scripts/algolia-ci.mjs",
-    "dev": "next",
-    "build": "next build",
+    "build": "next build && next-sitemap --config next-sitemap.config.cjs ",
+    "dev": "next dev",
+    "next": "next",
     "start": "next start",
     "analyze": "cross-env ANALYZE=true next build"
   },
   "dependencies": {
     "@theguild/components": "4.0.3",
     "next": "12.3.1",
+    "next-sitemap": "3.1.22",
     "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react-dom": "18.2.0",
+    "wrangler": "2.1.5"
   },
   "browserslist": {
     "production": [

website/src/index-page.tsx

@@ -4,7 +4,6 @@ import {
   HeroGradient,
   HeroIllustration,
   NPMBadge,
-  Image,
   IFeatureListProps,
 } from '@theguild/components';
 
@@ -13,12 +12,7 @@ import reuse from '../public/assets/img/home/reuse-feat.svg';
 import extend from '../public/assets/img/home/extend-feat.svg';
 import easy from '../public/assets/img/home/easy-feat.svg';
 import rocket from '../public/assets/img/home/rocket.svg';
-import apollo from '../public/assets/img/home/companies/apollo-logo.png';
 import workers from '../public/assets/img/home/workers-full.svg';
-import airFrance from '../public/assets/img/home/companies/airfrance-logo.svg';
-import klm from '../public/assets/img/home/companies/klm-logo.svg';
-import msj from '../public/assets/img/home/companies/msj-logo.svg';
-import schneider from '../public/assets/img/home/companies/schneider-logo.svg';
 
 const FEATURE_LIST: IFeatureListProps['items'] = [
   {
@@ -87,35 +81,12 @@ export const IndexPage = (): ReactElement => {
         }}
       />
 
-      <div className="flex justify-center p-6 md:p-0">
-        {[
-          { src: airFrance, alt: 'AirFrance' },
-          { src: klm, alt: 'KLM' },
-          { src: msj, alt: 'Mount St. Joseph University' },
-          { src: schneider, alt: 'Schneider' },
-        ].map(({ src, alt }) => (
-          <Image
-            key={alt}
-            src={src}
-            alt={alt}
-            loading="eager"
-            placeholder="empty"
-          />
-        ))}
-      </div>
-
       <FeatureList items={FEATURE_LIST} className="[&_h3]:mt-4" />
 
       <HeroIllustration
         flipped
-        title={
-          <>
-            Integrates with Your
-            <Image src={apollo} alt="Apollo" className="inline h-9 w-auto" />
-            Server
-          </>
-        }
-        description="GraphQL Modules is a set of extra tools, structures and guidelines around the amazing Apollo Server 2.0. You’ll see how effective those tools are once you’ll start growing and scaling your GraphQL server."
+        title={<>Integrates with any GraphQL Server</>}
+        description="GraphQL Modules is a set of extra tools, structures and guidelines around your GraphQL schema. You’ll see how effective those tools are once you’ll start growing and scaling your GraphQL server."
         image={{
           src: workers,
           loading: 'eager',