@quintype/seo 1.41.5-description-fallback.2 → 1.42.0-peer-deps-removal.2

package/dist/index.cjs.js

@@ -6,8 +6,8 @@ var lodash = require('lodash');
 var React = require('react');
 var ReactDomServer = require('react-dom/server');
 var get = require('lodash/get');
-var dateFnsTz = require('date-fns-tz');
 var url = require('url');
+var dateFnsTz = require('date-fns-tz');
 var isUndefined = require('lodash/isUndefined');
 var omitBy = require('lodash/omitBy');
 var quintypeJs = require('quintype-js');
@@ -49,20 +49,6 @@ function isStoryPublic(story) {
   return story.access === undefined || story.access === null || story.access === 'public';
 }
 
-function getTextOfCards(story) {
-  if (story && story.cards) {
-    return story.cards.map(item => {
-      return item['story-elements'].reduce((acc, currentItem) => {
-        const elementType = currentItem.subtype || currentItem.type || '';
-        if (elementType === 'text') {
-          acc.push(currentItem.text);
-        }
-        return acc;
-      }, []);
-    }).join(' ').replace(/(<([^>]+)>)/gi, '');
-  }
-}
-
 function showAmpTag({ ampStoryPages = true }, pageType, story) {
   if (!ampStoryPages || pageType !== "story-page") {
     return false;
@@ -945,7 +931,7 @@ function StructuredDataTags({ structuredData = {} }, config, pageType, response
   return tags;
 }
 
-function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {}) {
+function buildTagsFromStory(config, story, url = {}, data = {}) {
   if (!story) return;
 
   function getStoryCardMetadata(cardId) {
@@ -966,29 +952,18 @@ function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {})
 
   const seo = story.seo || {};
 
-  let descriptionWithExtraFallback = "";
-  let ogDescriptionWithExtraFallback = "";
-  const enableMetaDescriptionFallback = lodash.get(seoConfig, ["enableMetaDescriptionFallback"], false);
-  if (enableMetaDescriptionFallback) {
-    const subHeadline = lodash.get(story, ["subheadline"]);
-    const fetch160Characters = data => data ? data.substring(0, 160) : null;
-    const fullStoryTextElementContent = getTextOfCards(story);
-    descriptionWithExtraFallback = fetch160Characters(subHeadline) || fetch160Characters(fullStoryTextElementContent);
-    ogDescriptionWithExtraFallback = fetch160Characters(fullStoryTextElementContent) || fetch160Characters(subHeadline) || lodash.get(seo, ["meta-description"]);
-  }
-
   const storyUrl = story.url || `${config["sketches-host"]}/${story.slug}`;
+
   const customSeo = lodash.get(data, ["data", "customSeo"], {});
   const authors = lodash.get(story, ["authors"], []).map(author => author.name);
   const title = customSeo.title || seo["meta-title"] || story.headline;
   const pageTitle = customSeo["page-title"] || seo["meta-title"] || story.headline;
-  const description = customSeo.description || seo["meta-description"] || story.summary || descriptionWithExtraFallback;
+  const description = customSeo.description || seo["meta-description"] || story.summary;
   const keywords = (customSeo.keywords || seo["meta-keywords"] || (story.tags || []).map(tag => tag.name)).join(",");
   const ogUrl = customSeo.ogUrl || lodash.get(seo, ["og", "url"]) || storyUrl;
   const getOgTitle = customSeo.ogTitle || lodash.get(story, ["alternative", "social", "default", "headline"], story.headline) || story.headline;
-  const ogDescription = customSeo.ogDescription || story.summary || ogDescriptionWithExtraFallback;
+  const ogDescription = customSeo.ogDescription || story.summary;
   const canonicalUrl = customSeo.canonicalUrl || story["canonical-url"] || storyUrl;
-
   const storyMetaData = {
     title,
     "page-title": pageTitle,
@@ -1098,7 +1073,6 @@ function buildCustomTags(customTags = {}, pageType = "") {
 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;
 
@@ -1172,11 +1146,11 @@ function getSeoData(config, pageType, data, url = {}, seoConfig = {}) {
     case "tag-page":
       return buildTagsFromTopic(config, lodash.get(data, ["data", "tag"]), url, data) || getSeoData(config, "home-page", data, url);
     case "story-page":
-      return buildTagsFromStory(config, lodash.get(data, ["data", "story"]), url, data, seoConfig) || getSeoData(config, "home-page", data, url);
+      return buildTagsFromStory(config, lodash.get(data, ["data", "story"]), url, data) || getSeoData(config, "home-page", data, url);
     case "visual-story":
-      return buildTagsFromStory(config, lodash.get(data, ["story"]), url, data, seoConfig) || getSeoData(config, "home-page", data, url);
+      return buildTagsFromStory(config, lodash.get(data, ["story"]), url, data) || getSeoData(config, "home-page", data, url);
     case "story-page-amp":
-      return buildTagsFromStory(config, lodash.get(data, ["data", "story"]), url, data, seoConfig) || getSeoData(config, "home-page", data, url);
+      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":
@@ -1229,7 +1203,6 @@ const SKIP_CANONICAL = "__SKIP__CANONICAL__";
  * @param {boolean} seoConfig.enableOgTags Add og tags for Facebook
  * @param {boolean} seoConfig.enableTwitterCards Add twitter tags
  * @param {boolean} seoConfig.enableNews Add tags for Google News, like news_keywords
- * @param {boolean} seoConfig.enableMetaDescriptionFallback Add extra fallbacks for meta description, og:description and twitter:description
  * @param {Object} seoConfig.customTags Add tags for a custom page type. Usually looks like `{"custom-page": {"title": "value", "canonicalUrl": "value"}}`
  * @param {...*} params See {@link Generator} for other Parameters
  */
@@ -1364,8 +1337,7 @@ class MetaTagList {
  *     },
  *     enableNewsArticle: true
  *   },
- *   ampStoryPages: true,
- *   enableMetaDescriptionFallback: true
+ *   ampStoryPages: true
  * });
  * ```
  */

package/index.js

@@ -93,8 +93,7 @@ export class MetaTagList {
  *     },
  *     enableNewsArticle: true
  *   },
- *   ampStoryPages: true,
- *   enableMetaDescriptionFallback: true
+ *   ampStoryPages: true
  * });
  * ```
  */

package/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@quintype/seo",
-  "version": "1.41.5-description-fallback.2",
+  "version": "1.42.0-peer-deps-removal.2",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",
   "author": "Quintype Developers <dev-core@quintype.com>",
   "license": "MIT",
   "peerDependencies": {
-    "lodash": "^4.0.0",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0"
+    "lodash": "^4.0.0"
   },
   "scripts": {
     "build": "rollup -c",

package/src/text-tags.js

@@ -1,7 +1,7 @@
 import { get, isEmpty } from "lodash";
-import { getTextOfCards, objectToTags } from "./utils";
+import { objectToTags } from "./utils";
 
-function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {}) {
+function buildTagsFromStory(config, story, url = {}, data = {}) {
   if (!story) return;
 
   function getStoryCardMetadata(cardId) {
@@ -22,33 +22,19 @@ function buildTagsFromStory(config, story, url = {}, data = {}, seoConfig = {})
 
   const seo = story.seo || {};
 
-  let descriptionWithExtraFallback = "";
-  let ogDescriptionWithExtraFallback = "";
-  const enableMetaDescriptionFallback = get(seoConfig, ["enableMetaDescriptionFallback"], false);
-  if (enableMetaDescriptionFallback) {
-    const subHeadline = get(story, ["subheadline"]);
-    const fetch160Characters = (data) => (data ? data.substring(0, 160) : null);
-    const fullStoryTextElementContent = getTextOfCards(story);
-    descriptionWithExtraFallback = fetch160Characters(subHeadline) || fetch160Characters(fullStoryTextElementContent);
-    ogDescriptionWithExtraFallback =
-      fetch160Characters(fullStoryTextElementContent) ||
-      fetch160Characters(subHeadline) ||
-      get(seo, ["meta-description"]);
-  }
-
   const storyUrl = story.url || `${config["sketches-host"]}/${story.slug}`;
+
   const customSeo = get(data, ["data", "customSeo"], {});
   const authors = get(story, ["authors"], []).map((author) => author.name);
   const title = customSeo.title || seo["meta-title"] || story.headline;
   const pageTitle = customSeo["page-title"] || seo["meta-title"] || story.headline;
-  const description = customSeo.description || seo["meta-description"] || story.summary || descriptionWithExtraFallback;
+  const description = customSeo.description || seo["meta-description"] || story.summary;
   const keywords = (customSeo.keywords || seo["meta-keywords"] || (story.tags || []).map((tag) => tag.name)).join(",");
   const ogUrl = customSeo.ogUrl || get(seo, ["og", "url"]) || storyUrl;
   const getOgTitle =
     customSeo.ogTitle || get(story, ["alternative", "social", "default", "headline"], story.headline) || story.headline;
-  const ogDescription = customSeo.ogDescription || story.summary || ogDescriptionWithExtraFallback;
+  const ogDescription = customSeo.ogDescription || story.summary;
   const canonicalUrl = customSeo.canonicalUrl || story["canonical-url"] || storyUrl;
-
   const storyMetaData = {
     title,
     "page-title": pageTitle,
@@ -158,7 +144,6 @@ function buildCustomTags(customTags = {}, pageType = "") {
 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;
 
@@ -244,17 +229,14 @@ function getSeoData(config, pageType, data, url = {}, seoConfig = {}) {
       );
     case "story-page":
       return (
-        buildTagsFromStory(config, get(data, ["data", "story"]), url, data, seoConfig) ||
+        buildTagsFromStory(config, get(data, ["data", "story"]), url, data) ||
         getSeoData(config, "home-page", data, url)
       );
     case "visual-story":
-      return (
-        buildTagsFromStory(config, get(data, ["story"]), url, data, seoConfig) ||
-        getSeoData(config, "home-page", data, url)
-      );
+      return buildTagsFromStory(config, get(data, ["story"]), url, data) || getSeoData(config, "home-page", data, url);
     case "story-page-amp":
       return (
-        buildTagsFromStory(config, get(data, ["data", "story"]), url, data, seoConfig) ||
+        buildTagsFromStory(config, get(data, ["data", "story"]), url, data) ||
         getSeoData(config, "home-page", data, url)
       );
     case "author-page":
@@ -315,7 +297,6 @@ const SKIP_CANONICAL = "__SKIP__CANONICAL__";
  * @param {boolean} seoConfig.enableOgTags Add og tags for Facebook
  * @param {boolean} seoConfig.enableTwitterCards Add twitter tags
  * @param {boolean} seoConfig.enableNews Add tags for Google News, like news_keywords
- * @param {boolean} seoConfig.enableMetaDescriptionFallback Add extra fallbacks for meta description, og:description and twitter:description
  * @param {Object} seoConfig.customTags Add tags for a custom page type. Usually looks like `{"custom-page": {"title": "value", "canonicalUrl": "value"}}`
  * @param {...*} params See {@link Generator} for other Parameters
  */

package/src/utils.js

@@ -1,6 +1,6 @@
-import { format, utcToZonedTime } from 'date-fns-tz';
-import { entries } from 'lodash';
+import {entries} from 'lodash';
 import { URL, URLSearchParams } from 'url';
+import { format, utcToZonedTime } from 'date-fns-tz';
 
 export function objectToTags(object) {
   return entries(object)
@@ -33,20 +33,3 @@ export function getQueryParams(url) {
 export function isStoryPublic(story) {
   return story.access === undefined || story.access === null || story.access === 'public';
 }
-
-export function getTextOfCards(story) {
-  if (story && story.cards) {
-   return story.cards
-      .map((item) => {
-        return item['story-elements'].reduce((acc, currentItem) => {
-          const elementType = currentItem.subtype || currentItem.type || '';
-          if (elementType === 'text') {
-            acc.push(currentItem.text);
-          }
-          return acc;
-        }, []);
-      })
-      .join(' ')
-      .replace(/(<([^>]+)>)/gi, '');
-  }
-}