cleanup workflows

Signed-off-by: saurabhraghuvanshii <saurabhsraghuvanshi@gmail.com>

Author: saurabhraghuvanshii

.github/workflows/build-and-deploy-site.yml

@@ -42,20 +42,28 @@ jobs:
       # User/organization sites use a repo named <owner>.github.io and are served from the domain root.
       - name: Build site
         env:
-          GITHUB_PAGES_ORIGIN: ${{ vars.GITHUB_PAGES_ORIGIN }}
+          PUBLIC_SITE_URL: ${{ vars.PUBLIC_SITE_URL }}
         run: |
           owner="${GITHUB_REPOSITORY%%/*}"
           repo_name="${GITHUB_REPOSITORY#*/}"
-          pages_origin="${GITHUB_PAGES_ORIGIN:-https://${owner}.github.io}"
-          pages_origin="${pages_origin%/}"
 
-          if [[ "$repo_name" == "${owner}.github.io" ]]; then
-            export GATSBY_SITE_URL="$pages_origin"
+          # Simple rule:
+          # - If PUBLIC_SITE_URL is set (custom domain), build at root (no repo prefix).
+          # - Otherwise use GitHub Pages URL; project repos need pathPrefix=<repo>.
+          if [[ -n "${PUBLIC_SITE_URL:-}" ]]; then
+            export GATSBY_SITE_URL="${PUBLIC_SITE_URL%/}"
+            unset PATH_PREFIX
             npm run build
           else
-            export GATSBY_SITE_URL="$pages_origin"
-            export PATH_PREFIX="$repo_name"
-            npm run build:gh-pages
+            if [[ "$repo_name" == "${owner}.github.io" ]]; then
+              export GATSBY_SITE_URL="https://${owner}.github.io"
+              unset PATH_PREFIX
+              npm run build
+            else
+              export GATSBY_SITE_URL="https://${owner}.github.io"
+              export PATH_PREFIX="$repo_name"
+              npm run build:gh-pages
+            fi
           fi
           touch public/.nojekyll
 

.github/workflows/build-and-preview-site.yml

@@ -24,12 +24,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: Checkout for cleanup
+      - name: Checkout base branch for cleanup
         if: github.event.action == 'closed'
         uses: actions/checkout@v6
         with:
-          ref: gh-pages
-          fetch-depth: 0
+          ref: ${{ github.event.pull_request.base.ref }}
+          fetch-depth: 1
 
       - name: Setup Node
         if: github.event.action != 'closed'
@@ -41,33 +41,24 @@ jobs:
         if: github.event.action != 'closed'
         run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
 
-      # Project Pages URLs are https://<owner>.github.io/<repo>/… so Gatsby pathPrefix must
-      # include <repo> (e.g. layer5/pr-preview/pr-9), not only /pr-preview/pr-9 — otherwise JS/CSS
-      # load from the wrong path and the shell renders without client-side content.
       - name: Resolve preview URLs
         if: github.event.action != 'closed'
         id: preview-vars
         env:
           PREVIEW_SITE_URL: ${{ vars.PREVIEW_SITE_URL }}
-          GITHUB_PAGES_ORIGIN: ${{ vars.GITHUB_PAGES_ORIGIN }}
+          PUBLIC_SITE_URL: ${{ vars.PUBLIC_SITE_URL }}
         run: |
           owner="${GITHUB_REPOSITORY%%/*}"
           repo_name="${GITHUB_REPOSITORY#*/}"
           pr="pr-${{ github.event.pull_request.number }}"
+          base="${PREVIEW_SITE_URL:-${PUBLIC_SITE_URL:-}}"
 
-          if [[ -n "${PREVIEW_SITE_URL:-}" ]]; then
-            base="${PREVIEW_SITE_URL%/}"
-            pages_origin="$(printf '%s' "$base" | sed -E 's|(https?://[^/]+).*|\1|')"
-            repo_path="$(printf '%s' "$base" | sed -E 's|https?://[^/]+||' | sed 's|^/||;s|/$||')"
-            if [[ -n "$repo_path" ]]; then
-              path_prefix="${repo_path}/pr-preview/${pr}"
-            else
-              path_prefix="pr-preview/${pr}"
-            fi
-            preview_url="${base}/pr-preview/${pr}/"
+          if [[ -n "$base" ]]; then
+            pages_origin="${base%/}"
+            path_prefix="pr-preview/${pr}"
+            preview_url="${pages_origin}/pr-preview/${pr}/"
           else
-            pages_origin="${GITHUB_PAGES_ORIGIN:-https://${owner}.github.io}"
-            pages_origin="${pages_origin%/}"
+            pages_origin="https://${owner}.github.io"
             if [[ "$repo_name" == "${owner}.github.io" ]]; then
               path_prefix="pr-preview/${pr}"
               preview_url="${pages_origin}/pr-preview/${pr}/"

src/components/seo.js

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { useLocation } from "@reach/router";
-import { useStaticQuery, graphql, withPrefix } from "gatsby";
+import { useStaticQuery, graphql } from "gatsby";
 import FavIcon from "../assets/images/favicon.webp";
 
 export const useSiteMetadata = () => {
@@ -43,9 +43,7 @@ const SEO = ({
   const toAbsoluteUrl = (value) => {
     if (!value) return value;
     if (/^(?:[a-z]+:)?\/\//i.test(value)) return value;
-
-    const resolvedPath = withPrefix(value).replace(/^\//, "");
-    return new URL(resolvedPath, `${siteUrl}/`).toString();
+    return new URL(value.replace(/^\//, ""), `${siteUrl}/`).toString();
   };
   const seo = {
     title: title || defaultTitle,