Skip to content

Commit 5652a95

Browse files
Merge branch 'master' into update-kanvas-logos
2 parents 6f080d7 + d3518aa commit 5652a95

5 files changed

Lines changed: 32 additions & 133 deletions

File tree

gatsby-config.js

Lines changed: 8 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ module.exports = {
454454
{
455455
resolve: "gatsby-plugin-styled-components",
456456
options: {
457-
minify: false,
457+
minify: true,
458458
},
459459
},
460460
{
@@ -474,90 +474,25 @@ module.exports = {
474474
},
475475
},
476476
},
477-
"gatsby-plugin-sharp",
478-
"gatsby-transformer-sharp",
479477
{
480478
resolve: "gatsby-source-filesystem",
481479
options: {
482-
name: "images",
483-
path: `${__dirname}/src/assets/images`,
484-
},
485-
},
486-
{
487-
resolve: "gatsby-source-filesystem",
488-
options: {
489-
path: `${__dirname}/src/collections/blog`,
490-
name: "blog",
491-
},
492-
},
493-
{
494-
resolve: "gatsby-source-filesystem",
495-
options: {
496-
path: `${__dirname}/src/collections/news`,
497-
name: "news",
498-
},
499-
},
500-
{
501-
resolve: "gatsby-source-filesystem",
502-
options: {
503-
path: `${__dirname}/src/collections/projects`,
504-
name: "projects",
505-
},
506-
},
507-
{
508-
resolve: "gatsby-source-filesystem",
509-
options: {
510-
path: `${__dirname}/src/collections/service-mesh-books`,
511-
name: "service-mesh-books",
512-
},
513-
},
514-
{
515-
resolve: "gatsby-source-filesystem",
516-
options: {
517-
path: `${__dirname}/src/collections/programs`,
518-
name: "programs",
519-
},
520-
},
521-
{
522-
resolve: "gatsby-source-filesystem",
523-
options: {
524-
path: `${__dirname}/src/collections/careers`,
525-
name: "careers",
526-
},
527-
},
528-
{
529-
resolve: "gatsby-source-filesystem",
530-
options: {
531-
path: `${__dirname}/src/collections/members`,
532-
name: "members",
480+
path: `${__dirname}/src/collections`,
481+
name: "collections",
533482
},
534483
},
535484
{
536485
resolve: "gatsby-source-filesystem",
537486
options: {
538-
path: `${__dirname}/src/collections/workshops`,
539-
name: "workshops",
540-
},
541-
},
542-
{
543-
resolve: "gatsby-source-filesystem",
544-
options: {
545-
path: `${__dirname}/src/collections/kanvas-labs`,
546-
name: "kanvas-labs",
547-
},
548-
},
549-
{
550-
resolve: "gatsby-source-filesystem",
551-
options: {
552-
path: `${__dirname}/src/collections/resources`,
553-
name: "resources",
487+
path: `${__dirname}/src/sections/Meshery/Meshery-platforms/supported-icons`,
488+
name: "integration-images",
554489
},
555490
},
556491
{
557492
resolve: "gatsby-source-filesystem",
558493
options: {
559-
path: `${__dirname}/src/collections/events`,
560-
name: "events",
494+
name: "images",
495+
path: `${__dirname}/src/assets/images`,
561496
},
562497
},
563498
{
@@ -567,27 +502,6 @@ module.exports = {
567502
name: "content-learn",
568503
},
569504
},
570-
{
571-
resolve: "gatsby-source-filesystem",
572-
options: {
573-
path: `${__dirname}/src/collections/integrations`,
574-
name: "integrations",
575-
},
576-
},
577-
{
578-
resolve: "gatsby-source-filesystem",
579-
options: {
580-
path: `${__dirname}/src/collections/use-cases`,
581-
name: "use-cases",
582-
},
583-
},
584-
{
585-
resolve: "gatsby-source-filesystem",
586-
options: {
587-
name: "integration-images",
588-
path: `${__dirname}/src/sections/Meshery/Meshery-platforms/supported-icons`,
589-
},
590-
},
591505
"gatsby-plugin-image",
592506
{
593507
resolve: "gatsby-plugin-sharp",
@@ -638,4 +552,4 @@ module.exports = {
638552
"gatsby-plugin-meta-redirect",
639553
// make sure this is always the last one
640554
],
641-
};
555+
};

