Merge pull request #718 from WPMedia/sandbox

Production Release 2.0.2
WPMedia · Jul 15, 2024 · 3820e3a · 3820e3a
2 parents f5da1c2 + d7f090d
commit 3820e3a
Show file tree

Hide file tree

Showing 34 changed files with 359 additions and 372 deletions.
diff --git a/.changeset/fuzzy-rice-worry.md b/.changeset/fuzzy-rice-worry.md
@@ -0,0 +1,6 @@
+---
+"@wpmedia/rss-alexa-feature-block": patch
+"@wpmedia/feeds-content-elements": patch
+---
+
+Set proper Cheerio version
diff --git a/.changeset/green-eels-add.md b/.changeset/green-eels-add.md
@@ -0,0 +1,26 @@
+---
+"@wpmedia/feeds-source-content-api-by-day2-block": patch
+"@wpmedia/feeds-source-content-api-by-day3-block": patch
+"@wpmedia/feeds-source-content-api-by-day-block": patch
+"@wpmedia/feeds-source-single-content-block": patch
+"@wpmedia/feeds-source-collections-block": patch
+"@wpmedia/feeds-source-content-api-block": patch
+"@wpmedia/rss-google-news-feature-block": patch
+"@wpmedia/sitemap-section-feature-block": patch
+"@wpmedia/feeds-source-video-api-block": patch
+"@wpmedia/rss-flipboard-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/sitemap-feature-block": patch
+"@wpmedia/mrss-feature-block": patch
+"@wpmedia/ans-feature-block": patch
+"@wpmedia/rss-feature-block": patch
+"@wpmedia/feeds-content-elements": patch
+"@wpmedia/feeds-promo-items": patch
+"@wpmedia/feeds-resizer": patch
+---
+
+Pin dependencies
diff --git a/.changeset/popular-buckets-join.md b/.changeset/popular-buckets-join.md
@@ -0,0 +1,5 @@
+---
+"@wpmedia/feeds-resizer": patch
+---
+
+Update size calculation
diff --git a/.changeset/spicy-snails-warn.md b/.changeset/spicy-snails-warn.md
@@ -0,0 +1,5 @@
+---
+"@wpmedia/sitemap-feature-block": patch
+---
+
+Add support for a resizerURLs object that can specify a url per environment
diff --git a/.changeset/two-knives-tan.md b/.changeset/two-knives-tan.md
@@ -0,0 +1,5 @@
+---
+"@wpmedia/ans-feature-block": patch
+---
+
+Added missing custom field
diff --git a/.github/workflows/dd-service-catalog.yml b/.github/workflows/dd-service-catalog.yml
@@ -0,0 +1,53 @@
+---
+name: DataDog Service Catalog
+on:
+  push:
+    branches:
+      - prod
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: DD-service-catalog
+        uses: arcxp/datadog-service-catalog-metadata-provider@v2
+        with:
+          schema-version: v2.1
+          github-token: ${{ secrets.WP_DOT_GITHUB }}
+          datadog-key: ${{ secrets.DATADOG_API_KEY }}
+          datadog-app-key: ${{ secrets.DATADOG_APPLICATION_KEY }}
+          service-name: arc-feed-components
+          team: experience-themes-xp
+          application: Arc Feed Components
+          description: |
+            This is the Arc Feed Components
+          lifecycle: production
+          tier: p0
+          email: [email protected]
+          slack-support-channel: 'https://washpost.enterprise.slack.com/archives/C0169HVBN2C'
+          repo: https://github.com/WPMedia/feed-components
+          tags: |
+            - 'application:Arc Feed Components'
+            - infrastructure:packages
+            - language:nodejs
+            - division:arc
+            - data-sensitivity:high
+            - component:themes
+          links: |
+            - name: Datadog Dashboard
+              url: https://washpost.datadoghq.com/dashboard/b47-w8a-u9c/theme-settings-dashboard?view=spans
+              type: dashboard
+            - name: Themes Jira Project
+              url: https://arcpublishing.atlassian.net/jira/software/c/projects/THEMES/boards/838
+              provider: jira
+              type: dashboard
+            - name: Themes Runbooks
+              url: https://arcpublishing.atlassian.net/wiki/spaces/TI/pages/3303637274/Runbooks
+              type: runbook
+          integrations: |
+            opsgenie:
+              service-url: https://washpost.app.opsgenie.com/teams/dashboard/6c290e84-4b44-4178-8bec-5fb72fac8239/main
+              region: US
diff --git a/blocks/ans-feature-block/features/ans/json.js b/blocks/ans-feature-block/features/ans/json.js
@@ -1,5 +1,6 @@
 import Consumer from 'fusion:consumer'
 import getProperties from 'fusion:properties'
