@quintype/seo 1.40.14-gsc-errors.0 → 1.40.14-gsc-errors.3

package/dist/index.cjs.js

@@ -50,11 +50,11 @@ function isStoryPublic(story) {
 }
 
 function showAmpTag({ ampStoryPages = true }, pageType, story) {
-  if (!ampStoryPages || pageType !== 'story-page') {
+  if (!ampStoryPages || pageType !== "story-page") {
     return false;
   }
 
-  if (ampStoryPages === 'public' && !isStoryPublic(story)) {
+  if (ampStoryPages === "public" && !isStoryPublic(story)) {
     return false;
   }
 
@@ -62,7 +62,7 @@ function showAmpTag({ ampStoryPages = true }, pageType, story) {
 }
 
 const getDomain = (url, domainSlug) => {
-  const domain = domainSlug ? new URL(url).origin : '';
+  const domain = domainSlug ? new URL(url).origin : "";
   try {
     return domain;
   } catch (err) {
@@ -81,18 +81,17 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
-
   const story = get__default["default"](data, ["data", "story"], {});
-  const { currentHostUrl = '', domainSlug } = data;
+  const { currentHostUrl = "", domainSlug } = data;
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
-  const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config['sketches-host'] : '';
+  const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config["sketches-host"] : "";
   const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug) : encodeURIComponent(story.slug);
   const ampUrl = story["story-template"] === "visual-story" ? `${ampUrlAppend}/${storySlug}` : `${ampUrlAppend}/amp/story/${storySlug}`;
-
-  if (showAmpTag(seoConfig, pageType, story)) {
+  const ignoreStoryTemplate = seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
+  if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
     return [{
-      tag: 'link',
-      rel: 'amphtml',
+      tag: "link",
+      rel: "amphtml",
       href: ampUrl
     }];
   } else {
@@ -1292,7 +1291,7 @@ class SEO {
    */
   constructor(seoConfig = {}) {
     this.seoConfig = seoConfig;
-    this.generators = (seoConfig.generators || [TextTags, ImageTags, AuthorTags, StaticTags, StructuredDataTags]).concat(seoConfig.extraGenerators || []);
+    this.generators = (seoConfig.generators || [TextTags, ImageTags, AuthorTags, StaticTags, StructuredDataTags, StoryAmpTags]).concat(seoConfig.extraGenerators || []);
   }
 
   getMetaTags(config, pageType, data, params = {}) {

package/index.js

@@ -108,7 +108,7 @@ export class SEO {
   constructor(seoConfig = {}) {
     this.seoConfig = seoConfig;
     this.generators = (
-      seoConfig.generators || [TextTags, ImageTags, AuthorTags, StaticTags, StructuredDataTags]
+      seoConfig.generators || [TextTags, ImageTags, AuthorTags, StaticTags, StructuredDataTags, StoryAmpTags]
     ).concat(seoConfig.extraGenerators || []);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.40.14-gsc-errors.0",
+  "version": "1.40.14-gsc-errors.3",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/amp-tags.js

@@ -1,12 +1,12 @@
-import get from 'lodash/get';
-import { isStoryPublic } from './utils';
+import get from "lodash/get";
+import { isStoryPublic } from "./utils";
 
 function showAmpTag({ ampStoryPages = true }, pageType, story) {
-  if (!ampStoryPages || pageType !== 'story-page') {
+  if (!ampStoryPages || pageType !== "story-page") {
     return false;
   }
 
-  if (ampStoryPages === 'public' && !isStoryPublic(story)) {
+  if (ampStoryPages === "public" && !isStoryPublic(story)) {
     return false;
   }
 
@@ -14,14 +14,13 @@ function showAmpTag({ ampStoryPages = true }, pageType, story) {
 }
 
 const getDomain = (url, domainSlug) => {
-  const domain = domainSlug ? new URL(url).origin : '';
+  const domain = domainSlug ? new URL(url).origin : "";
   try {
     return domain;
+  } catch (err) {
+    return "";
   }
-  catch (err) {
-    return ""
-  }
-}
+};
 
 /**
  * StoryAmpTags adds the amphref to stories which support amp.
@@ -34,20 +33,27 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
-
   const story = get(data, ["data", "story"], {});
-  const { currentHostUrl = '', domainSlug } = data;
+  const { currentHostUrl = "", domainSlug } = data;
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
-  const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config['sketches-host'] : '';
-  const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug): encodeURIComponent(story.slug);
-  const ampUrl = story["story-template"] === "visual-story" ? `${ampUrlAppend}/${storySlug}` : `${ampUrlAppend}/amp/story/${storySlug}`;
-
-  if (showAmpTag(seoConfig, pageType, story)) {
-    return [{
-      tag: 'link',
-      rel: 'amphtml',
-      href: ampUrl
-    }];
+  const ampUrlAppend = seoConfig.appendHostToAmpUrl
+    ? getDomain(currentHostUrl, domainSlug) || config["sketches-host"]
+    : "";
+  const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug) : encodeURIComponent(story.slug);
+  const ampUrl =
+    story["story-template"] === "visual-story"
+      ? `${ampUrlAppend}/${storySlug}`
+      : `${ampUrlAppend}/amp/story/${storySlug}`;
+  const ignoreStoryTemplate =
+    seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
+  if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
+    return [
+      {
+        tag: "link",
+        rel: "amphtml",
+        href: ampUrl,
+      },
+    ];
   } else {
     return [];
   }