Merge pull request #17613 from overleaf/rh-contentful-upgrade

[web] Upgrade Contentful SDK to v10.x

GitOrigin-RevId: 56ec88307d98f7f3cf114e5d1293bc4e35ab9701

package-lock.json

@@ -3522,15 +3522,6 @@
         "w3c-keyname": "^2.2.4"
       }
     },
-    "node_modules/@contentful/axios": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@contentful/axios/-/axios-0.18.0.tgz",
-      "integrity": "sha512-4r4Ww1IJlmRolKgovLTTmdS6CsdvXYVxgXRFwWSh1x36T/0Wg9kTwdaVaApZXcv1DfYyw9RSNdxIGSwTP2/Lag==",
-      "dependencies": {
-        "follow-redirects": "^1.2.5",
-        "is-buffer": "^1.1.5"
-      }
-    },
     "node_modules/@contentful/rich-text-html-renderer": {
       "version": "16.0.2",
       "resolved": "https://registry.npmjs.org/@contentful/rich-text-html-renderer/-/rich-text-html-renderer-16.0.2.tgz",
@@ -17380,44 +17371,70 @@
       }
     },
     "node_modules/contentful": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/contentful/-/contentful-6.1.3.tgz",
-      "integrity": "sha512-uf4MQey/aP/buRo4oCuyIfSD/r+ruxDyXN2z/n0XCi7s2x5NjKiKbbRIjRiYu5ylNiAvc+smLIXBooujtmqWEw==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/contentful/-/contentful-10.8.5.tgz",
+      "integrity": "sha512-aol2LmjRAmuOKQPITZtNasIkRFIECnrcQf2UiXGBZ2ldUpCAjyr533553fuGst2SeHZoKleLyYqFNgHcznDBUw==",
       "dependencies": {
-        "@contentful/axios": "^0.18.0",
-        "contentful-resolve-response": "^1.1.4",
-        "contentful-sdk-core": "^6.0.1",
+        "@contentful/rich-text-types": "^16.0.2",
+        "axios": "^1.6.7",
+        "contentful-resolve-response": "^1.8.1",
+        "contentful-sdk-core": "^8.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.5"
+        "type-fest": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       }
     },
     "node_modules/contentful-resolve-response": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/contentful-resolve-response/-/contentful-resolve-response-1.3.0.tgz",
-      "integrity": "sha512-FFa4it5VXW1YGyim5rhPbnwmN4c8OcmkpLrsylTL2Y1YpoC+6qnZSSU/QZyvHomLdEgwXaSXhGVJkWjpdz5IMg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/contentful-resolve-response/-/contentful-resolve-response-1.8.1.tgz",
+      "integrity": "sha512-VXGK2c8dBIGcRCknqudKmkDr2PzsUYfjLN6hhx71T09UzoXOdA/c0kfDhsf/BBCBWPWcLaUgaJEFU0lCo45TSg==",
       "dependencies": {
-        "fast-copy": "^2.1.0"
+        "fast-copy": "^2.1.7"
       },
       "engines": {
         "node": ">=4.7.2"
       }
     },
     "node_modules/contentful-sdk-core": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.11.0.tgz",
-      "integrity": "sha512-ukKxiiHdCa/izTQbA3/VUPMQB2PZW5D2KYjV9WQVOc8QjmDhu1wpEDkYxYjOrUDgT5tM7xw6umpwlifxoYe9kQ==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-8.1.2.tgz",
+      "integrity": "sha512-XZvX2JMJF4YiICXLrHFv59KBHaQJ6ElqAP8gSNgnCu4x+pPG7Y1bC2JMNOiyAgJuGQGVUOcNZ5PmK+tsNEayYw==",
       "dependencies": {
-        "fast-copy": "^2.1.0",
+        "fast-copy": "^2.1.7",
         "lodash.isplainobject": "^4.0.6",
         "lodash.isstring": "^4.0.1",
         "p-throttle": "^4.1.1",
-        "qs": "^6.9.4"
+        "qs": "^6.11.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      }
+    },
+    "node_modules/contentful-sdk-core/node_modules/qs": {
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz",
+      "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/contentful/node_modules/type-fest": {
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.13.1.tgz",
+      "integrity": "sha512-ASMgM+Vf2cLwDMt1KXSkMUDSYCxtckDJs8zsaVF/mYteIsiARKCVtyXtcK38mIKbLTctZP8v6GMqdNaeI3fo7g==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/convert-source-map": {
@@ -21909,9 +21926,9 @@
       ]
     },
     "node_modules/fast-copy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.1.tgz",
-      "integrity": "sha512-Qod3DdRgFZ8GUIM6ygeoZYpQ0QLW9cf/FS9KhhjlYggcSZXWAemAw8BOCO5LuYCrR3Uj3qXDVTUzOUwG8C7beQ=="
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.7.tgz",
+      "integrity": "sha512-ozrGwyuCTAy7YgFCua8rmqmytECYk/JYAMXcswOcm0qvGoE3tPb7ivBeIHTOK2DiapBhDZgacIhzhQIKU5TCfA=="
     },
     "node_modules/fast-crc32c": {
       "version": "2.0.0",
@@ -25279,11 +25296,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -43606,7 +43618,7 @@
         "celebrate": "^15.0.3",
         "connect-redis": "^6.1.3",
         "content-disposition": "^0.5.0",
-        "contentful": "^6.1.1",
+        "contentful": "^10.8.5",
         "cookie": "^0.2.3",
         "cookie-parser": "1.3.5",
         "core-js": "^3.30.2",
@@ -47409,15 +47421,6 @@
         "w3c-keyname": "^2.2.4"
       }
     },
