Merge branch 'master' into M-DEV-1/replace-images-on-colors-page

Author: vr-varad

.github/labeler.yml

@@ -51,7 +51,7 @@ area/learn:
     - "src/components/Learn-Components/**/*"
     - "src/collections/service-mesh-books/**/*"
     - "src/collections/service-mesh-learn/**/*"
-    - "src/collections/service-mesh-workshops/**/*"
+    - "src/collections/workshops/**/*"
     - "src/templates/book-*.js"
     - "src/templates/course-*.js"
     - "src/templates/lab-*.js"

gatsby-config.js

@@ -13,15 +13,28 @@ module.exports = {
   },
   flags: {
     FAST_DEV: true,
-    PARALLEL_SOURCING: true
+    PARALLEL_SOURCING: true,
   },
   trailingSlash: "never",
   plugins: [
+    {
+      resolve: "gatsby-plugin-netlify",
+      options: {
+        headers: {
+          "/*": [
+            "X-Frame-Options: SAMEORIGIN",
+            "Content-Security-Policy: frame-ancestors 'self'",
+          ],
+        },
+        mergeSecurityHeaders: true,
+        mergeCachingHeaders: true,
+      },
+    },
     {
       resolve: "gatsby-plugin-webpack-bundle-analyser-v2",
       options: {
-        disable: true
-      }
+        disable: true,
+      },
     },
     {
       resolve: "gatsby-plugin-sitemap",
@@ -41,10 +54,8 @@ module.exports = {
           }
         }
       `,
-        resolvePages: ({
-          allSitePage: { nodes: allPages },
-        }) => {
-          return allPages.map(page => {
+        resolvePages: ({ allSitePage: { nodes: allPages } }) => {
+          return allPages.map((page) => {
             return { ...page };
           });
         },
@@ -73,8 +84,8 @@ module.exports = {
                   // or disable plugins
                   inlineStyles: false,
                   cleanupIds: false,
-                }
-              }
+                },
+              },
             },
           ],
         },
@@ -287,7 +298,71 @@ module.exports = {
           },
           {
             serialize: ({ query: { site, allPosts } }) => {
-              return allPosts.nodes.map(node => {
+              return allPosts.nodes.map((node) => {
+                return Object.assign({}, node.frontmatter, {
+                  title: node.frontmatter.title,
+                  author: node.frontmatter.author,
+                  description:
+                    node.frontmatter.description || node.frontmatter.subtitle,
+                  date: node.frontmatter.date,
+                  url: site.siteMetadata.siteUrl + node.fields.slug,
+                  guid: site.siteMetadata.siteUrl + node.fields.slug,
+                  enclosure: node.frontmatter.thumbnail && {
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
+                  },
+                  custom_elements: [
+                    { "content:encoded": node.html },
+                    { "content:type": node.frontmatter.type },
+                    { "content:category": node.frontmatter.category },
+                    { "content:tags": node.frontmatter.tags?.join(", ") || "" },
+                  ],
+                });
+              });
+            },
+            query: `{
+  allPosts: allMdx(
+    sort: {frontmatter: {date: DESC}}
+    filter: {
+      fields: {collection: {in: ["blog", "resources", "news", "events"]}}, 
+      frontmatter: {
+      published: { eq: true }
+      category: { in: ["Meshery", "Announcements", "Events"] }
+      tags: { in: ["Community", "Meshery", "mesheryctl"] }
+    }
+    }
+    limit: 30
+  ) {
+    nodes {
+      body
+      html
+      frontmatter {
+        title
+        author
+        description
+        subtitle
+        date(formatString: "MMM DD YYYY")
+        type
+        category
+        thumbnail {
+          publicURL
+        }
+        tags
+      }
+      fields {
+        collection
+        slug
+      }
+    }
+  }
+}`,
+            output: "/meshery-community-feed.xml",
+            title: "Meshery RSSFeed",
+          },
+          {
+            serialize: ({ query: { site, allPosts } }) => {
+              return allPosts.nodes.map((node) => {
                 return Object.assign({}, node.frontmatter, {
                   title: node.frontmatter.title,
                   author: node.frontmatter.author,
@@ -296,7 +371,9 @@ module.exports = {
                   url: site.siteMetadata.siteUrl + node.fields.slug,
                   guid: site.siteMetadata.siteUrl + node.fields.slug,
                   enclosure: node.frontmatter.thumbnail && {
-                    url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
                   },
                   custom_elements: [{ "content:encoded": node.html }],
                 });
@@ -328,11 +405,11 @@ module.exports = {
   }
 }`,
             output: "/blog/feed.xml",
-            title: "Layer5 Blog"
+            title: "Layer5 Blog",
           },
           {
             serialize: ({ query: { site, allPosts } }) => {
-              return allPosts.nodes.map(node => {
+              return allPosts.nodes.map((node) => {
                 return Object.assign({}, node.frontmatter, {
                   title: node.frontmatter.title,
                   author: node.frontmatter.author,
@@ -341,7 +418,9 @@ module.exports = {
                   url: site.siteMetadata.siteUrl + node.fields.slug,
                   guid: site.siteMetadata.siteUrl + node.fields.slug,
                   enclosure: node.frontmatter.thumbnail && {
-                    url: site.siteMetadata.siteUrl + node.frontmatter.thumbnail.publicURL,
+                    url:
+                      site.siteMetadata.siteUrl +
+                      node.frontmatter.thumbnail.publicURL,
                   },
                   custom_elements: [{ "content:encoded": node.html }],
                 });
@@ -373,7 +452,7 @@ module.exports = {
   }
 }`,
             output: "/events/feed.xml",
-            title: "Layer5 Events"
+            title: "Layer5 Events",
           },
         ],
       },
@@ -455,8 +534,8 @@ module.exports = {
     {
       resolve: "gatsby-source-filesystem",
       options: {
-        path: `${__dirname}/src/collections/service-mesh-workshops`,
-        name: "service-mesh-workshops",
+        path: `${__dirname}/src/collections/workshops`,
+        name: "workshops",
       },
     },
     {
@@ -514,8 +593,8 @@ module.exports = {
       options: {
         defaults: {
           placeholder: "blurred",
-        }
-      }
+        },
+      },
     },
     {
       resolve: "gatsby-transformer-sharp",
@@ -547,10 +626,9 @@ module.exports = {
         host: "https://layer5.io",
         sitemap: "https://layer5.io/sitemap-index.xml",
         policy: [{ userAgent: "*", allow: "/" }],
-      }
+      },
     },
     "gatsby-plugin-meta-redirect",
     // make sure this is always the last one
   ],
-
 };

gatsby-node.js

@@ -73,8 +73,8 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
     isPermanent: true,
   });
   createRedirect({
-    fromPath: "/learn/workshops",
-    toPath: "/learn/service-mesh-workshops",
+    fromPath: "/learn/service-mesh-workshops",
+    toPath: "/learn/workshops",
     redirectInBrowser: true,
     isPermanent: true,
   });
@@ -517,7 +517,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
         }
       }
       singleWorkshop: allMdx(
-        filter: { fields: { collection: { eq: "service-mesh-workshops" } } }
+        filter: { fields: { collection: { eq: "workshops" } } }
       ) {
         nodes {
           fields {
@@ -929,7 +929,7 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
           slug = `/company/${collection}/${slugify(node.frontmatter.title)}`;
           break;
         case "service-mesh-books":
-        case "service-mesh-workshops":
+        case "workshops":
         case "service-mesh-labs":
           slug = `/learn/${collection}/${slugify(node.frontmatter.title)}`;
           break;