Fix GitHub widget/data endpoints to prefer /github/api routes

_data/githubActivity.js

@@ -16,23 +16,30 @@ const FALLBACK_FEATURED_REPOS = process.env.GITHUB_FEATURED_REPOS?.split(",").fi
  * Fetch from Indiekit's public GitHub API endpoint
  */
 async function fetchFromIndiekit(endpoint) {
+  const urls = [
+    `${INDIEKIT_URL}/github/api/${endpoint}`,
+    `${INDIEKIT_URL}/githubapi/api/${endpoint}`,
+  ];
+
+  for (const url of urls) {
     try {
-    const url = `${INDIEKIT_URL}/githubapi/api/${endpoint}`;
       console.log(`[githubActivity] Fetching from Indiekit: ${url}`);
       const data = await EleventyFetch(url, {
         duration: "15m",
         type: "json",
       });
-    console.log(`[githubActivity] Indiekit ${endpoint} success`);
+      console.log(`[githubActivity] Indiekit ${endpoint} success via ${url}`);
       return data;
     } catch (error) {
       console.log(
-      `[githubActivity] Indiekit API unavailable for ${endpoint}: ${error.message}`
+        `[githubActivity] Indiekit API unavailable for ${endpoint} at ${url}: ${error.message}`
       );
-    return null;
     }
   }
 
+  return null;
+}
+
 /**
  * Fetch from GitHub API directly
  */

_data/githubStarred.js

