Merge pull request #702 from WPMedia/sandbox

Stable release: Sandbox -> Prod

.changeset/fuzzy-shirts-greet.md

@@ -0,0 +1,15 @@
+---
+"@wpmedia/rss-google-news-feature-block": patch
+"@wpmedia/rss-flipboard-feature-block": patch
+"@wpmedia/sitemap-index-feature-block": patch
+"@wpmedia/sitemap-video-feature-block": patch
+"@wpmedia/sitemap-news-feature-block": patch
+"@wpmedia/rss-alexa-feature-block": patch
+"@wpmedia/rss-fbia-feature-block": patch
+"@wpmedia/rss-msn-feature-block": patch
+"@wpmedia/mrss-feature-block": patch
+"@wpmedia/ans-feature-block": patch
+"@wpmedia/rss-feature-block": patch
+---
+
+Add support for a resizerURLs object that can specify a url per environment

.github/workflows/pr-build.yml → .github/workflows/pr-verification.yml

@@ -1,13 +1,13 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Pull request builder
+name: Pull request verification
 
 on:
   push:
-    branches: [prod]
+    branches: [develop, sandbox, prod]
   pull_request:
-    branches: [prod]
+    branches: [develop, sandbox, prod]
 
 jobs:
   build:

blocks/ans-feature-block/features/ans/json.js

@@ -1,11 +1,13 @@
 import Consumer from 'fusion:consumer'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
 
 export function ANSFeed({ globalContent = {}, customFields, arcSite }) {
-  const { resizerURL = '', feedDomainURL = '' } = getProperties(arcSite)
+  let { resizerURL = '' } = getProperties(arcSite)
+  const { feedDomainURL = '', resizerURLs = {} } = getProperties(arcSite)
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
 
   const resizeImage = (img) => {
     if (img && img.url) {

blocks/mrss-feature-block/features/mrss/xml.js

@@ -2,7 +2,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
@@ -99,12 +99,15 @@ const rssTemplate = (
 })
 
 export function Mrss({ globalContent, customFields, arcSite, requestUri }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const requestPath = new URL.URL(requestUri, feedDomainURL).pathname

blocks/rss-alexa-feature-block/features/rss/xml.js

@@ -2,7 +2,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildContent } from '@wpmedia/feeds-content-elements'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
@@ -119,14 +119,16 @@ const rssTemplate = (
 })
 
 export function Rss({ globalContent, customFields, arcSite }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = '',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const rssBuildContent = new BuildContent()
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
 
   // can't return null for xml return type, must return valid xml template
   return rssTemplate(globalContent.content_elements || [], {

blocks/rss-fbia-feature-block/features/rss/xml.js

@@ -3,7 +3,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildContent } from '@wpmedia/feeds-content-elements'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
@@ -167,12 +167,14 @@ const rssTemplate = (
 })
 
 export function FbiaRss({ globalContent, customFields, arcSite, requestUri }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const requestPath = new URL.URL(requestUri, feedDomainURL).pathname

blocks/rss-feature-block/features/rss/xml.js

@@ -6,7 +6,7 @@ import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
 
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import Consumer from 'fusion:consumer'
 import PropTypes from 'fusion:prop-types'
 import getProperties from 'fusion:properties'
@@ -159,12 +159,14 @@ const rssTemplate = (
 })
 
 export function Rss({ globalContent, customFields, arcSite, requestUri }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
 
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}

blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js

@@ -2,7 +2,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildContent } from '@wpmedia/feeds-content-elements'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
@@ -159,12 +159,14 @@ export function FlipboardRss({
   arcSite,
   requestUri,
 }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const requestPath = new URL.URL(requestUri, feedDomainURL).pathname

blocks/rss-google-news-feature-block/features/google-news-rss/xml.js

@@ -2,7 +2,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildContent } from '@wpmedia/feeds-content-elements'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
@@ -159,12 +159,15 @@ export function GoogleNewsRss({
   arcSite,
   requestUri,
 }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
+
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const requestPath = new URL.URL(requestUri, feedDomainURL).pathname

blocks/rss-msn-feature-block/features/msn-rss/xml.js

@@ -2,7 +2,7 @@ import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import moment from 'moment'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildContent } from '@wpmedia/feeds-content-elements'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
@@ -161,12 +161,14 @@ const rssTemplate = (
 })
 
 export function MsnRss({ globalContent, customFields, arcSite, requestUri }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = 'http://localhost.com',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const channelLanguage = customFields.channelLanguage || feedLanguage
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const requestPath = new URL.URL(requestUri, feedDomainURL).pathname

blocks/sitemap-feature-block/features/sitemap/xml.js

@@ -1,7 +1,7 @@
 import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 
@@ -59,7 +59,10 @@ const sitemapTemplate = (
 })
 
 export function Sitemap({ globalContent, customFields, arcSite }) {
-  const { resizerURL = '', feedDomainURL = '' } = getProperties(arcSite)
+  let { resizerURL = '' } = getProperties(arcSite)
+  const { resizerURLs = {}, feedDomainURL = '' } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
+
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
 
   const PromoItems = new BuildPromoItems()

blocks/sitemap-news-feature-block/features/news-sitemap/xml.js

@@ -1,7 +1,7 @@
 import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { BuildPromoItems } from '@wpmedia/feeds-promo-items'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 const jmespath = require('jmespath')
@@ -92,12 +92,14 @@ const sitemapTemplate = (
 })
 
 export function GoogleSitemap({ globalContent, customFields, arcSite }) {
+  let { resizerURL = '' } = getProperties(arcSite)
   const {
-    resizerURL = '',
+    resizerURLs = {},
     feedDomainURL = '',
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
   const newsLanguage = customFields.newsLanguage || feedLanguage
   const newsKeywordsJmespath =

blocks/sitemap-video-feature-block/features/video-sitemap/xml.js

@@ -1,7 +1,7 @@
 import PropTypes from 'fusion:prop-types'
 import Consumer from 'fusion:consumer'
 import getProperties from 'fusion:properties'
-import { resizerKey } from 'fusion:environment'
+import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
 import { generatePropsForFeed } from '@wpmedia/feeds-prop-types'
 import { findVideo } from '@wpmedia/feeds-find-video-stream'
@@ -77,7 +77,9 @@ const sitemapTemplate = (
 })
 
 export function VideoSitemap({ globalContent, customFields, arcSite }) {
-  const { resizerURL = '', feedDomainURL = '' } = getProperties(arcSite)
+  let { resizerURL = '' } = getProperties(arcSite)
+  const { resizerURLs = {}, feedDomainURL = '' } = getProperties(arcSite)
+  resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL
   const { width = 0, height = 0 } = customFields.resizerKVP || {}
 
   // can't return null for xml return type, must return valid xml template