@quintype/seo 1.40.6-embed-url.4 → 1.40.7-amphtml-issue.0

package/.vscode/settings.json

@@ -3,8 +3,8 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.tabSize": 2,
-  "editor.detectIndentation": false,
   "editor.formatOnSave": true,
+  "editor.detectIndentation": false,
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,
   "editor.codeActionsOnSave": {

package/CHANGELOG.md

@@ -2,14 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.40.5](https://github.com/quintype/quintype-node-seo/compare/v1.40.1...v1.40.5) (2022-06-30)
-
-
-### Bug Fixes
-
-* og image for stories with no image | fallback og image ([454aef9](https://github.com/quintype/quintype-node-seo/commit/454aef9e0a1bc5acfde1aa56d223c518255376a2))
-* Update image schema ([#522](https://github.com/quintype/quintype-node-seo/issues/522)) ([5e42cdc](https://github.com/quintype/quintype-node-seo/commit/5e42cdcbb14d587251b7a3f932a4f98dd358f188))
-
 ### [1.40.4](https://github.com/quintype/quintype-node-seo/compare/v1.40.4-amptag.0...v1.40.4) (2022-03-22)
 
 ### [1.40.3](https://github.com/quintype/quintype-node-seo/compare/v1.40.2...v1.40.3) (2022-02-23)

package/dist/index.cjs.js

@@ -159,33 +159,6 @@ function buildCustomTags(customTags = {}, pageType = "") {
   return {};
 }
 
-function buildTagsFromStaticPage(config, page, url = {}, data) {
-  const seoData = lodash.get(page, ["metadata", "seo"], {});
-  const customSeo = lodash.get(data, ["data", "customSeo"], {});
-  if (lodash.isEmpty(seoData) && lodash.isEmpty(customSeo)) return;
-
-  const { "meta-title": metaTitle, "meta-description": metaDescription, "meta-keywords": keywords } = seoData;
-
-  const title = customSeo.title || metaTitle || page.title;
-  const pageTitle = customSeo["page-title"] || title;
-  const description = customSeo.description || metaDescription;
-  const ogTitle = customSeo.ogTitle || title;
-  const staticPageUrl = `${config["sketches-host"]}${url.pathname}`;
-  const ogDescription = customSeo.ogDescription || description;
-
-  return {
-    title,
-    "page-title": pageTitle,
-    description,
-    keywords: `${title},${config["publisher-name"]}`,
-    canonicalUrl: staticPageUrl,
-    ogUrl: staticPageUrl,
-    ogTitle,
-    ogDescription,
-    keywords: customSeo.keywords || keywords
-  };
-}
-
 // The findRelevantConfig method call has no ownerId for home page.
 // This causes the seoMetadata to be undefined.
 // So the default value for the ownerId is set to null.
@@ -242,8 +215,6 @@ function getSeoData(config, pageType, data, url = {}, seoConfig = {}) {
       return buildTagsFromStory(config, lodash.get(data, ["data", "story"]), url, data) || getSeoData(config, "home-page", data, url);
     case "author-page":
       return buildTagsFromAuthor(config, lodash.get(data, ["data", "author"], {}), url, data) || getSeoData(config, "home-page", data, url);
-    case "static-page":
-      return buildTagsFromStaticPage(config, lodash.get(data, ["data", "page"], {}), url, data) || getSeoData(config, "home-page", data, url);
     case "shell":
       return getShellSeoData(config);
     default:
@@ -820,30 +791,9 @@ function generateLiveBlogPostingData(structuredData = {}, story = {}, publisherC
   };
 }
 
-function getEmbedUrl(cards) {
-  let embedUrl = "";
-
-  // not using the return value of top level find
-  // coz we only need the embed url
-  // find is used for early exit
-  cards.find(card => {
-    const storyElements = card["story-elements"];
-    return storyElements.find((elem, index) => {
-      if (elem["embed-url"]) {
-        embedUrl = elem["embed-url"];
-        return true;
-      }
-      return false;
-    });
-  });
-
-  return embedUrl;
-}
-
 function generateVideoArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = story.seo && story.seo["meta-keywords"] || [];
-  const storyCards = get__default["default"](story, ["cards"], []);
-  const embedUrl = getEmbedUrl(storyCards);
+  const embedUrl = get__default["default"](story, ["cards", "0", "story-elements", "0", "embed-url"], "");
   const socialShareMsg = get__default["default"](story, ["summary"], "");
   const metaDescription = get__default["default"](story, ["seo", "meta-description"], "");
   const subHeadline = get__default["default"](story, ["subheadline"], "");
@@ -1109,11 +1059,13 @@ function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
   // 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: `${ampUrlAppend}/amp/story/${storySlug}`
+      href: ampUrl
     }];
   } else {
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.40.6-embed-url.4",
+  "version": "1.40.7-amphtml-issue.0",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/amp-tags.js

@@ -40,11 +40,13 @@ export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
   // 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: `${ampUrlAppend}/amp/story/${storySlug}`
+      href: ampUrl
     }];
   } else {
     return [];

package/src/structured-data/structured-data-tags.js

@@ -254,31 +254,9 @@ function generateLiveBlogPostingData(structuredData = {}, story = {}, publisherC
   };
 }
 
