@quintype/seo 1.41.3-gsc-errors-fix.0 → 1.41.3

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.41.3](https://github.com/quintype/quintype-node-seo/compare/v1.41.2...v1.41.3) (2022-12-02)
+
 ### [1.41.2](https://github.com/quintype/quintype-node-seo/compare/v1.41.1...v1.41.2) (2022-11-30)
 
 ### [1.41.1](https://github.com/quintype/quintype-node-seo/compare/v1.41.1-gsc-errors.0...v1.41.1) (2022-11-29)

package/dist/index.cjs.js

@@ -81,14 +81,13 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
-  const templatesToIgnore = seoConfig.ignoreAmpHtmlStoryTemplates || ["visual-story"];
   const story = get__default["default"](data, ["data", "story"], {});
   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}`;
-  const ignoreStoryTemplate = templatesToIgnore.includes(story["story-template"]);
+  const ignoreStoryTemplate = seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
   if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
     return [{
       tag: "link",
@@ -119,7 +118,7 @@ function AuthorTags(seoConfig, config, pageType, data, { url }) {
 }
 
 function getTwitterCreator(storyData) {
-  const twitterData = lodash.get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {});
+  const twitterData = lodash.get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {}) || {};
   const twitterUrl = twitterData.url || "";
   const twitterHandle = twitterData.handle || "";
   if (twitterHandle.startsWith("@")) return twitterHandle;
@@ -208,7 +207,7 @@ function generateStructuredData(config = {}) {
 }
 
 function getSiteTwitterHandle(config, fallback) {
-  const twitterUrl = get__default["default"](config, ["social-links", "twitter-url"], "");
+  const twitterUrl = get__default["default"](config, ["social-links", "twitter-url"], "") || "";
   const twitterHandleFromUrl = twitterUrl.split("/").pop();
   if (twitterHandleFromUrl) {
     if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;

package/package.json

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

package/src/amp-tags.js

@@ -33,7 +33,6 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
-  const templatesToIgnore = seoConfig.ignoreAmpHtmlStoryTemplates || ["visual-story"];
   const story = get(data, ["data", "story"], {});
   const { currentHostUrl = "", domainSlug } = data;
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
@@ -45,7 +44,8 @@ export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
     story["story-template"] === "visual-story"
       ? `${ampUrlAppend}/${storySlug}`
       : `${ampUrlAppend}/amp/story/${storySlug}`;
-  const ignoreStoryTemplate = templatesToIgnore.includes(story["story-template"]);
+  const ignoreStoryTemplate =
+    seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
   if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
     return [
       {

package/src/author-tags.js

@@ -21,7 +21,7 @@ export function AuthorTags(seoConfig, config, pageType, data, { url }) {
 }
 
 function getTwitterCreator(storyData) {
-  const twitterData = get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {});
+  const twitterData = get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {}) || {};
   const twitterUrl = twitterData.url || "";
   const twitterHandle = twitterData.handle || "";
   if (twitterHandle.startsWith("@")) return twitterHandle;

package/src/generate-common-seo.js

@@ -83,7 +83,7 @@ export function generateStructuredData(config = {}) {
 }
 
 function getSiteTwitterHandle(config, fallback) {
-  const twitterUrl = get(config, ["social-links", "twitter-url"], "");
+  const twitterUrl = get(config, ["social-links", "twitter-url"], "") || "";
   const twitterHandleFromUrl = twitterUrl.split("/").pop();
   if (twitterHandleFromUrl) {
     if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;

package/test/amp_tags_test.js

@@ -1,9 +1,9 @@
 const { StoryAmpTags } = require("..");
 const { getSeoMetadata, assertContains } = require("./utils");
 
-const assert = require("assert");
+const assert = require('assert');
 
-describe("AmpTags", function () {
+describe('AmpTags', function () {
   const seoConfig = {
     generators: [StoryAmpTags],
     ampStoryPages: true,
@@ -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 } }, {});