-    "@contentful/axios": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@contentful/axios/-/axios-0.18.0.tgz",
-      "integrity": "sha512-4r4Ww1IJlmRolKgovLTTmdS6CsdvXYVxgXRFwWSh1x36T/0Wg9kTwdaVaApZXcv1DfYyw9RSNdxIGSwTP2/Lag==",
-      "requires": {
-        "follow-redirects": "^1.2.5",
-        "is-buffer": "^1.1.5"
-      }
-    },
     "@contentful/rich-text-html-renderer": {
       "version": "16.0.2",
       "resolved": "https://registry.npmjs.org/@contentful/rich-text-html-renderer/-/rich-text-html-renderer-16.0.2.tgz",
@@ -52265,7 +52268,7 @@
         "classnames": "^2.2.6",
         "connect-redis": "^6.1.3",
         "content-disposition": "^0.5.0",
-        "contentful": "^6.1.1",
+        "contentful": "^10.8.5",
         "cookie": "^0.2.3",
         "cookie-parser": "1.3.5",
         "copy-webpack-plugin": "^11.0.0",
@@ -60361,35 +60364,53 @@
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "contentful": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/contentful/-/contentful-6.1.3.tgz",
-      "integrity": "sha512-uf4MQey/aP/buRo4oCuyIfSD/r+ruxDyXN2z/n0XCi7s2x5NjKiKbbRIjRiYu5ylNiAvc+smLIXBooujtmqWEw==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/contentful/-/contentful-10.8.5.tgz",
+      "integrity": "sha512-aol2LmjRAmuOKQPITZtNasIkRFIECnrcQf2UiXGBZ2ldUpCAjyr533553fuGst2SeHZoKleLyYqFNgHcznDBUw==",
       "requires": {
-        "@contentful/axios": "^0.18.0",
-        "contentful-resolve-response": "^1.1.4",
-        "contentful-sdk-core": "^6.0.1",
+        "@contentful/rich-text-types": "^16.0.2",
+        "axios": "^1.6.7",
+        "contentful-resolve-response": "^1.8.1",
+        "contentful-sdk-core": "^8.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.5"
+        "type-fest": "^4.0.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "4.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.13.1.tgz",
+          "integrity": "sha512-ASMgM+Vf2cLwDMt1KXSkMUDSYCxtckDJs8zsaVF/mYteIsiARKCVtyXtcK38mIKbLTctZP8v6GMqdNaeI3fo7g=="
+        }
       }
     },
     "contentful-resolve-response": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/contentful-resolve-response/-/contentful-resolve-response-1.3.0.tgz",
-      "integrity": "sha512-FFa4it5VXW1YGyim5rhPbnwmN4c8OcmkpLrsylTL2Y1YpoC+6qnZSSU/QZyvHomLdEgwXaSXhGVJkWjpdz5IMg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/contentful-resolve-response/-/contentful-resolve-response-1.8.1.tgz",
+      "integrity": "sha512-VXGK2c8dBIGcRCknqudKmkDr2PzsUYfjLN6hhx71T09UzoXOdA/c0kfDhsf/BBCBWPWcLaUgaJEFU0lCo45TSg==",
       "requires": {
-        "fast-copy": "^2.1.0"
+        "fast-copy": "^2.1.7"
       }
     },
     "contentful-sdk-core": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.11.0.tgz",
-      "integrity": "sha512-ukKxiiHdCa/izTQbA3/VUPMQB2PZW5D2KYjV9WQVOc8QjmDhu1wpEDkYxYjOrUDgT5tM7xw6umpwlifxoYe9kQ==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-8.1.2.tgz",
+      "integrity": "sha512-XZvX2JMJF4YiICXLrHFv59KBHaQJ6ElqAP8gSNgnCu4x+pPG7Y1bC2JMNOiyAgJuGQGVUOcNZ5PmK+tsNEayYw==",
       "requires": {
-        "fast-copy": "^2.1.0",
+        "fast-copy": "^2.1.7",
         "lodash.isplainobject": "^4.0.6",
         "lodash.isstring": "^4.0.1",
         "p-throttle": "^4.1.1",
-        "qs": "^6.9.4"
+        "qs": "^6.11.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz",
+          "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==",
+          "requires": {
+            "side-channel": "^1.0.6"
+          }
+        }
       }
     },
     "convert-source-map": {
@@ -63773,9 +63794,9 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-copy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.1.tgz",
-      "integrity": "sha512-Qod3DdRgFZ8GUIM6ygeoZYpQ0QLW9cf/FS9KhhjlYggcSZXWAemAw8BOCO5LuYCrR3Uj3qXDVTUzOUwG8C7beQ=="
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.7.tgz",
+      "integrity": "sha512-ozrGwyuCTAy7YgFCua8rmqmytECYk/JYAMXcswOcm0qvGoE3tPb7ivBeIHTOK2DiapBhDZgacIhzhQIKU5TCfA=="
     },
     "fast-crc32c": {
       "version": "git+ssh://git@github.com/overleaf/node-fast-crc32c.git#aae6b2a4c7a7a159395df9cc6c38dfde702d6f51",
@@ -66360,11 +66381,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
     "is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",

services/web/package.json

@@ -96,7 +96,7 @@
     "celebrate": "^15.0.3",
     "connect-redis": "^6.1.3",
     "content-disposition": "^0.5.0",
-    "contentful": "^6.1.1",
+    "contentful": "^10.8.5",
     "cookie": "^0.2.3",
     "cookie-parser": "1.3.5",
     "core-js": "^3.30.2",