From c2016d955ebdab44dfe21d150ce1739a917a0ccc Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Thu, 21 Mar 2024 14:19:55 -0400 Subject: [PATCH 1/4] chore: make the pull request lint and tests run against all PRs --- .github/workflows/{pr-build.yml => pr-verification.yml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{pr-build.yml => pr-verification.yml} (87%) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-verification.yml similarity index 87% rename from .github/workflows/pr-build.yml rename to .github/workflows/pr-verification.yml index 15f0a29f..5a4077b3 100644 --- a/.github/workflows/pr-build.yml +++ b/.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: From a7a006805db8d4d51c5ed69ee0d88263ba7180a3 Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Fri, 22 Mar 2024 16:15:23 -0400 Subject: [PATCH 2/4] feat: try for a resizerURLs object from site properties to find the environment key for per site resizer urls --- blocks/ans-feature-block/features/ans/json.js | 6 ++++-- blocks/mrss-feature-block/features/mrss/xml.js | 9 +++++++-- blocks/rss-alexa-feature-block/features/rss/xml.js | 6 ++++-- blocks/rss-fbia-feature-block/features/rss/xml.js | 6 ++++-- blocks/rss-feature-block/features/rss/xml.js | 6 ++++-- .../features/rss-flipboard/xml.js | 6 ++++-- .../features/google-news-rss/xml.js | 7 +++++-- blocks/rss-msn-feature-block/features/msn-rss/xml.js | 6 ++++-- blocks/sitemap-feature-block/features/sitemap/xml.js | 8 ++++++-- .../features/news-sitemap/xml.js | 6 ++++-- .../features/video-sitemap/xml.js | 6 ++++-- 11 files changed, 50 insertions(+), 22 deletions(-) diff --git a/blocks/ans-feature-block/features/ans/json.js b/blocks/ans-feature-block/features/ans/json.js index b5d03656..8e5985cd 100644 --- a/blocks/ans-feature-block/features/ans/json.js +++ b/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) { diff --git a/blocks/mrss-feature-block/features/mrss/xml.js b/blocks/mrss-feature-block/features/mrss/xml.js index 0f1bee50..d514e802 100644 --- a/blocks/mrss-feature-block/features/mrss/xml.js +++ b/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,17 @@ const rssTemplate = ( }) export function Mrss({ globalContent, customFields, arcSite, requestUri }) { - const { + let { resizerURL = '', + } = getProperties(arcSite) + const { + 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 diff --git a/blocks/rss-alexa-feature-block/features/rss/xml.js b/blocks/rss-alexa-feature-block/features/rss/xml.js index 1aa89296..7b8a742a 100644 --- a/blocks/rss-alexa-feature-block/features/rss/xml.js +++ b/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 || [], { diff --git a/blocks/rss-fbia-feature-block/features/rss/xml.js b/blocks/rss-fbia-feature-block/features/rss/xml.js index 7bd5b32b..b6767d32 100644 --- a/blocks/rss-fbia-feature-block/features/rss/xml.js +++ b/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 diff --git a/blocks/rss-feature-block/features/rss/xml.js b/blocks/rss-feature-block/features/rss/xml.js index 49ece922..d4aca83a 100644 --- a/blocks/rss-feature-block/features/rss/xml.js +++ b/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 || {} diff --git a/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js b/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js index 63ea6a42..f0b89cef 100644 --- a/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js +++ b/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 diff --git a/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js b/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js index 9837056b..289ac1c0 100644 --- a/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js +++ b/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 diff --git a/blocks/rss-msn-feature-block/features/msn-rss/xml.js b/blocks/rss-msn-feature-block/features/msn-rss/xml.js index 423d6530..ed850c41 100644 --- a/blocks/rss-msn-feature-block/features/msn-rss/xml.js +++ b/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 diff --git a/blocks/sitemap-feature-block/features/sitemap/xml.js b/blocks/sitemap-feature-block/features/sitemap/xml.js index 40758106..3efd6709 100644 --- a/blocks/sitemap-feature-block/features/sitemap/xml.js +++ b/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,11 @@ 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() diff --git a/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js b/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js index 2a00bb53..e1fca59f 100644 --- a/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js +++ b/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 = diff --git a/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js b/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js index 4fccaf8e..9b4f1b99 100644 --- a/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js +++ b/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 From 136fe5b47874239a900a0c0cf0980306cedce205 Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Fri, 22 Mar 2024 16:23:05 -0400 Subject: [PATCH 3/4] lint: run prettier for ci fail --- blocks/ans-feature-block/features/ans/json.js | 4 ++-- blocks/mrss-feature-block/features/mrss/xml.js | 6 ++---- blocks/rss-alexa-feature-block/features/rss/xml.js | 2 +- blocks/rss-fbia-feature-block/features/rss/xml.js | 2 +- blocks/rss-feature-block/features/rss/xml.js | 2 +- .../features/rss-flipboard/xml.js | 2 +- .../features/google-news-rss/xml.js | 2 +- blocks/rss-msn-feature-block/features/msn-rss/xml.js | 2 +- blocks/sitemap-feature-block/features/sitemap/xml.js | 3 +-- .../sitemap-news-feature-block/features/news-sitemap/xml.js | 2 +- .../features/video-sitemap/xml.js | 2 +- 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/blocks/ans-feature-block/features/ans/json.js b/blocks/ans-feature-block/features/ans/json.js index 8e5985cd..d6e4a0fe 100644 --- a/blocks/ans-feature-block/features/ans/json.js +++ b/blocks/ans-feature-block/features/ans/json.js @@ -5,9 +5,9 @@ import { buildResizerURL } from '@wpmedia/feeds-resizer' export function ANSFeed({ globalContent = {}, customFields, arcSite }) { let { resizerURL = '' } = getProperties(arcSite) - const { feedDomainURL = '', resizerURLs = {}, } = getProperties(arcSite) + const { feedDomainURL = '', resizerURLs = {} } = getProperties(arcSite) const { width = 0, height = 0 } = customFields.resizerKVP || {} - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const resizeImage = (img) => { if (img && img.url) { diff --git a/blocks/mrss-feature-block/features/mrss/xml.js b/blocks/mrss-feature-block/features/mrss/xml.js index d514e802..b202d03a 100644 --- a/blocks/mrss-feature-block/features/mrss/xml.js +++ b/blocks/mrss-feature-block/features/mrss/xml.js @@ -99,9 +99,7 @@ const rssTemplate = ( }) export function Mrss({ globalContent, customFields, arcSite, requestUri }) { - let { - resizerURL = '', - } = getProperties(arcSite) + let { resizerURL = '' } = getProperties(arcSite) const { resizerURLs = {}, feedDomainURL = 'http://localhost.com', @@ -109,7 +107,7 @@ export function Mrss({ globalContent, customFields, arcSite, requestUri }) { feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} const requestPath = new URL.URL(requestUri, feedDomainURL).pathname diff --git a/blocks/rss-alexa-feature-block/features/rss/xml.js b/blocks/rss-alexa-feature-block/features/rss/xml.js index 7b8a742a..95ba01c2 100644 --- a/blocks/rss-alexa-feature-block/features/rss/xml.js +++ b/blocks/rss-alexa-feature-block/features/rss/xml.js @@ -128,7 +128,7 @@ export function Rss({ globalContent, customFields, arcSite }) { } = getProperties(arcSite) const channelLanguage = customFields.channelLanguage || feedLanguage const rssBuildContent = new BuildContent() - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL // can't return null for xml return type, must return valid xml template return rssTemplate(globalContent.content_elements || [], { diff --git a/blocks/rss-fbia-feature-block/features/rss/xml.js b/blocks/rss-fbia-feature-block/features/rss/xml.js index b6767d32..571ade80 100644 --- a/blocks/rss-fbia-feature-block/features/rss/xml.js +++ b/blocks/rss-fbia-feature-block/features/rss/xml.js @@ -174,7 +174,7 @@ export function FbiaRss({ globalContent, customFields, arcSite, requestUri }) { feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} const requestPath = new URL.URL(requestUri, feedDomainURL).pathname diff --git a/blocks/rss-feature-block/features/rss/xml.js b/blocks/rss-feature-block/features/rss/xml.js index d4aca83a..8cfd8d7d 100644 --- a/blocks/rss-feature-block/features/rss/xml.js +++ b/blocks/rss-feature-block/features/rss/xml.js @@ -166,7 +166,7 @@ export function Rss({ globalContent, customFields, arcSite, requestUri }) { feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} diff --git a/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js b/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js index f0b89cef..b3bb38eb 100644 --- a/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js +++ b/blocks/rss-flipboard-feature-block/features/rss-flipboard/xml.js @@ -166,7 +166,7 @@ export function FlipboardRss({ feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} const requestPath = new URL.URL(requestUri, feedDomainURL).pathname diff --git a/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js b/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js index 289ac1c0..d3d98071 100644 --- a/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js +++ b/blocks/rss-google-news-feature-block/features/google-news-rss/xml.js @@ -166,7 +166,7 @@ export function GoogleNewsRss({ feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} diff --git a/blocks/rss-msn-feature-block/features/msn-rss/xml.js b/blocks/rss-msn-feature-block/features/msn-rss/xml.js index ed850c41..b67f27b5 100644 --- a/blocks/rss-msn-feature-block/features/msn-rss/xml.js +++ b/blocks/rss-msn-feature-block/features/msn-rss/xml.js @@ -168,7 +168,7 @@ export function MsnRss({ globalContent, customFields, arcSite, requestUri }) { feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const channelLanguage = customFields.channelLanguage || feedLanguage const { width = 0, height = 0 } = customFields.resizerKVP || {} const requestPath = new URL.URL(requestUri, feedDomainURL).pathname diff --git a/blocks/sitemap-feature-block/features/sitemap/xml.js b/blocks/sitemap-feature-block/features/sitemap/xml.js index 3efd6709..07e13cf5 100644 --- a/blocks/sitemap-feature-block/features/sitemap/xml.js +++ b/blocks/sitemap-feature-block/features/sitemap/xml.js @@ -61,8 +61,7 @@ const sitemapTemplate = ( export function Sitemap({ globalContent, customFields, arcSite }) { let { resizerURL = '' } = getProperties(arcSite) const { resizerURLs = {}, feedDomainURL = '' } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; - + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const { width = 0, height = 0 } = customFields.resizerKVP || {} diff --git a/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js b/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js index e1fca59f..6625bdc0 100644 --- a/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js +++ b/blocks/sitemap-news-feature-block/features/news-sitemap/xml.js @@ -99,7 +99,7 @@ export function GoogleSitemap({ globalContent, customFields, arcSite }) { feedTitle = '', feedLanguage = '', } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const { width = 0, height = 0 } = customFields.resizerKVP || {} const newsLanguage = customFields.newsLanguage || feedLanguage const newsKeywordsJmespath = diff --git a/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js b/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js index 9b4f1b99..cd08bf6d 100644 --- a/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js +++ b/blocks/sitemap-video-feature-block/features/video-sitemap/xml.js @@ -79,7 +79,7 @@ const sitemapTemplate = ( export function VideoSitemap({ globalContent, customFields, arcSite }) { let { resizerURL = '' } = getProperties(arcSite) const { resizerURLs = {}, feedDomainURL = '' } = getProperties(arcSite) - resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL; + resizerURL = resizerURLs?.[ENVIRONMENT] || resizerURL const { width = 0, height = 0 } = customFields.resizerKVP || {} // can't return null for xml return type, must return valid xml template From 24e05ef845b678e208b9a74a636eb11252ec288b Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Fri, 29 Mar 2024 10:54:51 -0400 Subject: [PATCH 4/4] chore: add changeset for resizerURLs patch --- .changeset/fuzzy-shirts-greet.md | 15 ++++ package-lock.json | 140 +++++++++++++++---------------- 2 files changed, 85 insertions(+), 70 deletions(-) create mode 100644 .changeset/fuzzy-shirts-greet.md diff --git a/.changeset/fuzzy-shirts-greet.md b/.changeset/fuzzy-shirts-greet.md new file mode 100644 index 00000000..8b6e284f --- /dev/null +++ b/.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 diff --git a/package-lock.json b/package-lock.json index 284358f2..5d2e255b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,19 +43,19 @@ }, "blocks/ans-feature-block": { "name": "@wpmedia/ans-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0" + "@wpmedia/feeds-resizer": "^2.0.0" } }, "blocks/feeds-source-collections-block": { "name": "@wpmedia/feeds-source-collections-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-content-source-utils": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7" }, "devDependencies": { @@ -64,11 +64,11 @@ }, "blocks/feeds-source-content-api-block": { "name": "@wpmedia/feeds-source-content-api-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-content-source-utils": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7" }, "devDependencies": { @@ -77,11 +77,11 @@ }, "blocks/feeds-source-content-api-by-day-block": { "name": "@wpmedia/feeds-source-content-api-by-day-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-content-source-utils": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7", "moment": "^2.29.4" }, @@ -91,11 +91,11 @@ }, "blocks/feeds-source-content-api-by-day2-block": { "name": "@wpmedia/feeds-source-content-api-by-day2-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-content-source-utils": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7", "moment": "^2.29.4" }, @@ -105,11 +105,11 @@ }, "blocks/feeds-source-content-api-by-day3-block": { "name": "@wpmedia/feeds-source-content-api-by-day3-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-content-source-utils": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7", "moment": "^2.29.4" }, @@ -119,10 +119,10 @@ }, "blocks/feeds-source-single-content-block": { "name": "@wpmedia/feeds-source-single-content-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7" }, "devDependencies": { @@ -131,10 +131,10 @@ }, "blocks/feeds-source-video-api-block": { "name": "@wpmedia/feeds-source-video-api-block", - "version": "1.8.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "axios": "^1.6.7" }, "devDependencies": { @@ -148,24 +148,24 @@ }, "blocks/mrss-feature-block": { "name": "@wpmedia/mrss-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4" } }, "blocks/rss-alexa-feature-block": { "name": "@wpmedia/rss-alexa-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "cheerio": "1.0.0-rc.10", "jmespath": "^0.15.0", "moment": "^2.29.4" @@ -302,13 +302,13 @@ }, "blocks/rss-fbia-feature-block": { "name": "@wpmedia/rss-fbia-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4", "xmlbuilder2": "2.1.7" @@ -342,68 +342,68 @@ }, "blocks/rss-feature-block": { "name": "@wpmedia/rss-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4" } }, "blocks/rss-flipboard-feature-block": { "name": "@wpmedia/rss-flipboard-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4" } }, "blocks/rss-google-news-feature-block": { "name": "@wpmedia/rss-google-news-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4" } }, "blocks/rss-msn-feature-block": { "name": "@wpmedia/rss-msn-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-content-elements": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.10 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-content-elements": "^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0", "moment": "^2.29.4" } }, "blocks/sitemap-feature-block": { "name": "@wpmedia/sitemap-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.8 || ^2.0.0" + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0" } }, "blocks/sitemap-index-by-day-feature-block": { "name": "@wpmedia/sitemap-index-by-day-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "moment": "^2.29.4" @@ -414,7 +414,7 @@ }, "blocks/sitemap-index-feature-block": { "name": "@wpmedia/sitemap-index-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "jmespath": "^0.15.0" @@ -425,35 +425,35 @@ }, "blocks/sitemap-news-feature-block": { "name": "@wpmedia/sitemap-news-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-promo-items": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-prop-types": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-promo-items": "^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", "jmespath": "^0.15.0" } }, "blocks/sitemap-section-feature-block": { "name": "@wpmedia/sitemap-section-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { - "@wpmedia/feeds-prop-types": "^1.0.8 || ^2.0.0" + "@wpmedia/feeds-prop-types": "^2.0.0" } }, "blocks/sitemap-section-index-feature-block": { "name": "@wpmedia/sitemap-section-index-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0" }, "blocks/sitemap-video-feature-block": { "name": "@wpmedia/sitemap-video-feature-block", - "version": "1.15.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-find-video-stream": "^1.0.8", - "@wpmedia/feeds-prop-types": "^1.0.8 || ^2.0.0", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-prop-types": "^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0" } }, @@ -22048,11 +22048,11 @@ }, "utils/content-elements": { "name": "@wpmedia/feeds-content-elements", - "version": "1.0.10", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-find-video-stream": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "cheerio": "1.0.0-rc.10", "he": "^1.2.0", "jmespath": "^0.15.0", @@ -22312,11 +22312,11 @@ }, "utils/promo-items": { "name": "@wpmedia/feeds-promo-items", - "version": "1.0.8", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "@wpmedia/feeds-find-video-stream": "^1.0.8", - "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0", + "@wpmedia/feeds-resizer": "^2.0.0", "jmespath": "^0.15.0" }, "devDependencies": { @@ -22325,7 +22325,7 @@ }, "utils/prop-types": { "name": "@wpmedia/feeds-prop-types", - "version": "1.0.10", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "devDependencies": { "prop-types": "^15.7.2", @@ -22334,7 +22334,7 @@ }, "utils/resizer": { "name": "@wpmedia/feeds-resizer", - "version": "1.0.8", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "axios": "^1.6.7", @@ -22346,7 +22346,7 @@ }, "utils/xml-output": { "name": "@wpmedia/feeds-xml-output", - "version": "1.1.0", + "version": "2.0.0", "license": "CC-BY-NC-ND-4.0", "dependencies": { "xmlbuilder2": "2.1.2"