@tryghost/content-api 1.11.17 → 1.11.19

package/cjs/content-api.js

@@ -3,7 +3,7 @@
 var axios = require('axios');
 
 var name$1 = "@tryghost/content-api";
-var version = "1.11.17";
+var version = "1.11.19";
 var repository = "https://github.com/TryGhost/SDK/tree/main/packages/content-api";
 var author = "Ghost Foundation";
 var license = "MIT";
@@ -32,13 +32,13 @@ var publishConfig = {
 	access: "public"
 };
 var devDependencies = {
-	"@babel/core": "7.23.0",
+	"@babel/core": "7.23.2",
 	"@babel/polyfill": "7.12.1",
-	"@babel/preset-env": "7.22.20",
-	"@rollup/plugin-json": "6.0.0",
-	c8: "7.13.0",
-	"core-js": "3.32.2",
-	"eslint-plugin-ghost": "2.16.0",
+	"@babel/preset-env": "7.23.2",
+	"@rollup/plugin-json": "6.0.1",
+	c8: "8.0.1",
+	"core-js": "3.33.1",
+	"eslint-plugin-ghost": "3.3.2",
 	mocha: "10.2.0",
 	rollup: "2.79.1",
 	"rollup-plugin-babel": "4.4.0",
@@ -48,12 +48,12 @@ var devDependencies = {
 	"rollup-plugin-replace": "2.2.0",
 	"rollup-plugin-terser": "7.0.2",
 	should: "13.2.3",
-	sinon: "15.0.4"
+	sinon: "17.0.0"
 };
 var dependencies = {
 	axios: "^1.0.0"
 };
-var gitHead = "432b7bde7594264164b08c403d87d1d06659d603";
+var gitHead = "77a1645eadd5ce2c2a747a95405f6d8b15ea4e45";
 var packageInfo = {
 	name: name$1,
 	version: version,

package/es/content-api.js

@@ -1415,7 +1415,7 @@ const defaults = {
 
   transitional: transitionalDefaults,
 
-  adapter: platform.isNode ? 'http' : 'xhr',
+  adapter: ['xhr', 'http'],
 
   transformRequest: [function transformRequest(data, headers) {
     const contentType = headers.getContentType() || '';
@@ -2212,11 +2212,16 @@ var xhrAdapter = isXHRAdapterSupported && function (config) {
       }
     }
 
+    let contentType;
+
     if (utils.isFormData(requestData)) {
       if (platform.isStandardBrowserEnv || platform.isStandardBrowserWebWorkerEnv) {
         requestHeaders.setContentType(false); // Let the browser set it
-      } else {
-        requestHeaders.setContentType('multipart/form-data;', false); // mobile/desktop app frameworks
+      } else if(!requestHeaders.getContentType(/^\s*multipart\/form-data/)){
+        requestHeaders.setContentType('multipart/form-data'); // mobile/desktop app frameworks
+      } else if(utils.isString(contentType = requestHeaders.getContentType())){
+        // fix semicolon duplication issue for ReactNative FormData implementation
+        requestHeaders.setContentType(contentType.replace(/^\s*(multipart\/form-data);+/, '$1'));
       }
     }
 
@@ -2334,8 +2339,8 @@ var xhrAdapter = isXHRAdapterSupported && function (config) {
     // Specifically not if we're in a web worker, or react-native.
     if (platform.isStandardBrowserEnv) {
       // Add xsrf header
-      const xsrfValue = (config.withCredentials || isURLSameOrigin(fullPath))
-        && config.xsrfCookieName && cookies.read(config.xsrfCookieName);
+      // regarding CVE-2023-45857 config.withCredentials condition was removed temporarily
+      const xsrfValue = isURLSameOrigin(fullPath) && config.xsrfCookieName && cookies.read(config.xsrfCookieName);
 
       if (xsrfValue) {
         requestHeaders.set(config.xsrfHeaderName, xsrfValue);
@@ -2409,7 +2414,7 @@ const knownAdapters = {
 };
 
 utils.forEach(knownAdapters, (fn, value) => {
-  if(fn) {
+  if (fn) {
     try {
       Object.defineProperty(fn, 'name', {value});
     } catch (e) {
@@ -2419,6 +2424,10 @@ utils.forEach(knownAdapters, (fn, value) => {
   }
 });
 
+const renderReason = (reason) => `- ${reason}`;
+
+const isResolvedHandle = (adapter) => utils.isFunction(adapter) || adapter === null || adapter === false;
+
 var adapters = {
   getAdapter: (adapters) => {
     adapters = utils.isArray(adapters) ? adapters : [adapters];
@@ -2427,30 +2436,44 @@ var adapters = {
     let nameOrAdapter;
     let adapter;
 
+    const rejectedReasons = {};
+
     for (let i = 0; i < length; i++) {
       nameOrAdapter = adapters[i];
-      if((adapter = utils.isString(nameOrAdapter) ? knownAdapters[nameOrAdapter.toLowerCase()] : nameOrAdapter)) {
+      let id;
+
+      adapter = nameOrAdapter;
+
+      if (!isResolvedHandle(nameOrAdapter)) {
+        adapter = knownAdapters[(id = String(nameOrAdapter)).toLowerCase()];
+
+        if (adapter === undefined) {
+          throw new AxiosError(`Unknown adapter '${id}'`);
+        }
+      }
+
+      if (adapter) {
         break;
       }
+
+      rejectedReasons[id || '#' + i] = adapter;
     }
 
     if (!adapter) {
-      if (adapter === false) {
-        throw new AxiosError(
-          `Adapter ${nameOrAdapter} is not supported by the environment`,
-          'ERR_NOT_SUPPORT'
+
+      const reasons = Object.entries(rejectedReasons)
+        .map(([id, state]) => `adapter ${id} ` +
+          (state === false ? 'is not supported by the environment' : 'is not available in the build')
         );
-      }
 
-      throw new Error(
-        utils.hasOwnProp(knownAdapters, nameOrAdapter) ?
-          `Adapter '${nameOrAdapter}' is not available in the build` :
-          `Unknown adapter '${nameOrAdapter}'`
-      );
-    }
+      let s = length ?
+        (reasons.length > 1 ? 'since :\n' + reasons.map(renderReason).join('\n') : ' ' + renderReason(reasons[0])) :
+        'as no adapter specified';
 
-    if (!utils.isFunction(adapter)) {
-      throw new TypeError('adapter is not a function');
+      throw new AxiosError(
+        `There is no suitable adapter to dispatch the request ` + s,
+        'ERR_NOT_SUPPORT'
+      );
     }
 
     return adapter;
@@ -2632,7 +2655,7 @@ function mergeConfig(config1, config2) {
   return config;
 }
 
-const VERSION = "1.5.0";
+const VERSION = "1.6.0";
 
 const validators$1 = {};
 
@@ -3211,7 +3234,7 @@ axios.default = axios;
 var axios$1 = axios;
 
 var name$1 = "@tryghost/content-api";
-var version = "1.11.17";
+var version = "1.11.19";
 var repository = "https://github.com/TryGhost/SDK/tree/main/packages/content-api";
 var author = "Ghost Foundation";
 var license = "MIT";
@@ -3240,13 +3263,13 @@ var publishConfig = {
 	access: "public"
 };
 var devDependencies = {
-	"@babel/core": "7.23.0",
+	"@babel/core": "7.23.2",
 	"@babel/polyfill": "7.12.1",
-	"@babel/preset-env": "7.22.20",
-	"@rollup/plugin-json": "6.0.0",
-	c8: "7.13.0",
-	"core-js": "3.32.2",
-	"eslint-plugin-ghost": "2.16.0",
+	"@babel/preset-env": "7.23.2",
+	"@rollup/plugin-json": "6.0.1",
+	c8: "8.0.1",
+	"core-js": "3.33.1",
+	"eslint-plugin-ghost": "3.3.2",
 	mocha: "10.2.0",
 	rollup: "2.79.1",
 	"rollup-plugin-babel": "4.4.0",
@@ -3256,12 +3279,12 @@ var devDependencies = {
 	"rollup-plugin-replace": "2.2.0",
 	"rollup-plugin-terser": "7.0.2",
 	should: "13.2.3",
-	sinon: "15.0.4"
+	sinon: "17.0.0"
 };
 var dependencies = {
 	axios: "^1.0.0"
 };
-var gitHead = "432b7bde7594264164b08c403d87d1d06659d603";
+var gitHead = "77a1645eadd5ce2c2a747a95405f6d8b15ea4e45";
 var packageInfo = {
 	name: name$1,
 	version: version,