Merge pull request #7154 from layer5io/leecalcote/gatsby-source-filesystem-consolidation

Consolidate gatsby-source-filesystem configuration and streamline source logic in gatsby-node.js

Author: leecalcote

gatsby-config.js

@@ -477,85 +477,22 @@ module.exports = {
     {
       resolve: "gatsby-source-filesystem",
       options: {
-        name: "images",
-        path: `${__dirname}/src/assets/images`,
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/blog`,
-        name: "blog",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/news`,
-        name: "news",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/projects`,
-        name: "projects",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/service-mesh-books`,
-        name: "service-mesh-books",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/programs`,
-        name: "programs",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/careers`,
-        name: "careers",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/members`,
-        name: "members",
+        path: `${__dirname}/src/collections`,
+        name: "collections",
       },
     },
     {
       resolve: "gatsby-source-filesystem",
       options: {
-        path: `${__dirname}/src/collections/workshops`,
-        name: "workshops",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/kanvas-labs`,
-        name: "kanvas-labs",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/resources`,
-        name: "resources",
+        path: `${__dirname}/src/sections/Meshery/Meshery-platforms/supported-icons`,
+        name: "integration-images",
       },
     },
     {
       resolve: "gatsby-source-filesystem",
       options: {
-        path: `${__dirname}/src/collections/events`,
-        name: "events",
+        name: "images",
+        path: `${__dirname}/src/assets/images`,
       },
     },
     {
@@ -565,27 +502,6 @@ module.exports = {
         name: "content-learn",
       },
     },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/integrations`,
-        name: "integrations",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        path: `${__dirname}/src/collections/use-cases`,
-        name: "use-cases",
-      },
-    },
-    {
-      resolve: "gatsby-source-filesystem",
-      options: {
-        name: "integration-images",
-        path: `${__dirname}/src/sections/Meshery/Meshery-platforms/supported-icons`,
-      },
-    },
     "gatsby-plugin-image",
     {
       resolve: "gatsby-plugin-sharp",

gatsby-node.js

@@ -552,7 +552,17 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
   }
 
   const { createNodeField } = actions;
-  const collection = getNode(node.parent).sourceInstanceName;
+  const parent = getNode(node.parent);
+  let collection = parent.sourceInstanceName;
+
+  // --- CHANGED: Consolidated Source Logic ---
+  // If the source is "collections", we determine the actual collection
+  // from the parent directory name (e.g., "blog", "news", etc.)
+  if (collection === "collections") {
+    collection = parent.relativeDirectory.split("/")[0];
+  }
+  // ------------------------------------------
+
   createNodeField({
     name: "collection",
     node,
@@ -790,4 +800,4 @@ exports.onPostBuild = async ({ graphql, reporter }) => {
   // Optionally, write the result to a file for easier inspection
   const outputPath = path.resolve(__dirname, "public", "query-result.json");
   fs.writeFileSync(outputPath, JSON.stringify(result, null, 2));
-};
+};