@anywayseo/gatsby-plugin 2.6.0 → 2.7.0

package/gatsby-node.js

@@ -43,12 +43,12 @@ function createSchemaCustomization(args) {
 function sourceNodes(args, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { reporter } = args;
-        const { strapiApiUrl, strapiAccessToken, pageSize, skipFileDownloads = false } = options;
+        const { strapiApiUrl, strapiAccessToken, pageSize, skipFileDownloads = false, retryNumber, retryDelay } = options;
         if (source === 'local') {
             reporter.warn('Local source mode enabled. Skipping Strapi source nodes.');
         }
         else {
-            const strapiClient = new strapi_source_1.StrapiClient(strapiApiUrl, strapiAccessToken);
+            const strapiClient = new strapi_source_1.StrapiClient(reporter, strapiApiUrl, strapiAccessToken, retryNumber, retryDelay);
             yield (0, strapi_source_1.sourceStrapiContentNode)(args, strapiClient, { pageSize, skipFileDownloads });
             yield (0, strapi_source_1.sourceStrapiNavigationNode)(args, strapiClient);
             yield (0, strapi_source_1.sourceStrapiLocalizationNode)(args, strapiClient);

package/package.json

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

package/types/index.d.ts

@@ -4,6 +4,8 @@ export interface IPluginOptions extends IPluginRefOptions {
     source: string;
     strapiApiUrl?: string;
     strapiAccessToken?: string;
+    retryNumber?: number;
+    retryDelay?: number;
     pageSize?: number;
     skipFileDownloads?: boolean;
 }

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

@@ -52,7 +52,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.normalizeSlug)(strapiPage === null || strapiPage === void 0 ? void 0 : strapiPage.slug) === (0, slug_1.normalizeSlug)(slug));
+                    const existingPage = strapiPages.find((strapiPage) => (0, slug_1.isEqualSlug)(strapiPage === null || strapiPage === void 0 ? void 0 : strapiPage.slug, slug));
                     if (!!existingPage) {
                         reporter.warn(`Skipping MDX page creation: "${slug}" already exists`);
                         return;
@@ -60,7 +60,7 @@ function createMdxPages(_a, root_1) {
                     const mdxPageTemplate = (0, path_1.resolve)(root, `./src/templates/mdx-page.jsx`);
                     const component = `${mdxPageTemplate}?__contentFilePath=${contentFilePath}`;
                     actions.createPage({
-                        path: `/${(0, slug_1.normalizeSlug)(slug)}`,
+                        path: (0, slug_1.buildPath)(slug),
                         component,
                         context: { slug },
                     });

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

@@ -1,2 +1,4 @@
-export declare const DUMMY_PAGE_SLUG = "dummy";
-export declare function normalizeSlug(slug?: string | null): string;
+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;

package/utils/create-pages/slug.js

@@ -1,8 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DUMMY_PAGE_SLUG = void 0;
-exports.normalizeSlug = normalizeSlug;
-exports.DUMMY_PAGE_SLUG = 'dummy';
+exports.buildPath = buildPath;
+exports.isEqualSlug = isEqualSlug;
+exports.isEmptyPage = isEmptyPage;
+exports.isDummyPage = isDummyPage;
+const INDEX_PAGE_SLUG = 'index';
+const DUMMY_PAGE_SLUG = 'dummy';
 function normalizeSlug(slug) {
-    return slug && slug !== 'index' ? slug : '';
+    if (!slug || slug === INDEX_PAGE_SLUG) {
+        return '';
+    }
+    return slug.toLowerCase();
+}
+function normalizeLocale(locale) {
+    return (locale !== null && locale !== void 0 ? locale : '').toLowerCase();
+}
+function buildPath(slug, locale, defaultLocale) {
+    const normalizedLocale = normalizeLocale(locale);
+    const normalizedDefaultLocale = normalizeLocale(defaultLocale);
+    const localePrefix = normalizedLocale === normalizedDefaultLocale ? '/' : `/${normalizedLocale}/`;
+    return `${localePrefix}${normalizeSlug(slug)}`;
+}
+function isEqualSlug(a, b) {
+    return normalizeSlug(a) === normalizeSlug(b);
+}
+function isEmptyPage(title, slug) {
+    return !title && !slug;
+}
+function isDummyPage(slug) {
+    return normalizeSlug(slug) === DUMMY_PAGE_SLUG;
 }

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

@@ -44,17 +44,17 @@ function createStrapiPages(_a, root_1) {
             reporter.info(`Found ${strapiPages.length} Strapi pages`);
             let pageCount = 0;
             strapiPages.forEach(({ id, slug, title, locale }) => {
-                if (slug === slug_1.DUMMY_PAGE_SLUG) {
+                if ((0, slug_1.isDummyPage)(slug)) {
                     reporter.warn('Skipping page creation: dummy page detected');
                     return;
                 }
-                if (!title && !slug) {
+                if ((0, slug_1.isEmptyPage)(title, slug)) {
                     reporter.warn('Skipping page creation: empty page detected');
                     return;
                 }
                 const strapiPageTemplate = (0, path_1.resolve)(root, `./src/templates/strapi-page.tsx`);
                 actions.createPage({
-                    path: `/${locale === defaultLocale ? '' : locale + '/'}${(0, slug_1.normalizeSlug)(slug)}`,
+                    path: (0, slug_1.buildPath)(slug, locale, defaultLocale),
                     component: strapiPageTemplate,
                     context: { id },
                 });

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

@@ -0,0 +1 @@
+export declare const partner = "\n    # === PARTNER DEFINITION ===\n    type Partner {\n      name: String!\n      refLink: String\n    }\n  ";

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.partner = void 0;
+exports.partner = `
+    # === PARTNER DEFINITION ===
+    type Partner {
+      name: String!
+      refLink: String
+    }
+  `;

package/utils/strapi-source/schema/components/content.d.ts

@@ -1 +1 @@
-export declare const content = "\n    # === COMPONENT DEFINITIONS ===\n    union ContentComponent =\n        STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE\n      | STRAPI__COMPONENT_CONTENT_COOKIE_POLICY_PAGE \n      | STRAPI__COMPONENT_CONTENT_FAQ\n      | STRAPI__COMPONENT_CONTENT_FEATURES\n      | STRAPI__COMPONENT_CONTENT_GAME_CARDS\n      | STRAPI__COMPONENT_CONTENT_GAME_CARD_TABS\n      | STRAPI__COMPONENT_CONTENT_GAME_DEMO\n      | STRAPI__COMPONENT_CONTENT_GAME_INFO\n      | STRAPI__COMPONENT_CONTENT_HOW_TO\n      | STRAPI__COMPONENT_CONTENT_LIST\n      | STRAPI__COMPONENT_CONTENT_MEDIA\n      | STRAPI__COMPONENT_CONTENT_PRIVACY_POLICY_PAGE\n      | STRAPI__COMPONENT_CONTENT_PROS_CONS\n      | STRAPI__COMPONENT_CONTENT_RICH_TEXT\n      | STRAPI__COMPONENT_CONTENT_TABLE\n      | STRAPI__COMPONENT_CONTENT_TERMS_CONDITIONS_PAGE\n      | STRAPI__COMPONENT_CONTENT_TIP\n\n    # === CONTACTS ===\n    type STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE @dontInfer {\n      id: ID\n    }\n\n    # === COOKIE_POLICY ===\n    type STRAPI__COMPONENT_CONTENT_COOKIE_POLICY_PAGE @dontInfer {\n      id: ID\n    }\n\n    # === FAQ ===\n    type STRAPI__COMPONENT_CONTENT_FAQ @dontInfer {\n      items: [FaqItem!]\n    }\n\n    # === FEATURES ===\n    type STRAPI__COMPONENT_CONTENT_FEATURES @dontInfer {\n      items: [FeaturesItem!]\n    }\n\n    # === GAME CARDS ===\n    type STRAPI__COMPONENT_CONTENT_GAME_CARDS @dontInfer {\n      items: [GameCard!]\n      order: String!\n      randomSeed: Int\n      cardHeight: String\n    }\n\n    # === GAME CARD TABS ===\n    type STRAPI__COMPONENT_CONTENT_GAME_CARD_TABS @dontInfer {\n      items: [GameCardTab!]\n    }\n\n    # === GAME_DEMO ===\n    type STRAPI__COMPONENT_CONTENT_GAME_DEMO @dontInfer {\n      name: String!\n      src: String!\n      href: String\n      previewImage: Image!\n    }\n\n    # === GAME_INFO ===\n    type STRAPI__COMPONENT_CONTENT_GAME_INFO @dontInfer {\n      general: GameInfoGeneral\n      features: GameInfoFeatures\n      currency: CurrencyList\n    }\n\n    # === HOW_TO ===\n    type STRAPI__COMPONENT_CONTENT_HOW_TO @dontInfer {\n      steps: [HowToStep!]\n    }\n\n    # === LIST ===\n    type STRAPI__COMPONENT_CONTENT_LIST @dontInfer {\n      bullet: String\n      content: JsonValue\n    }\n\n    # === MEDIA ===\n    type STRAPI__COMPONENT_CONTENT_MEDIA @dontInfer {\n      file: Image\n    }\n\n    # === PRIVACY_POLICY ===\n    type STRAPI__COMPONENT_CONTENT_PRIVACY_POLICY_PAGE @dontInfer {\n      contactsSlug: String\n    }\n\n    # === PROS_CONS ===\n    type STRAPI__COMPONENT_CONTENT_PROS_CONS @dontInfer {\n      pros: [ProsConsItem!]\n      cons: [ProsConsItem!]\n    }\n\n    # === RICH_TEXT ===\n    type STRAPI__COMPONENT_CONTENT_RICH_TEXT @dontInfer {\n      content: RichTextContent\n    }\n\n    # === TABLE ===\n    type STRAPI__COMPONENT_CONTENT_TABLE @dontInfer {\n      columnNumber: Int!\n      content: JsonValue\n      caption: String\n      striped: Boolean\n      bordered: Boolean\n      scrollable: Boolean\n    }\n\n    # === TERMS_CONDITIONS ===\n    type STRAPI__COMPONENT_CONTENT_TERMS_CONDITIONS_PAGE @dontInfer {\n      privacyPolicySlug: String\n    }\n\n    # === TIP ===\n    type STRAPI__COMPONENT_CONTENT_TIP @dontInfer {\n      tip: String!\n      author: Author\n    }\n  ";
+export declare const content = "\n    # === COMPONENT DEFINITIONS ===\n    union ContentComponent =\n        STRAPI__COMPONENT_CONTENT_ACTION_BUTTON\n      | STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE\n      | STRAPI__COMPONENT_CONTENT_COOKIE_POLICY_PAGE \n      | STRAPI__COMPONENT_CONTENT_FAQ\n      | STRAPI__COMPONENT_CONTENT_FEATURES\n      | STRAPI__COMPONENT_CONTENT_GAME_CARDS\n      | STRAPI__COMPONENT_CONTENT_GAME_CARD_TABS\n      | STRAPI__COMPONENT_CONTENT_GAME_DEMO\n      | STRAPI__COMPONENT_CONTENT_GAME_INFO\n      | STRAPI__COMPONENT_CONTENT_HOW_TO\n      | STRAPI__COMPONENT_CONTENT_INFORMER\n      | STRAPI__COMPONENT_CONTENT_LIST\n      | STRAPI__COMPONENT_CONTENT_MEDIA\n      | STRAPI__COMPONENT_CONTENT_PRIVACY_POLICY_PAGE\n      | STRAPI__COMPONENT_CONTENT_PROS_CONS\n      | STRAPI__COMPONENT_CONTENT_RICH_TEXT\n      | STRAPI__COMPONENT_CONTENT_TABLE\n      | STRAPI__COMPONENT_CONTENT_TERMS_CONDITIONS_PAGE\n      | STRAPI__COMPONENT_CONTENT_TIP\n\n    # === ACTION_BUTTON ===\n    type STRAPI__COMPONENT_CONTENT_ACTION_BUTTON @dontInfer {\n      label: String!\n      url: String!\n    }\n\n    # === CONTACTS ===\n    type STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE @dontInfer {\n      id: ID\n    }\n\n    # === COOKIE_POLICY ===\n    type STRAPI__COMPONENT_CONTENT_COOKIE_POLICY_PAGE @dontInfer {\n      id: ID\n    }\n\n    # === FAQ ===\n    type STRAPI__COMPONENT_CONTENT_FAQ @dontInfer {\n      items: [FaqItem!]\n    }\n\n    # === FEATURES ===\n    type STRAPI__COMPONENT_CONTENT_FEATURES @dontInfer {\n      items: [FeaturesItem!]\n    }\n\n    # === GAME CARDS ===\n    type STRAPI__COMPONENT_CONTENT_GAME_CARDS @dontInfer {\n      items: [GameCard!]\n      order: String!\n      randomSeed: Int\n      cardHeight: String\n    }\n\n    # === GAME CARD TABS ===\n    type STRAPI__COMPONENT_CONTENT_GAME_CARD_TABS @dontInfer {\n      items: [GameCardTab!]\n    }\n\n    # === GAME_DEMO ===\n    type STRAPI__COMPONENT_CONTENT_GAME_DEMO @dontInfer {\n      name: String!\n      src: String\n      href: String\n      previewImage: Image!\n      partner: Partner\n    }\n\n    # === GAME_INFO ===\n    type STRAPI__COMPONENT_CONTENT_GAME_INFO @dontInfer {\n      general: GameInfoGeneral\n      features: GameInfoFeatures\n      currency: CurrencyList\n    }\n\n    # === INFORMER ===\n    type STRAPI__COMPONENT_CONTENT_INFORMER @dontInfer {\n      type: String!\n      text: String!\n      author: Author\n    }\n\n    # === HOW_TO ===\n    type STRAPI__COMPONENT_CONTENT_HOW_TO @dontInfer {\n      steps: [HowToStep!]\n    }\n\n    # === LIST ===\n    type STRAPI__COMPONENT_CONTENT_LIST @dontInfer {\n      bullet: String\n      content: JsonValue\n    }\n\n    # === MEDIA ===\n    type STRAPI__COMPONENT_CONTENT_MEDIA @dontInfer {\n      file: Image\n    }\n\n    # === PRIVACY_POLICY ===\n    type STRAPI__COMPONENT_CONTENT_PRIVACY_POLICY_PAGE @dontInfer {\n      contactsSlug: String\n    }\n\n    # === PROS_CONS ===\n    type STRAPI__COMPONENT_CONTENT_PROS_CONS @dontInfer {\n      pros: [ProsConsItem!]\n      cons: [ProsConsItem!]\n    }\n\n    # === RICH_TEXT ===\n    type STRAPI__COMPONENT_CONTENT_RICH_TEXT @dontInfer {\n      content: RichTextContent\n    }\n\n    # === TABLE ===\n    type STRAPI__COMPONENT_CONTENT_TABLE @dontInfer {\n      columnNumber: Int!\n      content: JsonValue\n      caption: String\n      striped: Boolean\n      bordered: Boolean\n      scrollable: Boolean\n    }\n\n    # === TERMS_CONDITIONS ===\n    type STRAPI__COMPONENT_CONTENT_TERMS_CONDITIONS_PAGE @dontInfer {\n      privacyPolicySlug: String\n    }\n\n    # === TIP ===\n    type STRAPI__COMPONENT_CONTENT_TIP @dontInfer {\n      tip: String!\n      author: Author\n    }\n  ";

package/utils/strapi-source/schema/components/content.js

@@ -4,7 +4,8 @@ exports.content = void 0;
 exports.content = `
     # === COMPONENT DEFINITIONS ===
     union ContentComponent =
-        STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE
+        STRAPI__COMPONENT_CONTENT_ACTION_BUTTON
+      | STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE
       | STRAPI__COMPONENT_CONTENT_COOKIE_POLICY_PAGE 
       | STRAPI__COMPONENT_CONTENT_FAQ
       | STRAPI__COMPONENT_CONTENT_FEATURES
@@ -13,6 +14,7 @@ exports.content = `
       | STRAPI__COMPONENT_CONTENT_GAME_DEMO
       | STRAPI__COMPONENT_CONTENT_GAME_INFO
       | STRAPI__COMPONENT_CONTENT_HOW_TO
+      | STRAPI__COMPONENT_CONTENT_INFORMER
       | STRAPI__COMPONENT_CONTENT_LIST
       | STRAPI__COMPONENT_CONTENT_MEDIA
       | STRAPI__COMPONENT_CONTENT_PRIVACY_POLICY_PAGE
@@ -22,6 +24,12 @@ exports.content = `
       | STRAPI__COMPONENT_CONTENT_TERMS_CONDITIONS_PAGE
       | STRAPI__COMPONENT_CONTENT_TIP
 
+    # === ACTION_BUTTON ===
+    type STRAPI__COMPONENT_CONTENT_ACTION_BUTTON @dontInfer {
+      label: String!
+      url: String!
+    }
+
     # === CONTACTS ===
     type STRAPI__COMPONENT_CONTENT_CONTACTS_PAGE @dontInfer {
       id: ID
@@ -58,9 +66,10 @@ exports.content = `
     # === GAME_DEMO ===
     type STRAPI__COMPONENT_CONTENT_GAME_DEMO @dontInfer {
       name: String!
-      src: String!
+      src: String
       href: String
       previewImage: Image!
+      partner: Partner
     }
 
     # === GAME_INFO ===
@@ -70,6 +79,13 @@ exports.content = `
       currency: CurrencyList
     }
 
+    # === INFORMER ===
+    type STRAPI__COMPONENT_CONTENT_INFORMER @dontInfer {
+      type: String!
+      text: String!
+      author: Author
+    }
+
     # === HOW_TO ===
     type STRAPI__COMPONENT_CONTENT_HOW_TO @dontInfer {
       steps: [HowToStep!]

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeDefs = void 0;
 const author_1 = require("./collections/author");
 const page_1 = require("./collections/page");
+const partner_1 = require("./collections/partner");
 const base_1 = require("./components/base");
 const content_1 = require("./components/content");
 const shared_1 = require("./components/shared");
@@ -10,4 +11,4 @@ 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, 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, 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-client/index.d.ts

@@ -1,7 +1,12 @@
+import type { Reporter } from 'gatsby';
 export declare class StrapiClient {
+    private reporter;
     private apiUrl;
     private accessToken;
-    constructor(apiUrl?: string, accessToken?: string);
+    private retries;
+    private delay;
+    constructor(reporter: Reporter, apiUrl?: string, accessToken?: string, retries?: number, delay?: number);
+    private fetchWithRetry;
     fetch<T = any>(path: string): Promise<T>;
     getApiUrl(): string;
 }

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

@@ -11,15 +11,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StrapiClient = void 0;
 class StrapiClient {
-    constructor(apiUrl, accessToken) {
+    constructor(reporter, apiUrl, accessToken, retries = 3, delay = 1000) {
         if (!apiUrl || !accessToken) {
             throw new Error('Missing STRAPI_API_URL or STRAPI_TOKEN in environment variables.');
         }
+        this.reporter = reporter;
         this.apiUrl = apiUrl;
         this.accessToken = accessToken;
+        this.retries = retries;
+        this.delay = delay;
     }
-    fetch(path) {
-        return __awaiter(this, void 0, void 0, function* () {
+    fetchWithRetry(path_1) {
+        return __awaiter(this, arguments, void 0, function* (path, retries = this.retries, delay = this.delay) {
             try {
                 const result = yield fetch(`${this.apiUrl}/api/${path}`, {
                     headers: {
@@ -33,10 +36,20 @@ class StrapiClient {
                 return data;
             }
             catch (error) {
-                throw new Error(`Error occurred while fetching ${path}: ${error}`);
+                if (retries > 0) {
+                    this.reporter.warn(`Fetch failed for ${path}. Retrying in ${delay}ms... (${retries} retries left)`);
+                    yield new Promise((res) => setTimeout(res, delay));
+                    return this.fetchWithRetry(path, retries - 1, delay * 2); // exponential backoff
+                }
+                throw new Error(`Error fetching ${path}: ${error}`);
             }
         });
     }
+    fetch(path) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fetchWithRetry(path, this.retries, this.delay);
+        });
+    }
     getApiUrl() {
         return this.apiUrl;
     }

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

@@ -52,6 +52,9 @@ function sourceStrapiContentNode(args, strapiClient, config) {
                         },
                         content: {
                             on: {
+                                'content.action-button': {
+                                    populate: '*',
+                                },
                                 'content.contacts-page': {
                                     populate: '*',
                                 },
@@ -109,6 +112,9 @@ function sourceStrapiContentNode(args, strapiClient, config) {
                                         },
                                     },
                                 },
+                                'content.informer': {
+                                    populate: '*',
+                                },
                                 'content.list': {
                                     populate: '*',
                                 },