Merge pull request #697 from WPMedia/prod

Prod backport to dev
WPMedia · Mar 21, 2024 · 3d3369e · 3d3369e
2 parents b8d9bf3 + f47455b
commit 3d3369e
Show file tree

Hide file tree

Showing 84 changed files with 1,111 additions and 783 deletions.
diff --git a/.changeset/forty-pears-laugh.md b/.changeset/forty-pears-laugh.md
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
   plugins: ['standard', 'prettier', 'react'],
   rules: {
     'react/prop-types': 'warn',
+    'object-shorthand': 'off',
   },
   settings: {
     react: {
@@ -12,7 +13,6 @@ module.exports = {
   overrides: [
     {
       files: ['*.test.js', '__mocks__/**'],
-
     },
   ],
   env: {

diff --git a/__mocks__/fusion:content-config.js b/__mocks__/fusion:content-config.js
@@ -23,8 +23,8 @@ module.exports = (options, ...moreSchemas) => {
   const args = !(options instanceof Object)
     ? { schemas: [options].concat(...moreSchemas) }
     : Array.isArray(options)
-    ? { schemas: options.concat(...moreSchemas) }
-    : options
+      ? { schemas: options.concat(...moreSchemas) }
+      : options
 
   return taggablePrimitive(instance, 'contentConfig', args)
 }
diff --git a/__mocks__/fusion:prop-types.js b/__mocks__/fusion:prop-types.js
@@ -47,14 +47,14 @@ function _stringify(value) {
   return Array.isArray(value)
     ? `[${value.map(_stringify).join(',')}]`
     : value instanceof Object
-    ? `{${Object.keys(value)
-        .filter(ignorePropTypeMethods)
-        .filter(exists)
-        .map((key) => {
-          return `"${key}":${_stringify(value[key])}`
-        })
-        .join(',')}}`
-    : JSON.stringify(value)
+      ? `{${Object.keys(value)
+          .filter(ignorePropTypeMethods)
+          .filter(exists)
+          .map((key) => {
+            return `"${key}":${_stringify(value[key])}`
+          })
+          .join(',')}}`
+      : JSON.stringify(value)
 }
 FusionPropTypes.stringify = function stringify(value, replacer, space) {
   const str = _stringify(value)

diff --git a/babel.config.js b/babel.config.js
@@ -1,9 +1,11 @@
 module.exports = {
-  presets: [    [
-    '@babel/preset-env',
-    {
-      targets: { esmodules: false, node: "current" }
-    },
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: { esmodules: false, node: 'current' },
+      },
+    ],
+    '@babel/preset-react',
   ],
-  '@babel/preset-react'],
 }
diff --git a/blocks/ans-feature-block/CHANGELOG.md b/blocks/ans-feature-block/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @wpmedia/ans-feature-block
 
+## 2.0.0
+
+### Major Changes
+
+- [#665](https://github.com/WPMedia/feed-components/pull/665) [`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995) Thanks [@nschubach](https://github.com/nschubach)! - Adds resizer v2 support.
+
+### Patch Changes
+
+- Updated dependencies [[`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995)]:
+  - @wpmedia/feeds-resizer@2.0.0
+
 ## 1.15.0
 
 ### Minor Changes

diff --git a/blocks/ans-feature-block/package.json b/blocks/ans-feature-block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wpmedia/ans-feature-block",
-  "version": "1.15.0",
+  "version": "2.0.0",
   "description": "Fusion components for building ANS feeds",
   "main": "index.js",
   "files": [
@@ -25,6 +25,6 @@
     "build": ""
   },
   "dependencies": {
-    "@wpmedia/feeds-resizer": "^1.0.8 || ^2.0.0"
+    "@wpmedia/feeds-resizer": "^2.0.0"
   }
 }
diff --git a/blocks/feeds-source-collections-block/CHANGELOG.md b/blocks/feeds-source-collections-block/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @wpmedia/feeds-source-collections-block
 
+## 2.0.0
+
+### Major Changes
+
+- [#665](https://github.com/WPMedia/feed-components/pull/665) [`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995) Thanks [@nschubach](https://github.com/nschubach)! - Adds resizer v2 support.
+
+### Patch Changes
+
+- Updated dependencies [[`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995)]:
+  - @wpmedia/feeds-resizer@2.0.0
+
 ## 1.15.0
 
 ### Minor Changes

diff --git a/blocks/feeds-source-collections-block/package.json b/blocks/feeds-source-collections-block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wpmedia/feeds-source-collections-block",
-  "version": "1.15.0",
+  "version": "2.0.0",
   "description": "Content source to search collections by _id or alias",
   "main": "index.js",
   "files": [
@@ -28,7 +28,7 @@
   },
   "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": {

diff --git a/blocks/feeds-source-content-api-block/CHANGELOG.md b/blocks/feeds-source-content-api-block/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @wpmedia/feeds-source-content-api-block
 
+## 2.0.0
+
+### Major Changes
+
+- [#665](https://github.com/WPMedia/feed-components/pull/665) [`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995) Thanks [@nschubach](https://github.com/nschubach)! - Adds resizer v2 support.
+
+### Patch Changes
+
+- Updated dependencies [[`c39ce40`](https://github.com/WPMedia/feed-components/commit/c39ce40bc95a95755bff01b4616a170e69572995)]:
+  - @wpmedia/feeds-resizer@2.0.0
+
 ## 1.15.0
 
 ### Minor Changes

diff --git a/blocks/feeds-source-content-api-block/package.json b/blocks/feeds-source-content-api-block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wpmedia/feeds-source-content-api-block",
-  "version": "1.15.0",
+  "version": "2.0.0",
   "description": "Fusion components for building sitemaps",
   "main": "index.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "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": {

diff --git a/blocks/feeds-source-content-api-block/sources/feeds-content-api.js b/blocks/feeds-source-content-api-block/sources/feeds-content-api.js
@@ -15,7 +15,6 @@ import {
 } from '@wpmedia/feeds-content-source-utils'
 import { signImagesInANSObject, resizerFetch } from '@wpmedia/feeds-resizer'
 
-
 const fetch = (key, { cachedCall }) => {
   const requestUri = `${CONTENT_BASE}/content/v4/search/published`
   const ansFields = [
@@ -218,7 +217,7 @@ const fetch = (key, { cachedCall }) => {
         RESIZER_TOKEN_VERSION,
       )(result)
     })
-    .then(({data, ...rest}) => ({ ...rest, data: transform(data, key), }))
+    .then(({ data, ...rest }) => ({ ...rest, data: transform(data, key) }))
     .then(({ data }) => data)
     .catch((error) => console.log('== error ==', error))