+import PropTypes from 'fusion:prop-types'
 import { resizerKey, ENVIRONMENT } from 'fusion:environment'
 import { buildResizerURL } from '@wpmedia/feeds-resizer'
 
@@ -88,4 +89,14 @@ export function ANSFeed({ globalContent = {}, customFields, arcSite }) {
 
 ANSFeed.label = 'ANS'
 ANSFeed.icon = 'arc-json'
+ANSFeed.propTypes = {
+  customFields: PropTypes.shape({
+    resizerKVP: PropTypes.kvp.tag({
+      label: 'Image height and or width',
+      description: 'Height and width to resize all images to',
+      defaultValue: { width: 0, height: 0 },
+    }),
+  }),
+}
+
 export default Consumer(ANSFeed)
diff --git a/blocks/ans-feature-block/package.json b/blocks/ans-feature-block/package.json
@@ -25,6 +25,6 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-resizer": "^2.0.0"
+    "@wpmedia/feeds-resizer": "2.0.0"
   }
 }
diff --git a/blocks/feeds-source-collections-block/package.json b/blocks/feeds-source-collections-block/package.json
@@ -27,8 +27,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-source-utils": "^1.0.8",
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-content-source-utils": "1.0.8",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7"
   },
   "devDependencies": {

diff --git a/blocks/feeds-source-content-api-block/package.json b/blocks/feeds-source-content-api-block/package.json
@@ -26,8 +26,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-source-utils": "^1.0.8",
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-content-source-utils": "1.0.8",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7"
   },
   "devDependencies": {

diff --git a/blocks/feeds-source-content-api-by-day-block/package.json b/blocks/feeds-source-content-api-by-day-block/package.json
@@ -22,8 +22,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-source-utils": "^1.0.8",
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-content-source-utils": "1.0.8",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7",
     "moment": "^2.29.4"
   },

diff --git a/blocks/feeds-source-content-api-by-day2-block/package.json b/blocks/feeds-source-content-api-by-day2-block/package.json
@@ -22,8 +22,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-source-utils": "^1.0.8",
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-content-source-utils": "1.0.8",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7",
     "moment": "^2.29.4"
   },

diff --git a/blocks/feeds-source-content-api-by-day3-block/package.json b/blocks/feeds-source-content-api-by-day3-block/package.json
@@ -22,8 +22,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-source-utils": "^1.0.8",
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-content-source-utils": "1.0.8",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7",
     "moment": "^2.29.4"
   },

diff --git a/blocks/feeds-source-single-content-block/package.json b/blocks/feeds-source-single-content-block/package.json
@@ -26,7 +26,7 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7"
   },
   "devDependencies": {

diff --git a/blocks/feeds-source-video-api-block/package.json b/blocks/feeds-source-video-api-block/package.json
@@ -22,7 +22,7 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-resizer": "^2.0.0",
+    "@wpmedia/feeds-resizer": "2.0.0",
     "axios": "^1.6.7"
   },
   "devDependencies": {

diff --git a/blocks/mrss-feature-block/package.json b/blocks/mrss-feature-block/package.json
@@ -25,9 +25,9 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-promo-items": "^2.0.0",
-    "@wpmedia/feeds-prop-types": "^2.0.0",
-    "@wpmedia/feeds-resizer": "^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"
   }

