@anywayseo/gatsby-plugin 2.7.0 → 2.8.0

package/package.json

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

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMdxPages = createMdxPages;
 const path_1 = require("path");
-const slug_1 = require("../slug");
+const slug_1 = require("../utils/slug");
 function createMdxPages(_a, root_1) {
     return __awaiter(this, arguments, void 0, function* ({ actions, reporter, graphql }, root) {
         var _b, _c, _d, _e, _f, _g;

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

@@ -11,7 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStrapiPages = createStrapiPages;
 const path_1 = require("path");
-const slug_1 = require("../slug");
+const slug_1 = require("../utils/slug");
+const hreflang_1 = require("../utils/hreflang");
 function createStrapiPages(_a, root_1) {
     return __awaiter(this, arguments, void 0, function* ({ actions, reporter, graphql }, root) {
         var _b, _c, _d, _e;
@@ -42,8 +43,11 @@ function createStrapiPages(_a, root_1) {
                 return;
             }
             reporter.info(`Found ${strapiPages.length} Strapi pages`);
+            const hrefLangMap = (0, hreflang_1.buildHrefLangMap)(strapiPages, defaultLocale);
+            reporter.info(`Generated hrefLangs for Strapi pages`);
             let pageCount = 0;
             strapiPages.forEach(({ id, slug, title, locale }) => {
+                var _a;
                 if ((0, slug_1.isDummyPage)(slug)) {
                     reporter.warn('Skipping page creation: dummy page detected');
                     return;
@@ -53,10 +57,12 @@ 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 strapiPageHrefLangs = (_a = hrefLangMap[strapiPagePath]) !== null && _a !== void 0 ? _a : [];
                 actions.createPage({
-                    path: (0, slug_1.buildPath)(slug, locale, defaultLocale),
+                    path: strapiPagePath,
                     component: strapiPageTemplate,
-                    context: { id },
+                    context: { id, hrefLangs: strapiPageHrefLangs },
                 });
                 pageCount++;
             });

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

@@ -0,0 +1,2 @@
+import type { HrefLangMap, IPage } from './types';
+export declare function buildHrefLangMap(pages: IPage[], defaultLocale?: string): HrefLangMap;

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildHrefLangMap = buildHrefLangMap;
+const slug_1 = require("./slug");
+/** Choose x-default: prefer defaultLocale, fallback to first locale */
+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' };
+}
+function buildHrefLangMap(pages, defaultLocale = 'en') {
+    const hrefLangMap = {};
+    for (const pageGroup of Object.values((0, slug_1.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),
+            }));
+            hrefLangs.push(defaultHreflang);
+            const path = (0, slug_1.buildPath)(page.slug, page.locale, defaultLocale);
+            hrefLangMap[path] = hrefLangs;
+        }
+    }
+    return hrefLangMap;
+}

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

@@ -0,0 +1,6 @@
+import type { IPage, PageGroup } from './types';
+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/{slug.js → utils/slug.js}

@@ -4,6 +4,7 @@ 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 normalizeSlug(slug) {
@@ -30,3 +31,16 @@ function isEmptyPage(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;
+}

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

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

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,4 +0,0 @@
-export declare function buildPath(slug?: string | null, locale?: string | null, defaultLocale?: string | null): string;
-export declare function isEqualSlug(a?: string | null, b?: string | null): boolean;
-export declare function isEmptyPage(title?: string | null, slug?: string | null): boolean;
-export declare function isDummyPage(slug?: string | null): boolean;