@anywayseo/gatsby-plugin 2.0.0 → 2.1.0

package/gatsby-node.js

@@ -81,11 +81,11 @@ function createStrapiPages(_a, root_1) {
             let pageCount = 0;
             strapiPages.forEach(({ id, slug, title, locale }) => {
                 if (slug === slug_1.DUMMY_PAGE_SLUG) {
-                    reporter.info('Skipping page creation: dummy page detected.');
+                    reporter.warn('Skipping page creation: dummy page detected');
                     return;
                 }
                 if (!title && !slug) {
-                    reporter.info('Skipping page creation: empty page detected.');
+                    reporter.warn('Skipping page creation: empty page detected');
                     return;
                 }
                 const strapiPageTemplate = (0, path_1.resolve)(root, `./src/templates/strapi-page.tsx`);
@@ -104,9 +104,9 @@ function createStrapiPages(_a, root_1) {
     });
 }
 function createMdxPages(_a, root_1) {
-    return __awaiter(this, arguments, void 0, function* ({ actions, store, reporter, graphql }, root) {
-        var _b, _c;
-        reporter.info('Starting to create Mdx pages');
+    return __awaiter(this, arguments, void 0, function* ({ actions, reporter, graphql }, root) {
+        var _b, _c, _d, _e, _f, _g;
+        reporter.info('Starting to create MDX pages');
         try {
             const result = yield graphql(`
       query GetAllMdxPage {
@@ -121,26 +121,31 @@ function createMdxPages(_a, root_1) {
             }
           }
         }
+        allStrapiPage {
+          nodes {
+            slug
+          }
+        }
       }
     `);
             if (result.errors) {
-                throw new Error(`There was an error loading your Mdx pages: ${result.errors}`);
+                throw new Error(`There was an error loading your MDX pages: ${result.errors}`);
             }
-            const mdxPages = (_c = (_b = result.data) === null || _b === void 0 ? void 0 : _b.allMdx) === null || _c === void 0 ? void 0 : _c.nodes;
-            if (!(mdxPages === null || mdxPages === void 0 ? void 0 : mdxPages.length)) {
+            const mdxPages = (_d = (_c = (_b = result.data) === null || _b === void 0 ? void 0 : _b.allMdx) === null || _c === void 0 ? void 0 : _c.nodes) !== null && _d !== void 0 ? _d : [];
+            const strapiPages = (_g = (_f = (_e = result.data) === null || _e === void 0 ? void 0 : _e.allStrapiPage) === null || _f === void 0 ? void 0 : _f.nodes) !== null && _g !== void 0 ? _g : [];
+            if (!mdxPages.length) {
                 reporter.warn('No MDX pages found. Skipping MDX page creation.');
                 return;
             }
             reporter.info(`Found ${mdxPages.length} MDX pages`);
-            const existingPages = [...store.getState().pages.values()];
             let count = 0;
             mdxPages.forEach(({ frontmatter, internal }) => {
                 const slug = frontmatter === null || frontmatter === void 0 ? void 0 : frontmatter.slug;
                 const contentFilePath = internal.contentFilePath;
                 if (slug && contentFilePath) {
-                    const hasRemoteVersion = existingPages.some(({ path }) => path.includes(slug));
-                    if (hasRemoteVersion) {
-                        reporter.warn(`Skipping local page, remote exists: ${slug}`);
+                    const existingPage = strapiPages.find((strapiPage) => (0, slug_1.normalizeSlug)(strapiPage === null || strapiPage === void 0 ? void 0 : strapiPage.slug) === (0, slug_1.normalizeSlug)(slug));
+                    if (!!existingPage) {
+                        reporter.warn(`Skipping MDX page creation: "${slug}" already exists`);
                         return;
                     }
                     const mdxPageTemplate = (0, path_1.resolve)(root, `./src/templates/mdx-page.jsx`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anywayseo/gatsby-plugin",
   "description": "Shared config for Anywayseo sites",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "author": "zerg41",
   "license": "MIT",
   "publishConfig": {

package/types/index.d.ts

@@ -30,4 +30,9 @@ export interface IGetAllMdxPageQuery {
             };
         }[];
     };
+    allStrapiPage?: {
+        nodes: {
+            slug?: string | null;
+        }[];
+    };
 }

package/utils/strapi-source/schema/navigation.d.ts

@@ -1 +1 @@
-export declare const navigation = "\n    # === STRAPI NAVIGATION DEFINITIONS ===\n    type StrapiNavigation implements Node {\n      id: ID!\n      items: [NavigationGroup!]\n    }\n\n    type NavigationGroup {\n      name: String!\n      slug: String!\n      items: [NavigationItem!]\n    }\n\n    type NavigationItem {\n      type: String!\n      title: String!\n      slug: String!\n      path: String!\n      menuAttached: Boolean!\n      items: [NavigationItem!]\n    }\n  ";
+export declare const navigation = "\n    # === STRAPI NAVIGATION DEFINITIONS ===\n    type StrapiNavigation implements Node {\n      id: ID!\n      items: [NavigationGroup!]\n    }\n\n    type NavigationGroup {\n      slug: String!\n      locale: String!\n      items: [NavigationItem!]\n    }\n\n    type NavigationItem {\n      type: String!\n      title: String!\n      slug: String!\n      path: String!\n      items: [NavigationItem!]\n      menuAttached: Boolean\n    }\n  ";

package/utils/strapi-source/schema/navigation.js

@@ -9,8 +9,8 @@ exports.navigation = `
     }
 
     type NavigationGroup {
-      name: String!
       slug: String!
+      locale: String!
       items: [NavigationItem!]
     }
 
@@ -19,7 +19,7 @@ exports.navigation = `
       title: String!
       slug: String!
       path: String!
-      menuAttached: Boolean!
       items: [NavigationItem!]
+      menuAttached: Boolean
     }
   `;

package/utils/strapi-source/strapi-navigation/index.js

@@ -10,21 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sourceStrapiNavigationNode = sourceStrapiNavigationNode;
+const navigationSlugs = ['header-navigation', 'footer-navigation'];
 function sourceStrapiNavigationNode(args, strapiClient) {
     return __awaiter(this, void 0, void 0, function* () {
         const { actions, reporter, createNodeId, createContentDigest } = args;
         reporter.info('Starting to fetch navigation data from Strapi');
         try {
-            const navigation = yield strapiClient.fetch('navigation');
+            const allNavigation = yield strapiClient.fetch('navigation/?orderBy=locale&locale=*');
+            const navigation = allNavigation.filter(({ slug }) => navigationSlugs.includes(slug));
             reporter.info(`Found ${navigation.length} navigation objects`);
             const strapiNavigation = [];
-            for (const { slug, name } of navigation) {
-                const navigationItems = yield strapiClient.fetch(`navigation/render/${slug}?type=TREE`);
-                if (!navigationItems.length) {
-                    reporter.warn(`Missing navigation items in ${slug}`);
+            for (const { slug, locale } of navigation) {
+                const items = yield strapiClient.fetch(`navigation/render/${slug}?locale=${locale}&type=TREE`);
+                if (!items.length) {
+                    reporter.warn(`Missing navigation items in ${slug} with locale ${locale}`);
                     continue;
                 }
-                strapiNavigation.push({ name, slug, items: navigationItems });
+                strapiNavigation.push({ slug, locale, items });
             }
             const nodeContent = JSON.stringify(strapiNavigation);
             const nodeMeta = {

package/utils/strapi-source/strapi-navigation/types.d.ts

@@ -1,5 +1,22 @@
-export interface INavigationList {
+export interface INavigationData {
     id: number;
     name: string;
     slug: string;
+    locale: string;
 }
+type NavigationItemType = 'WRAPPER' | 'INTERNAL' | 'EXTERNAL';
+export interface INavigationItem {
+    id: number;
+    documentId: string;
+    type: NavigationItemType;
+    title: string;
+    slug: string;
+    path: string;
+    items: INavigationItem[];
+    order: number;
+    uiRouterKey: string;
+    additionalFields: Record<string, unknown>;
+    collapsed: boolean;
+    menuAttached: boolean;
+}
+export {};