@anywayseo/gatsby-plugin 2.8.0 → 2.8.1

package/package.json

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

package/utils/create-pages/mdx/index.js

@@ -33,6 +33,9 @@ function createMdxPages(_a, root_1) {
         allStrapiPage {
           nodes {
             slug
+            hub {
+              slug
+            }
           }
         }
       }
@@ -52,7 +55,7 @@ function createMdxPages(_a, root_1) {
                 const slug = frontmatter === null || frontmatter === void 0 ? void 0 : frontmatter.slug;
                 const contentFilePath = internal.contentFilePath;
                 if (slug && contentFilePath) {
-                    const existingPage = strapiPages.find((strapiPage) => (0, slug_1.isEqualSlug)(strapiPage === null || strapiPage === void 0 ? void 0 : strapiPage.slug, slug));
+                    const existingPage = strapiPages.find((strapiPage) => { var _a; return (0, slug_1.isEqualSlug)((0, slug_1.mergeSlug)(strapiPage.slug, (_a = strapiPage.hub) === null || _a === void 0 ? void 0 : _a.slug), slug); });
                     if (!!existingPage) {
                         reporter.warn(`Skipping MDX page creation: "${slug}" already exists`);
                         return;

package/utils/create-pages/mdx/types.d.ts

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

package/utils/create-pages/strapi/index.js

@@ -29,6 +29,9 @@ function createStrapiPages(_a, root_1) {
             title
             slug
             locale
+            hub {
+              slug
+            }
           }
         }
       }
@@ -46,7 +49,7 @@ function createStrapiPages(_a, root_1) {
             const hrefLangMap = (0, hreflang_1.buildHrefLangMap)(strapiPages, defaultLocale);
             reporter.info(`Generated hrefLangs for Strapi pages`);
             let pageCount = 0;
-            strapiPages.forEach(({ id, slug, title, locale }) => {
+            strapiPages.forEach(({ id, slug, title, locale, hub }) => {
                 var _a;
                 if ((0, slug_1.isDummyPage)(slug)) {
                     reporter.warn('Skipping page creation: dummy page detected');
@@ -57,7 +60,7 @@ function createStrapiPages(_a, root_1) {
                     return;
                 }
                 const strapiPageTemplate = (0, path_1.resolve)(root, `./src/templates/strapi-page.tsx`);
-                const strapiPagePath = (0, slug_1.buildPath)(slug, locale, defaultLocale);
+                const strapiPagePath = (0, slug_1.buildPath)((0, slug_1.mergeSlug)(slug, hub === null || hub === void 0 ? void 0 : hub.slug), locale, defaultLocale);
                 const strapiPageHrefLangs = (_a = hrefLangMap[strapiPagePath]) !== null && _a !== void 0 ? _a : [];
                 actions.createPage({
                     path: strapiPagePath,

package/utils/create-pages/strapi/types.d.ts

@@ -8,6 +8,9 @@ export interface IGetAllStrapiPageQuery {
             title?: string | null;
             slug?: string | null;
             locale?: string | null;
+            hub?: {
+                slug?: string | null;
+            } | null;
         }[];
     };
 }

package/utils/create-pages/utils/hreflang.js

@@ -2,20 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildHrefLangMap = buildHrefLangMap;
 const slug_1 = require("./slug");
-/** Choose x-default: prefer defaultLocale, fallback to first locale */
+function groupPagesBySlug(pages, defaultLocale) {
+    var _a, _b;
+    const groups = {};
+    for (const page of pages) {
+        const slug = (0, slug_1.normalizeSlug)((0, slug_1.mergeSlug)(page.slug, (_a = page.hub) === null || _a === void 0 ? void 0 : _a.slug));
+        const locale = (_b = page.locale) !== null && _b !== void 0 ? _b : defaultLocale;
+        if (!groups[slug]) {
+            groups[slug] = [];
+        }
+        groups[slug].push({ slug, locale });
+    }
+    return groups;
+}
+function buildCanonicalHref(slug, locale, defaultLocale) {
+    const path = (0, slug_1.buildPath)(slug, locale, defaultLocale);
+    if (path === '/') {
+        return '';
+    }
+    return path.endsWith('/') ? path : `${path}/`;
+}
 function getDefaultHrefLang(pages, defaultLocale) {
     var _a;
     const defaultPage = (_a = pages.find((page) => page.locale === defaultLocale)) !== null && _a !== void 0 ? _a : pages[0];
-    return { href: (0, slug_1.buildPath)(defaultPage.slug, defaultPage.locale, defaultLocale), hrefLang: 'x-default' };
+    return { href: buildCanonicalHref(defaultPage.slug, defaultPage.locale, defaultLocale), hrefLang: 'x-default' };
 }
 function buildHrefLangMap(pages, defaultLocale = 'en') {
     const hrefLangMap = {};
-    for (const pageGroup of Object.values((0, slug_1.groupPagesBySlug)(pages, defaultLocale))) {
+    for (const pageGroup of Object.values(groupPagesBySlug(pages, defaultLocale))) {
         const defaultHreflang = getDefaultHrefLang(pageGroup, defaultLocale);
         for (const page of pageGroup) {
             const hrefLangs = pageGroup.map(({ slug, locale }) => ({
                 hrefLang: locale,
-                href: (0, slug_1.buildPath)(slug, locale, defaultLocale),
+                href: buildCanonicalHref(slug, locale, defaultLocale),
             }));
             hrefLangs.push(defaultHreflang);
             const path = (0, slug_1.buildPath)(page.slug, page.locale, defaultLocale);

package/utils/create-pages/utils/slug.d.ts

@@ -1,6 +1,8 @@
-import type { IPage, PageGroup } from './types';
+import type { IPage } from './types';
+export declare function mergeSlug(slug: IPage['slug'], parentSlug: IPage['slug']): string;
+export declare function normalizeSlug(slug?: IPage['slug']): string;
+export declare function normalizeLocale(locale?: IPage['locale']): string;
 export declare function buildPath(slug?: IPage['slug'], locale?: IPage['locale'], defaultLocale?: string): string;
 export declare function isEqualSlug(a?: IPage['slug'], b?: IPage['slug']): boolean;
 export declare function isEmptyPage(title?: IPage['title'], slug?: IPage['slug']): boolean;
 export declare function isDummyPage(slug?: IPage['slug']): boolean;
-export declare function groupPagesBySlug(pages: IPage[], defaultLocale: string): PageGroup;

package/utils/create-pages/utils/slug.js

@@ -1,26 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeSlug = mergeSlug;
+exports.normalizeSlug = normalizeSlug;
+exports.normalizeLocale = normalizeLocale;
 exports.buildPath = buildPath;
 exports.isEqualSlug = isEqualSlug;
 exports.isEmptyPage = isEmptyPage;
 exports.isDummyPage = isDummyPage;
-exports.groupPagesBySlug = groupPagesBySlug;
 const INDEX_PAGE_SLUG = 'index';
 const DUMMY_PAGE_SLUG = 'dummy';
+function mergeSlug(slug, parentSlug) {
+    if (parentSlug) {
+        return slug ? `${parentSlug}/${slug}` : parentSlug;
+    }
+    return slug !== null && slug !== void 0 ? slug : '';
+}
 function normalizeSlug(slug) {
-    if (!slug || slug === INDEX_PAGE_SLUG) {
-        return '';
+    if (!slug || slug === INDEX_PAGE_SLUG || slug === '/') {
+        return '/';
     }
-    return slug.toLowerCase();
+    const lowercaseSlug = slug.toLowerCase();
+    return lowercaseSlug.startsWith('/') ? lowercaseSlug : `/${lowercaseSlug}`;
 }
 function normalizeLocale(locale) {
     return (locale !== null && locale !== void 0 ? locale : '').toLowerCase();
 }
 function buildPath(slug, locale, defaultLocale) {
+    const normalizedSlug = normalizeSlug(slug);
     const normalizedLocale = normalizeLocale(locale);
     const normalizedDefaultLocale = normalizeLocale(defaultLocale);
-    const localePrefix = normalizedLocale === normalizedDefaultLocale ? '/' : `/${normalizedLocale}/`;
-    return `${localePrefix}${normalizeSlug(slug)}`;
+    const localePrefix = normalizedLocale === normalizedDefaultLocale ? null : normalizedLocale;
+    return localePrefix ? `/${localePrefix}${normalizedSlug}` : normalizedSlug;
 }
 function isEqualSlug(a, b) {
     return normalizeSlug(a) === normalizeSlug(b);
@@ -29,18 +39,5 @@ function isEmptyPage(title, slug) {
     return !title && !slug;
 }
 function isDummyPage(slug) {
-    return normalizeSlug(slug) === DUMMY_PAGE_SLUG;
-}
-function groupPagesBySlug(pages, defaultLocale) {
-    var _a;
-    const groups = {};
-    for (const page of pages) {
-        if (!page.slug)
-            continue;
-        if (!groups[page.slug]) {
-            groups[page.slug] = [];
-        }
-        groups[page.slug].push({ slug: page.slug, locale: (_a = page.locale) !== null && _a !== void 0 ? _a : defaultLocale });
-    }
-    return groups;
+    return normalizeSlug(slug) === normalizeSlug(DUMMY_PAGE_SLUG);
 }

package/utils/create-pages/utils/types.d.ts

@@ -1,14 +1,18 @@
 type Path = string;
+type NormalizedSlug = string;
 export interface IPage {
     title?: string | null;
     slug?: string | null;
     locale?: string | null;
+    hub?: {
+        slug?: string | null;
+    } | null;
 }
 interface IExistedPage {
     slug: NonNullable<IPage['slug']>;
     locale: NonNullable<IPage['locale']>;
 }
-export type PageGroup = Record<IExistedPage['slug'], IExistedPage[]>;
+export type PageGroup = Record<NormalizedSlug, IExistedPage[]>;
 export interface IHrefLang {
     href: string;
     hrefLang: string;

package/utils/strapi-source/schema/collections/hub.d.ts

@@ -0,0 +1 @@
+export declare const hub = "\n    # === PAGE HUB DEFINITION ===\n    type Hub {\n      name: String!\n      slug: String!\n    }\n  ";

package/utils/strapi-source/schema/collections/hub.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hub = void 0;
+exports.hub = `
+    # === PAGE HUB DEFINITION ===
+    type Hub {
+      name: String!
+      slug: String!
+    }
+  `;

package/utils/strapi-source/schema/collections/page.d.ts

@@ -1 +1 @@
-export declare const page = "\n    # === STRAPI PAGE DEFINITION ===\n    type StrapiPage implements Node {\n      id: ID!\n      locale: String\n      title: String\n      slug: String\n      seo: Seo\n      author: Author\n      createdAt: Date @dateformat\n      updatedAt: Date @dateformat\n      content: [ContentComponent]\n    }\n";
+export declare const page = "\n    # === STRAPI PAGE DEFINITION ===\n    type StrapiPage implements Node {\n      id: ID!\n      locale: String\n      title: String\n      slug: String\n      seo: Seo\n      author: Author\n      hub: Hub\n      createdAt: Date @dateformat\n      updatedAt: Date @dateformat\n      content: [ContentComponent]\n    }\n";

package/utils/strapi-source/schema/collections/page.js

@@ -10,6 +10,7 @@ exports.page = `
       slug: String
       seo: Seo
       author: Author
+      hub: Hub
       createdAt: Date @dateformat
       updatedAt: Date @dateformat
       content: [ContentComponent]

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeDefs = void 0;
 const author_1 = require("./collections/author");
+const hub_1 = require("./collections/hub");
 const page_1 = require("./collections/page");
 const partner_1 = require("./collections/partner");
 const base_1 = require("./components/base");
@@ -11,4 +12,16 @@ const primitives_1 = require("./primitives");
 const localization_1 = require("./single/localization");
 const navigation_1 = require("./single/navigation");
 const site_1 = require("./single/site");
-exports.typeDefs = [author_1.author, page_1.page, partner_1.partner, base_1.base, content_1.content, shared_1.shared, primitives_1.primitives, localization_1.localization, navigation_1.navigation, site_1.site].join('\n');
+exports.typeDefs = [
+    author_1.author,
+    hub_1.hub,
+    page_1.page,
+    partner_1.partner,
+    base_1.base,
+    content_1.content,
+    shared_1.shared,
+    primitives_1.primitives,
+    localization_1.localization,
+    navigation_1.navigation,
+    site_1.site,
+].join('\n');

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

@@ -47,6 +47,9 @@ function sourceStrapiContentNode(args, strapiClient, config) {
                 singularName: 'page',
                 queryParams: {
                     populate: {
+                        hub: {
+                            populate: '*',
+                        },
                         seo: {
                             populate: '*',
                         },