Merge branch 'master' into aryanshah/add_academy_content

Author: leecalcote

.env.development

@@ -1 +1,4 @@
 GATSBY_GRAPHQL_IDE=playground
+# Reduce concurrency to lower memory use during develop
+GATSBY_CPU_COUNT=2
+SHARP_CONCURRENCY=2

.node-options

@@ -0,0 +1 @@
+node --max-old-space-size=8192

gatsby-config.js

@@ -474,10 +474,6 @@ module.exports = {
       resolve: "gatsby-plugin-mdx",
       options: {
         extensions: [".mdx", ".md"],
-        mdxOptions: {
-          remarkPlugins: [],
-          rehypePlugins: [],
-        },
         gatsbyRemarkPlugins: [],
       },
     },

gatsby-node.js

@@ -1069,8 +1069,10 @@ exports.onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
     },
   });
 
-  if (stage === "build-javascript") {
+  // Reduce memory pressure by disabling sourcemaps in dev and build
+  if (stage === "develop" || stage === "develop-html" || stage === "build-javascript" || stage === "build-html") {
     const config = getConfig();
+    config.devtool = false;
     const miniCssExtractPlugin = config.plugins.find(
       (plugin) => plugin.constructor.name === "MiniCssExtractPlugin"
     );

package-lock.json

@@ -10,9 +10,9 @@
     "url": "https://layer5.io"
   },
   "scripts": {
-    "build": "gatsby build",
+    "build": "node --max-old-space-size=8192 node_modules/.bin/gatsby build",
     "clean": "gatsby clean && rimraf node_modules",
-    "develop": "cross-env NODE_OPTIONS=--max-old-space-size=10096 gatsby develop",
+    "develop": "node --max-old-space-size=8192 node_modules/.bin/env-cmd -f .env.development gatsby develop",
     "dev": "npm run develop",
     "start": "npm run develop",
     "serve": "gatsby serve",
@@ -36,8 +36,8 @@
     "@fullcalendar/react": "^6.1.8",
     "@layer5/meshery-design-embed": "^0.4.0",
     "@loadable/component": "^5.16.4",
-    "@mdx-js/mdx": "1.6.22",
-    "@mdx-js/react": "1.6.22",
+    "@mdx-js/mdx": "2.3.0",
+    "@mdx-js/react": "2.3.0",
     "@mediacurrent/gatsby-plugin-silence-css-order-warning": "^1.0.0",
     "@mui/icons-material": "^6.4.6",
     "@mui/material": "^5.15.11",
@@ -63,19 +63,22 @@
     "gatsby-plugin-feed": "^5.11.0",
     "gatsby-plugin-image": "^3.11.0",
     "gatsby-plugin-loadable-components-ssr": "^4.3.2",
-    "gatsby-plugin-manifest": "^5.11.0",
-    "gatsby-plugin-mdx": "3.20.0",
+    "gatsby-plugin-manifest": "^5.15.0",
+    "gatsby-plugin-mdx": "^5.0.0",
     "gatsby-plugin-meta-redirect": "github:layer5labs/gatsby-plugin-meta-redirect",
     "gatsby-plugin-netlify": "^5.1.1",
     "gatsby-plugin-preload-fonts": "^4.11.0",
     "gatsby-plugin-robots-txt": "^1.8.0",
-    "gatsby-plugin-sharp": "^5.11.0",
+    "gatsby-plugin-sharp": "^5.15.0",
     "gatsby-plugin-sitemap": "^6.11.0",
     "gatsby-plugin-styled-components": "^6.14.0",
     "gatsby-plugin-svgr": "^3.0.0-beta.0",
     "gatsby-redirect-from": "1.0.4",
+    "gatsby-remark-images-contentful": "^6.15.0",
+    "gatsby-source-contentful": "^8.16.0",
     "gatsby-source-filesystem": "^5.14.0",
-    "gatsby-transformer-sharp": "^5.11.0",
+    "gatsby-transformer-sharp": "^5.15.0",
+    "gatsby-transformer-sqip": "^5.15.0",
     "gbimage-bridge": "^0.2.2",
     "gsap": "^3.12.2",
     "joi": "^17.10.2",

package.json

@@ -4,6 +4,7 @@ import Code from "./src/components/CodeBlock";
 import CTA_ImageOnly from "./src/components/Call-To-Actions/CTA_ImageOnly";
 import CTA_FullWidth from "./src/components/Call-To-Actions/CTA_FullWidth";
 import CTA_Bottom from "./src/components/Call-To-Actions/CTA_Bottom";
+import Button from "./src/reusecore/Button";
 import { ContextWrapper } from "./context-wrapper";
 
 // Custom image component for better CLS scores
@@ -41,6 +42,7 @@ const components = {
     }
   },
   img: OptimizedImage,
+  Button,
   CTA_ImageOnly,
   CTA_FullWidth,
   CTA_Bottom

root-wrapper.js

@@ -11,10 +11,6 @@ upcoming: false
 register: false
 ---
 
-import { Link } from "gatsby";
-import Button from "../../../../reusecore/Button";
-import { EventWrapper } from "../../Event.style.js";
-
 <EventWrapper>
 
 Join <Link to="/blog/events/layer5-at-kubecon-cloudnativecon-north-america">Layer5 is at KubeCon NA 2022</Link> as we host project office hours. Don't be shy with your questions! Project maintainers are happy to receive your questions and will be available to share about current project activities, discuss current features as well as planned future project roadmap.

src/collections/events/2022/kubecon-na-2022/index.mdx

@@ -8,13 +8,12 @@ eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/
 type: Event
 published: true
 upcoming: false
-feature: true
-speakers: ["Lee Calcote", "Nic Jackson", "Zack Butcher", "Zhonghu Xu"]
+feature: false
+speakers: ["Aabid Sofi", "Antonette Caldwell", "Lee Calcote", "Uzair Shaikh", "Yash Sharma"]
 
 ---
-import Button from "../../../../reusecore/Button";
 
-Join Layer5 at KubeCon + CloudNativeCon EU Paris, France 2024!
+Join Layer5 at KubeCon + CloudNativeCon EU 2024!
 
 
 <p>

src/collections/events/2024/kubecon-EU-2024/index.mdx

@@ -8,15 +8,12 @@ eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-open-source-summ
 type: Event
 published: true
 upcoming: false
-feature: true
-speakers: ["Yash Sharma"]
+feature: false
+speakers: ["Lee Calcote", "Xin Huang"]
 
 ---
-import Button from "../../../../reusecore/Button";
 
-<p>
-Join the Meshery project at KubeCon + CloudNativeCon Hong Kong, China from August 21 to August 23, 2024. Engage with the Meshery open-source maintainers and discover collaborative cloud-native management.
-</p>
+Join Layer5 at KubeCon + CloudNativeCon Hong Kong 2024!
 
 We’re excited to bring you a session that delves into the intricacies of managing your cloud-native infrastructure efficiently with Meshery. Whether you're an experienced practitioner or new to the cloud-native ecosystem, there’s something for everyone.