@@ -12,7 +12,13 @@ const INDIEKIT_URL = process.env.SITE_URL || "https://example.com";
 
 export default async function () {
   try {
-    const url = `${INDIEKIT_URL}/githubapi/api/starred/all`;
+    const urls = [
+      `${INDIEKIT_URL}/github/api/starred/all`,
+      `${INDIEKIT_URL}/githubapi/api/starred/all`,
+    ];
+
+    for (const url of urls) {
+      try {
         const response = await EleventyFetch(url, {
           duration: "15m",
           type: "json",
@@ -22,6 +28,12 @@ export default async function () {
           totalCount: response.totalCount || 0,
           buildDate: new Date().toISOString(),
         };
+      } catch (error) {
+        console.log(`[githubStarred] Could not fetch ${url}: ${error.message}`);
+      }
+    }
+
+    throw new Error("No GitHub starred endpoint responded");
   } catch (error) {
     console.log(`[githubStarred] Could not fetch starred count: ${error.message}`);
     return {

_includes/components/widgets/github-repos.njk

@@ -255,9 +255,9 @@ function githubWidget(username) {
 
       try {
         const [commitsRes, featuredRes, contribRes] = await Promise.all([
-          this.fetchJson(['/githubapi/api/commits', '/github/api/commits']),
+          this.fetchJson(['/github/api/commits', '/githubapi/api/commits']),
-          this.fetchJson(['/githubapi/api/featured', '/github/api/featured']),
+          this.fetchJson(['/github/api/featured', '/githubapi/api/featured']),
-          this.fetchJson(['/githubapi/api/contributions', '/github/api/contributions']),
+          this.fetchJson(['/github/api/contributions', '/githubapi/api/contributions']),
         ]);
 
         if (commitsRes.ok) {

changelog.njk

@@ -182,8 +182,8 @@ function changelogApp() {
     async fetchChangelog(days) {
       try {
         const result = await this.fetchJson([
-          '/githubapi/api/changelog?days=' + days,
           '/github/api/changelog?days=' + days,
+          '/githubapi/api/changelog?days=' + days,
         ]);
 
         if (!result.ok) throw new Error('Failed to fetch');

starred.njk

@@ -422,9 +422,20 @@ document.addEventListener("alpine:init", () => {
 
     async init() {
       try {
-        const res = await fetch("/githubapi/api/starred/all");
+        let data = null;
-        if (!res.ok) throw new Error("API returned " + res.status);
+        for (const path of ["/github/api/starred/all", "/githubapi/api/starred/all"]) {
-        const data = await res.json();
+          try {
+            const res = await fetch(path);
+            if (res.ok) {
+              data = await res.json();
+              break;
+            }
+          } catch {
+            // Try next candidate path.
+          }
+        }
+
+        if (!data) throw new Error("API returned no usable response");
         this.allStars = data.stars || [];
         this.listMeta = (data.listMeta || []).sort((a, b) => a.name.localeCompare(b.name));
         this.totalCount = data.totalCount || 0;

theme/_data/githubActivity.js

@@ -16,23 +16,30 @@ const FALLBACK_FEATURED_REPOS = process.env.GITHUB_FEATURED_REPOS?.split(",").fi
  * Fetch from Indiekit's public GitHub API endpoint
  */
 async function fetchFromIndiekit(endpoint) {
+  const urls = [
+    `${INDIEKIT_URL}/github/api/${endpoint}`,
+    `${INDIEKIT_URL}/githubapi/api/${endpoint}`,
+  ];
+
+  for (const url of urls) {
     try {
-    const url = `${INDIEKIT_URL}/githubapi/api/${endpoint}`;
       console.log(`[githubActivity] Fetching from Indiekit: ${url}`);
       const data = await EleventyFetch(url, {
         duration: "15m",
         type: "json",
       });
-    console.log(`[githubActivity] Indiekit ${endpoint} success`);
+      console.log(`[githubActivity] Indiekit ${endpoint} success via ${url}`);
       return data;
     } catch (error) {
       console.log(
-      `[githubActivity] Indiekit API unavailable for ${endpoint}: ${error.message}`
+        `[githubActivity] Indiekit API unavailable for ${endpoint} at ${url}: ${error.message}`
       );
-    return null;
     }
   }
 
+  return null;
+}
+
 /**
  * Fetch from GitHub API directly
  */

theme/_data/githubStarred.js

@@ -12,7 +12,13 @@ const INDIEKIT_URL = process.env.SITE_URL || "https://example.com";
 
 export default async function () {
   try {
-    const url = `${INDIEKIT_URL}/githubapi/api/starred/all`;
+    const urls = [
+      `${INDIEKIT_URL}/github/api/starred/all`,
+      `${INDIEKIT_URL}/githubapi/api/starred/all`,
+    ];
+
+    for (const url of urls) {
+      try {
         const response = await EleventyFetch(url, {
           duration: "15m",
           type: "json",
@@ -22,6 +28,12 @@ export default async function () {
           totalCount: response.totalCount || 0,
           buildDate: new Date().toISOString(),
         };
+      } catch (error) {
+        console.log(`[githubStarred] Could not fetch ${url}: ${error.message}`);
+      }
+    }
+
+    throw new Error("No GitHub starred endpoint responded");
   } catch (error) {
     console.log(`[githubStarred] Could not fetch starred count: ${error.message}`);
     return {

theme/_includes/components/widgets/github-repos.njk

@@ -247,9 +247,9 @@ function githubWidget(username) {
 
       try {
         const [commitsRes, featuredRes, contribRes] = await Promise.all([
-          this.fetchJson(['/githubapi/api/commits', '/github/api/commits']),
+          this.fetchJson(['/github/api/commits', '/githubapi/api/commits']),
-          this.fetchJson(['/githubapi/api/featured', '/github/api/featured']),
+          this.fetchJson(['/github/api/featured', '/githubapi/api/featured']),
-          this.fetchJson(['/githubapi/api/contributions', '/github/api/contributions']),
+          this.fetchJson(['/github/api/contributions', '/githubapi/api/contributions']),
         ]);
 
         if (commitsRes.ok) {

theme/changelog.njk

@@ -180,8 +180,8 @@ function changelogApp() {
     async fetchChangelog(days) {
       try {
         const result = await this.fetchJson([
-          '/githubapi/api/changelog?days=' + days,
           '/github/api/changelog?days=' + days,
+          '/githubapi/api/changelog?days=' + days,
         ]);
 
         if (!result.ok) throw new Error('Failed to fetch');

theme/starred.njk

@@ -416,9 +416,20 @@ document.addEventListener("alpine:init", () => {
 
     async init() {
       try {
-        const res = await fetch("/githubapi/api/starred/all");
+        let data = null;
-        if (!res.ok) throw new Error("API returned " + res.status);
+        for (const path of ["/github/api/starred/all", "/githubapi/api/starred/all"]) {
-        const data = await res.json();
+          try {
+            const res = await fetch(path);
+            if (res.ok) {
+              data = await res.json();
+              break;
+            }
+          } catch {
+            // Try next candidate path.
+          }
+        }
+
+        if (!data) throw new Error("API returned no usable response");
         this.allStars = data.stars || [];
         this.listMeta = (data.listMeta || []).sort((a, b) => a.name.localeCompare(b.name));
         this.totalCount = data.totalCount || 0;