gatsby-node.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,17 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
552552
}
553553

554554
const { createNodeField } = actions;
555-
const collection = getNode(node.parent).sourceInstanceName;
555+
const parent = getNode(node.parent);
556+
let collection = parent.sourceInstanceName;
557+
558+
// --- CHANGED: Consolidated Source Logic ---
559+
// If the source is "collections", we determine the actual collection
560+
// from the parent directory name (e.g., "blog", "news", etc.)
561+
if (collection === "collections") {
562+
collection = parent.relativeDirectory.split("/")[0];
563+
}
564+
// ------------------------------------------
565+
556566
createNodeField({
557567
name: "collection",
558568
node,
@@ -790,4 +800,4 @@ exports.onPostBuild = async ({ graphql, reporter }) => {
790800
// Optionally, write the result to a file for easier inspection
791801
const outputPath = path.resolve(__dirname, "public", "query-result.json");
792802
fs.writeFileSync(outputPath, JSON.stringify(result, null, 2));
793-
};
803+
};

src/collections/integrations/appmesh-controller/index.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,5 @@ published: TRUE
6767
<p>
6868
AWS App Mesh is a service mesh that provides application-level networking to make it easy for your services to communicate with each other across multiple types of compute infrastructure. App Mesh standardizes how your services communicate, giving you end-to-end visibility and ensuring high-availability for your applications.
6969
</p>
70-
<p>
71-
Deploy and manage the configuration of your AWS App Mesh using the Meshery Adapter for App Mesh. Looking for best practice cloud native design and deployment best practices? Choose from thousands of pre-built components in Kanvas. Choose from hundreds of ready-made design patterns by importing templates from Meshery Catalog or use our low code designer, Kanvas, to create and deploy your own cloud native infrastructure designs.
70+
<p>Deploy and manage the configuration of your AWS App Mesh using the Meshery Adapter for App Mesh. Looking for best practice cloud native design and deployment best practices? Choose from thousands of pre-built components in Kanvas. Choose from hundreds of ready-made design patterns by importing templates from Meshery Catalog or use our low code designer, Kanvas, to create and deploy your own cloud native infrastructure designs.
7271
</p>

src/collections/integrations/crossplane-provider-exoscale/index.mdx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,5 @@ published: TRUE
7979
<p>
8080
Exoscale is a solid European cloud hosting alternative.
8181
</p>
82-
<p>
83-
Collaboratively and visually diagram your cloud native infrastructure with GitOps-style pipeline integration. Design, test, and manage configuration your Kubernetes-based, containerized applications as a visual topology.
84-
</p>
85-
<p>
86-
Looking for best practice cloud native design and deployment best practices? Choose from thousands of pre-built components in Kanvas. Choose from hundreds of ready-made design patterns by importing templates from Meshery Catalog or use our low code designer, Kanvas, to create and deploy your own cloud native infrastructure designs.
87-
</p>
82+
<p>Collaboratively and visually diagram your cloud native infrastructure with GitOps-style pipeline integration. Design, test, and manage configuration your Kubernetes-based, containerized applications as a visual topology.</p>
83+
<p>Looking for best practice cloud native design and deployment best practices? Choose from thousands of pre-built components in Kanvas. Choose from hundreds of ready-made design patterns by importing templates from Meshery Catalog or use our low code designer, Kanvas, to create and deploy your own cloud native infrastructure designs.</p>

src/collections/programs/gsoc-2025/index.mdx

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ import playground from "./meshery-playground-alt-4.webp";
142142
<img src={playground} alt="the cncf playground mockup" style="width:40%;" />
143143
</a>
144144

145-
146-
147145
<br />
148146
<hr />
149147
<br />
@@ -169,38 +167,20 @@ import playground from "./meshery-playground-alt-4.webp";
169167

170168
<h3>About Layer5</h3>
171169

172-
<p>
173-
We want to participate to help first-time open source contributors get started and what will hopefully be a lifelong journey of open source participation. We want to have them have a great first experience, understand what it means to be embraced by empathy and, in turn, to have empathy for others. We are all learning and growing each day. Our organization and community culture has a pay-it-forward mentality. We spend a lot of time with both students and adults alike, tutoring them, supporting them, and watching them grow. We believe that the world has too few truly diverse and perpetually encouraging open source communities. We take our internships very seriously and grow and support interns to dramatically increase their career velocity. We love helping others learn and grow. </p>
170+
<p>We want to participate to help first-time open source contributors get started and what will hopefully be a lifelong journey of open source participation. We want to have them have a great first experience, understand what it means to be embraced by empathy and, in turn, to have empathy for others. We are all learning and growing each day. Our organization and community culture has a pay-it-forward mentality. We spend a lot of time with both students and adults alike, tutoring them, supporting them, and watching them grow. We believe that the world has too few truly diverse and perpetually encouraging open source communities. We take our internships very seriously and grow and support interns to dramatically increase their career velocity. We love helping others learn and grow.</p>
174171

175-
<p>
176-
Mentoring and seeing others learn and grow is what Layer5 is all about - they grow, we grow. Layer5 is a platform for mentees to hoist themselves up on and leapfrog from. We’re a platform for shared success. Direct participation in GSoC will be most meaningful to the community. </p>
172+
<p>Mentoring and seeing others learn and grow is what Layer5 is all about - they grow, we grow. Layer5 is a platform for mentees to hoist themselves up on and leapfrog from. We’re a platform for shared success. Direct participation in GSoC will be most meaningful to the community.</p>
177173

178-
<p>
179-
We interact daily over Slack, and have an open source project <Link to="/community/calendar">meeting everyday</Link>, which are posted to the community <a href="https://www.youtube.com/c/Layer5io?sub_confirmation=1" rel="nofollow">YouTube channel</a>.</p>
180-
<p>
181-
Layer5 projects are open source software. Anyone can download, use, work on,
182-
and share it with others. It's built on principles like collaboration,
183-
globalism, and innovation. Layer5 projects are distributed under the terms of
184-
Apache v2.
185-
</p>
174+
<p>We interact daily over Slack, and have an open source project <Link to="/community/calendar">meeting everyday</Link>, which are posted to the community <a href="https://www.youtube.com/c/Layer5io?sub_confirmation=1" rel="nofollow">YouTube channel</a>.</p>
175+
176+
<p>Layer5 projects are open source software. Anyone can download, use, work on and share it with others. It's built on principles like collaboration, globalism, and innovation. Layer5 projects are distributed under the terms of Apache v2.</p>
186177

187178
<h3>Google Summer of Code Participation</h3>
188179

189-
<p>
190-
The key component of these projects is our Community. This community, which
191-
you will join as a participant in Google Summer of Code, is improving the
192-
world of diverse cloud native systems. Your contributions will affect people
193-
you've never met. The Layer5 community includes software engineers,
194-
researchers, students, artists, system administrators, operators and web
195-
designers -- all of whom will be happy to help you get started.
196-
</p>
197-
<p>
198-
We believe that all contributors should expect and be part of a safe and
199-
friendly environment for constructive contribution. We can more effectively
200-
and successfully compare and challenge different ideas to find the best
201-
solutions for advancement, while building the size, diversity, and strength of
202-
our community.
203-
</p>
180+
<p>The key component of these projects is our Community. This community, which you will join as a participant in Google Summer of Code, is improving the world of diverse cloud native systems. Your contributions will affect people you've never met. The Layer5 community includes software engineers, researchers, students, artists, system administrators, operators and web designers -- all of whom will be happy to help you get started.</p>
181+
182+
<p>We believe that all contributors should expect and be part of a safe and friendly environment for constructive contribution. We can more effectively and successfully compare and challenge different ideas to find the best solutions for advancement, while building the size, diversity, and strength of our community.</p>
183+
204184
<div className="apply-button">
205185
<h3>
206186
<Button

0 commit comments

Comments
 (0)