Merge branch 'master' into playgroundPage

.github/workflows/lighthouseci.yml

@@ -1,11 +1,11 @@
 name: lighthouseci
-on: 
+on:
   workflow_dispatch:
   pull_request:
     paths-ignore:
       - "*.md"
       - "*.github/**"
-      
+
 jobs:
   lighthouseci:
     runs-on: ubuntu-latest
@@ -14,6 +14,6 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 16
-      - run: npm install && npm install -g @lhci/cli@0.8.x
+      - run: npm install && npm install -g @lhci/cli@0.11.x
       - run: npm run build
       - run: lhci autorun

.lighthouserc.js

@@ -5,30 +5,30 @@ module.exports = {
         "url" : ["http://localhost/404.html",
                  "http://localhost/index.html",
                  "http://localhost/404/index.html",
-                 "http://localhost/about/index.html" ,
-                 "http://localhost/cloud-native-management/meshery/index.html",
-                 "http://localhost/cloud-native-management/meshmap/index.html",
-
-                 "http://localhost/learn/learning-paths/index.html",
-                 "http://localhost/learn/service-mesh-books/index.html",
-                 "http://localhost/learn/service-mesh-workshops/index.html",
-                 "http://localhost/learn/index.html",
-
-                 "http://localhost/blog/index.html",
-                 "http://localhost/resources/index.html",
-                 "http://localhost/careers/index.html",
-
-                 "http://localhost/community/members/index.html",
-                 "http://localhost/community/meshmates/index.html",
-                 "http://localhost/community/events/index.html",
-                 "http://localhost/community/newcomers/index.html",],
+                 "http://localhost/company/about.html" ,
+                 "http://localhost/cloud-native-management/meshery.html",
+                 "http://localhost/cloud-native-management/meshmap.html",
+                 "http://localhost/learn/learning-paths.html",
+                 "http://localhost/learn/service-mesh-books.html",
+                 "http://localhost/learn/service-mesh-workshops.html",
+                 "http://localhost/learn.html",
+                 "http://localhost/blog.html",
+                 "http://localhost/resources.html",
+                 "http://localhost/careers.html",
+                 "http://localhost/community/members.html",
+                 "http://localhost/community/meshmates.html",
+                 "http://localhost/community/events.html",
+                 "http://localhost/community/newcomers.html",],
       },
       "assert": {
         "preset": "lighthouse:no-pwa",
         "assertions": {
           "csp-xss": "off",
           "aria-hidden-focus": "off"
         }
-      }
+      },
+      "upload": {
+        "target": "temporary-public-storage",
+      },
     }
   };

gatsby-config.js

@@ -1,4 +1,5 @@
 /* eslint-env node */
+
 module.exports = {
   siteMetadata: {
     title: "Layer5 - Expect more from your infrastructure",
@@ -14,14 +15,50 @@ module.exports = {
     FAST_DEV: true,
     PARALLEL_SOURCING: true
   },
+  trailingSlash: "never",
   plugins: [
     {
       resolve: "gatsby-plugin-webpack-bundle-analyser-v2",
       options: {
         disable: true
       }
     },
-    "gatsby-plugin-sitemap",
+    {
+      resolve: "gatsby-plugin-sitemap",
+      options: {
+        query: `
+        {
+          allSitePage {
+            nodes {
+              path
+              matchPath
+            }
+          }
+          site {
+            siteMetadata {
+              siteUrl
+              }
+          }
+        }
+      `,
+        resolvePages: ({
+          allSitePage: { nodes: allPages },
+        }) => {
+          return allPages.map(page => {
+            return { ...page };
+          });
+        },
+        serialize: ({ path, matchPath }) => {
+          let url = matchPath ? matchPath : path;
+          url = url.startsWith("/") ? url : `/${url}`;
+          return {
+            url: url,
+            changefreq: "daily",
+            priority: 0.7,
+          };
+        },
+      },
+    },
     {
       resolve: "gatsby-plugin-svgr",
       options: {
@@ -519,7 +556,8 @@ module.exports = {
         policy: [{ userAgent: "*", allow: "/" }],
       }
     },
-    "gatsby-plugin-meta-redirect", // make sure this is always the last one
+    "gatsby-plugin-meta-redirect",
+    // make sure this is always the last one
   ],
 
 };