diff --git a/blocks/rss-alexa-feature-block/package.json b/blocks/rss-alexa-feature-block/package.json
@@ -26,9 +26,9 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-content-elements": "^2.0.0",
-    "@wpmedia/feeds-prop-types": "^2.0.0",
-    "@wpmedia/feeds-resizer": "^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"

diff --git a/blocks/rss-fbia-feature-block/package.json b/blocks/rss-fbia-feature-block/package.json
@@ -27,10 +27,10 @@
     "build": ""
   },
   "dependencies": {
-    "@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",
+    "@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"

diff --git a/blocks/rss-feature-block/package.json b/blocks/rss-feature-block/package.json
@@ -26,10 +26,10 @@
     "build": ""
   },
   "dependencies": {
-    "@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",
+    "@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"
   }

diff --git a/blocks/rss-flipboard-feature-block/package.json b/blocks/rss-flipboard-feature-block/package.json
@@ -25,10 +25,10 @@
     "build": ""
   },
   "dependencies": {
-    "@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",
+    "@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"
   }

diff --git a/blocks/rss-google-news-feature-block/package.json b/blocks/rss-google-news-feature-block/package.json
@@ -26,10 +26,10 @@
     "build": ""
   },
   "dependencies": {
-    "@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",
+    "@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"
   }

diff --git a/blocks/rss-msn-feature-block/package.json b/blocks/rss-msn-feature-block/package.json
@@ -26,10 +26,10 @@
     "build": ""
   },
   "dependencies": {
-    "@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",
+    "@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"
   }

diff --git a/blocks/sitemap-feature-block/README.md b/blocks/sitemap-feature-block/README.md
@@ -1,6 +1,6 @@
 # Sitemap
 
-Sitemaps provide search engines with metadata regarding the specific news content on a website. Using the Sitemap, bots can quickly find the news articles contained on a site
+Sitemaps provide search engines with metadata regarding the specific news content on a website. Using the Sitemap, bots can quickly find the news articles contained on a site.
 These Sitemaps identify the url and publication date of every article.
 
 ## Custom Fields

diff --git a/blocks/sitemap-feature-block/package.json b/blocks/sitemap-feature-block/package.json
@@ -25,7 +25,7 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-promo-items": "^2.0.0",
-    "@wpmedia/feeds-prop-types": "^2.0.0"
+    "@wpmedia/feeds-promo-items": "2.0.0",
+    "@wpmedia/feeds-prop-types": "2.0.0"
   }
 }
diff --git a/blocks/sitemap-news-feature-block/package.json b/blocks/sitemap-news-feature-block/package.json
@@ -26,8 +26,8 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-promo-items": "^2.0.0",
-    "@wpmedia/feeds-prop-types": "^2.0.0",
+    "@wpmedia/feeds-promo-items": "2.0.0",
+    "@wpmedia/feeds-prop-types": "2.0.0",
     "jmespath": "^0.15.0"
   }
 }
diff --git a/blocks/sitemap-section-feature-block/package.json b/blocks/sitemap-section-feature-block/package.json
@@ -25,6 +25,6 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-prop-types": "^2.0.0"
+    "@wpmedia/feeds-prop-types": "2.0.0"
   }
 }
diff --git a/blocks/sitemap-video-feature-block/package.json b/blocks/sitemap-video-feature-block/package.json
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "jmespath": "^0.15.0",
-    "@wpmedia/feeds-find-video-stream": "^1.0.8",
-    "@wpmedia/feeds-prop-types": "^2.0.0",
-    "@wpmedia/feeds-resizer": "^2.0.0"
+    "@wpmedia/feeds-find-video-stream": "1.0.8",
+    "@wpmedia/feeds-prop-types": "2.0.0",
+    "@wpmedia/feeds-resizer": "2.0.0"
   }
 }