-function getEmbedUrl(cards) {
-  let embedUrl = "";
-
-  // not using the return value of top level find
-  // coz we only need the embed url
-  // find is used for early exit
-  cards.find((card) => {
-    const storyElements = card["story-elements"];
-    return storyElements.find((elem, index) => {
-      if (elem["embed-url"]) {
-        embedUrl = elem["embed-url"];
-        return true;
-      }
-      return false;
-    });
-  });
-
-  return embedUrl;
-}
-
-
 function generateVideoArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = (story.seo && story.seo["meta-keywords"]) || [];
-  const storyCards = get(story, ["cards"], []);
-  const embedUrl = getEmbedUrl(storyCards);
+  const embedUrl = get(story, ["cards", "0", "story-elements", "0", "embed-url"], "");
   const socialShareMsg = get(story, ["summary"], "");
   const metaDescription = get(story, ["seo", "meta-description"], "");
   const subHeadline = get(story, ["subheadline"], "");
@@ -498,7 +476,10 @@ export function StructuredDataTags({ structuredData = {} }, config, pageType, re
     }
 
     if (structuredData.enableVideo && story["story-template"] === "video") {
-      return ldJson("VideoObject", generateVideoArticleData(structuredData, story, publisherConfig, timezone));
+      return ldJson(
+        "VideoObject",
+        generateVideoArticleData(structuredData, story, publisherConfig, timezone)
+      );
     }
 
     if (structuredData.enableNewsArticle !== "withoutArticleSchema") {

package/src/text-tags.js

@@ -112,33 +112,6 @@ function buildCustomTags(customTags = {}, pageType = "") {
   return {};
 }
 
-function buildTagsFromStaticPage(config, page, url = {}, data) {
-  const seoData = get(page, ["metadata", "seo"], {});
-  const customSeo = get(data, ["data", "customSeo"], {});
-  if (isEmpty(seoData) && isEmpty(customSeo)) return;
-
-  const { "meta-title": metaTitle, "meta-description": metaDescription, "meta-keywords": keywords } = seoData;
-
-  const title = customSeo.title || metaTitle || page.title;
-  const pageTitle = customSeo["page-title"] || title;
-  const description = customSeo.description || metaDescription;
-  const ogTitle = customSeo.ogTitle || title;
-  const staticPageUrl = `${config["sketches-host"]}${url.pathname}`;
-  const ogDescription = customSeo.ogDescription || description;
-
-  return {
-    title,
-    "page-title": pageTitle,
-    description,
-    keywords: `${title},${config["publisher-name"]}`,
-    canonicalUrl: staticPageUrl,
-    ogUrl: staticPageUrl,
-    ogTitle,
-    ogDescription,
-    keywords: customSeo.keywords || keywords,
-  };
-}
-
 // The findRelevantConfig method call has no ownerId for home page.
 // This causes the seoMetadata to be undefined.
 // So the default value for the ownerId is set to null.
@@ -215,11 +188,6 @@ function getSeoData(config, pageType, data, url = {}, seoConfig = {}) {
         buildTagsFromAuthor(config, get(data, ["data", "author"], {}), url, data) ||
         getSeoData(config, "home-page", data, url)
       );
-    case "static-page":
-      return (
-        buildTagsFromStaticPage(config, get(data, ["data", "page"], {}), url, data) ||
-        getSeoData(config, "home-page", data, url)
-      );
     case "shell":
       return getShellSeoData(config);
     default:

package/test/amp_tags_test.js

@@ -19,6 +19,12 @@ describe('AmpTags', function () {
     assertContains('<link rel="amphtml" href="/amp/story/section%2Fslug"/>', string);
   });
 
+  it("it does not append `/amp/story` to the amp tag when it's a visual story", function () {
+    const story = { slug: "section/slug", "is-amp-supported": true };
+    const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: { ...story, "story-template": "visual-story" } } }, {});
+    assertContains('<link rel="amphtml" href="/section%2Fslug"/>', string);
+  });
+
   it("does not rely on is-amp-supported in story API", function () {
     const story = { slug: "section/slug", "is-amp-supported": false };
     const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: story } }, {});