From f872111e7ec6de8da57f19011b734e146d26eb5d Mon Sep 17 00:00:00 2001 From: Alex Cicovic <23142906+acicovic@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:31:12 +0300 Subject: [PATCH] Downgrade api-fetch package to 7.29 --- package-lock.json | 172 +++++++++++++++++- package.json | 2 +- .../common/providers/base-provider.tsx | 7 +- 3 files changed, 169 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89b198a3af..bf691ca330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@types/wordpress__edit-post": "^8.4.2", "@types/wordpress__wordcount": "^2.4.5", "@typescript-eslint/eslint-plugin": "^6.21.0", - "@wordpress/api-fetch": "^7.30.0", + "@wordpress/api-fetch": "7.29", "@wordpress/babel-preset-default": "^7.42.0", "@wordpress/block-editor": "^15.3.0", "@wordpress/blocks": "^15.3.0", @@ -7967,15 +7967,15 @@ } }, "node_modules/@wordpress/api-fetch": { - "version": "7.30.0", - "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", - "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.29.0.tgz", + "integrity": "sha512-5Z3qtbMCqbvpqHufIxI85T3sloCN5c/10BKd9hzdllEpTONhUAWf42jsVyBYsXh2ZHvq0FekQhs2RdE30cLKAA==", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "7.25.7", - "@wordpress/i18n": "^6.3.0", - "@wordpress/url": "^4.30.0" + "@wordpress/i18n": "^6.2.0", + "@wordpress/url": "^4.29.0" }, "engines": { "node": ">=18.12.0", @@ -8121,6 +8121,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/block-editor/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/block-editor/node_modules/@wordpress/keycodes": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.30.0.tgz", @@ -8222,6 +8238,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/block-library/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/block-library/node_modules/@wordpress/keycodes": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.30.0.tgz", @@ -8560,6 +8592,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/core-data/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/core-data/node_modules/@wordpress/undo-manager": { "version": "1.30.0", "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.30.0.tgz", @@ -9152,6 +9200,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/edit-post/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/edit-post/node_modules/@wordpress/keycodes": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.30.0.tgz", @@ -9242,6 +9306,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/editor/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/editor/node_modules/@wordpress/keycodes": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.30.0.tgz", @@ -9702,6 +9782,22 @@ "react": "^18.0.0" } }, + "node_modules/@wordpress/fields/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/fields/node_modules/@wordpress/warning": { "version": "3.30.0", "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.30.0.tgz", @@ -9991,6 +10087,22 @@ "npm": ">=8.19.2" } }, + "node_modules/@wordpress/media-utils/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/notices": { "version": "5.30.0", "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-5.30.0.tgz", @@ -10733,6 +10845,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/server-side-render/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/shortcode": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-4.30.0.tgz", @@ -10872,6 +11000,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/upload-media/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/url": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-4.30.0.tgz", @@ -10947,6 +11091,22 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/widgets/node_modules/@wordpress/api-fetch": { + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-7.30.0.tgz", + "integrity": "sha512-KwI+ENWAd350Y5qd/Ok1bbSplDP4HFf9E/yh8QnRkhtsx4xAmFP5prNkPXktqK00NGPU8rRcTKzMdtrgQ2M/pA==", + "dev": true, + "license": "GPL-2.0-or-later", + "dependencies": { + "@babel/runtime": "7.25.7", + "@wordpress/i18n": "^6.3.0", + "@wordpress/url": "^4.30.0" + }, + "engines": { + "node": ">=18.12.0", + "npm": ">=8.19.2" + } + }, "node_modules/@wordpress/wordcount": { "version": "4.30.0", "resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-4.30.0.tgz", diff --git a/package.json b/package.json index ee0f2e3f28..f74451151c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/wordpress__edit-post": "^8.4.2", "@types/wordpress__wordcount": "^2.4.5", "@typescript-eslint/eslint-plugin": "^6.21.0", - "@wordpress/api-fetch": "^7.30.0", + "@wordpress/api-fetch": "7.29", "@wordpress/babel-preset-default": "^7.42.0", "@wordpress/block-editor": "^15.3.0", "@wordpress/blocks": "^15.3.0", diff --git a/src/content-helper/common/providers/base-provider.tsx b/src/content-helper/common/providers/base-provider.tsx index ac61edb604..fbe10859d6 100644 --- a/src/content-helper/common/providers/base-provider.tsx +++ b/src/content-helper/common/providers/base-provider.tsx @@ -137,21 +137,18 @@ export abstract class BaseProvider { * AbortController signal. * * @since 3.15.0 - * @since 3.20.7 Using APIFetchOptions to avoid a type error when building on GitHub. * * @param {APIFetchOptions} options The options to pass to apiFetch. * @param {string?} id The (optional) ID of the request. * * @return {Promise>} The fetched data. */ - protected async fetch( options: APIFetchOptions, id?: string ): Promise { + protected async fetch( options: APIFetchOptions, id?: string ): Promise { const { abortController, abortId } = this.getOrCreateController( id ); options.signal = abortController.signal; try { - const response = await apiFetch>( - options as APIFetchOptions - ); + const response = await apiFetch>( options ); // Validate API side errors. if ( response.error ) {