Skip to content

Commit 268f2fa

Browse files
authored
Merge pull request #6863 from layer5io/revert-6842-leecalcote/mdx-and-gatsby-upgrade
Revert "Gatsby and mdx-plugin upgrade"
2 parents 776ec69 + 0c32f9e commit 268f2fa

50 files changed

Lines changed: 6376 additions & 9476 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.development

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
GATSBY_GRAPHQL_IDE=playground
2-
# Reduce concurrency to lower memory use during develop
3-
GATSBY_CPU_COUNT=2
4-
SHARP_CONCURRENCY=2

.node-options

Lines changed: 0 additions & 1 deletion
This file was deleted.

gatsby-config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,10 @@ module.exports = {
467467
resolve: "gatsby-plugin-mdx",
468468
options: {
469469
extensions: [".mdx", ".md"],
470+
mdxOptions: {
471+
remarkPlugins: [],
472+
rehypePlugins: [],
473+
},
470474
gatsbyRemarkPlugins: [],
471475
},
472476
},

gatsby-node.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,10 +1069,8 @@ exports.onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
10691069
},
10701070
});
10711071

1072-
// Reduce memory pressure by disabling sourcemaps in dev and build
1073-
if (stage === "develop" || stage === "develop-html" || stage === "build-javascript" || stage === "build-html") {
1072+
if (stage === "build-javascript") {
10741073
const config = getConfig();
1075-
config.devtool = false;
10761074
const miniCssExtractPlugin = config.plugins.find(
10771075
(plugin) => plugin.constructor.name === "MiniCssExtractPlugin"
10781076
);

package-lock.json

Lines changed: 6222 additions & 9299 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"url": "https://layer5.io"
1111
},
1212
"scripts": {
13-
"build": "node --max-old-space-size=8192 node_modules/.bin/gatsby build",
13+
"build": "gatsby build",
1414
"clean": "gatsby clean && rimraf node_modules",
15-
"develop": "node --max-old-space-size=8192 node_modules/.bin/env-cmd -f .env.development gatsby develop",
15+
"develop": "cross-env NODE_OPTIONS=--max-old-space-size=10096 gatsby develop",
1616
"dev": "npm run develop",
1717
"start": "npm run develop",
1818
"serve": "gatsby serve",
@@ -36,8 +36,8 @@
3636
"@fullcalendar/react": "^6.1.8",
3737
"@layer5/meshery-design-embed": "^0.4.0",
3838
"@loadable/component": "^5.16.4",
39-
"@mdx-js/mdx": "2.3.0",
40-
"@mdx-js/react": "2.3.0",
39+
"@mdx-js/mdx": "1.6.22",
40+
"@mdx-js/react": "1.6.22",
4141
"@mediacurrent/gatsby-plugin-silence-css-order-warning": "^1.0.0",
4242
"@mui/icons-material": "^6.4.6",
4343
"@mui/material": "^5.15.11",
@@ -63,22 +63,19 @@
6363
"gatsby-plugin-feed": "^5.11.0",
6464
"gatsby-plugin-image": "^3.11.0",
6565
"gatsby-plugin-loadable-components-ssr": "^4.3.2",
66-
"gatsby-plugin-manifest": "^5.15.0",
67-
"gatsby-plugin-mdx": "^5.0.0",
66+
"gatsby-plugin-manifest": "^5.11.0",
67+
"gatsby-plugin-mdx": "3.20.0",
6868
"gatsby-plugin-meta-redirect": "github:layer5labs/gatsby-plugin-meta-redirect",
6969
"gatsby-plugin-netlify": "^5.1.1",
7070
"gatsby-plugin-preload-fonts": "^4.11.0",
7171
"gatsby-plugin-robots-txt": "^1.8.0",
72-
"gatsby-plugin-sharp": "^5.15.0",
72+
"gatsby-plugin-sharp": "^5.11.0",
7373
"gatsby-plugin-sitemap": "^6.11.0",
7474
"gatsby-plugin-styled-components": "^6.14.0",
7575
"gatsby-plugin-svgr": "^3.0.0-beta.0",
7676
"gatsby-redirect-from": "1.0.4",
77-
"gatsby-remark-images-contentful": "^6.15.0",
78-
"gatsby-source-contentful": "^8.16.0",
7977
"gatsby-source-filesystem": "^5.14.0",
80-
"gatsby-transformer-sharp": "^5.15.0",
81-
"gatsby-transformer-sqip": "^5.15.0",
78+
"gatsby-transformer-sharp": "^5.11.0",
8279
"gbimage-bridge": "^0.2.2",
8380
"gsap": "^3.12.2",
8481
"joi": "^17.10.2",

root-wrapper.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Code from "./src/components/CodeBlock";
44
import CTA_ImageOnly from "./src/components/Call-To-Actions/CTA_ImageOnly";
55
import CTA_FullWidth from "./src/components/Call-To-Actions/CTA_FullWidth";
66
import CTA_Bottom from "./src/components/Call-To-Actions/CTA_Bottom";
7-
import Button from "./src/reusecore/Button";
87
import { ContextWrapper } from "./context-wrapper";
98

109
// Custom image component for better CLS scores
@@ -42,7 +41,6 @@ const components = {
4241
}
4342
},
4443
img: OptimizedImage,
45-
Button,
4644
CTA_ImageOnly,
4745
CTA_FullWidth,
4846
CTA_Bottom

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ upcoming: false
1111
register: false
1212
---
1313

14+
import { Link } from "gatsby";
15+
import Button from "../../../../reusecore/Button";
16+
import { EventWrapper } from "../../Event.style.js";
17+
1418
<EventWrapper>
1519

1620
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/2024/kubecon-EU-2024/index.mdx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/
88
type: Event
99
published: true
1010
upcoming: false
11-
feature: false
12-
speakers: ["Aabid Sofi", "Antonette Caldwell", "Lee Calcote", "Uzair Shaikh", "Yash Sharma"]
11+
feature: true
12+
speakers: ["Lee Calcote", "Nic Jackson", "Zack Butcher", "Zhonghu Xu"]
1313

1414
---
15+
import Button from "../../../../reusecore/Button";
1516

16-
Join Layer5 at KubeCon + CloudNativeCon EU 2024!
17+
Join Layer5 at KubeCon + CloudNativeCon EU Paris, France 2024!
1718

1819

1920
<p>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ eurl: https://events.linuxfoundation.org/kubecon-cloudnativecon-open-source-summ
88
type: Event
99
published: true
1010
upcoming: false
11-
feature: false
12-
speakers: ["Lee Calcote", "Xin Huang"]
11+
feature: true
12+
speakers: ["Yash Sharma"]
1313

1414
---
15+
import Button from "../../../../reusecore/Button";
1516

16-
Join Layer5 at KubeCon + CloudNativeCon Hong Kong 2024!
17+
<p>
18+
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.
19+
</p>
1720

1821
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.
1922

0 commit comments

Comments
 (0)