@atlaskit/media-client 35.3.1 → 35.3.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/media-client
 
+## 35.3.3
+
+### Patch Changes
+
+- [`f03a6554f340c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f03a6554f340c) -
+  Fixed the resolution of path based routing in SSR
+
+## 35.3.2
+
+### Patch Changes
+
+- [`b87ad4064e4f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b87ad4064e4f8) -
+  Added path based routing support to media client behind a feature flag and added retry logic for
+  serverUnexpectedError for Edge due to hot
+
 ## 35.3.1
 
 ### Patch Changes

package/dist/cjs/client/media-store/MediaStore.js

@@ -17,6 +17,8 @@ var _request3 = require("../../utils/request");
 var _helpers = require("../../utils/request/helpers");
 var _mediaCdn = require("../../utils/mediaCdn");
 var _resolveAuth = require("./resolveAuth");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _pathBasedUrl = require("../../utils/pathBasedUrl");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MEDIA_API_REGION = 'media-api-region';
@@ -409,6 +411,9 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
+      if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+        return (0, _pathBasedUrl.mapToPathBasedUrl)((0, _helpers.createUrl)("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options));
+      }
       return (0, _mediaCdn.mapToMediaCdnUrl)((0, _helpers.createUrl)("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options), auth.token);
     }
   }, {
@@ -926,7 +931,10 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
               if (useMediaCdn) {
                 url = (0, _mediaCdn.mapToMediaCdnUrl)(url, auth.token);
               }
-              _context16.next = 19;
+              if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+                url = (0, _pathBasedUrl.mapToPathBasedUrl)(url);
+              }
+              _context16.next = 20;
               return (0, _request3.request)(url, {
                 method: method,
                 endpoint: endpoint,
@@ -937,12 +945,12 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 clientOptions: clientOptions,
                 traceContext: extendedTraceContext
               }, controller);
-            case 19:
+            case 20:
               response = _context16.sent;
               setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
               setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
               return _context16.abrupt("return", response);
-            case 23:
+            case 24:
             case "end":
               return _context16.stop();
           }

package/dist/cjs/utils/getDocument.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = function _default() {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.document === 'undefined') {
+    return;
+  }
+  return window.document;
+};

package/dist/cjs/utils/getNavigator.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = function _default() {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.navigator === 'undefined') {
+    return;
+  }
+  return window.navigator;
+};

package/dist/cjs/utils/mediaCdn.js

@@ -19,8 +19,7 @@ var MEDIA_CDN_MAP = exports.MEDIA_CDN_MAP = {
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 var MEDIA_TOKEN_LENGTH_LIMIT = 7000;
 function isCDNEnabled() {
-  var isIsolatedCloudWithDisabledCDN = (0, _platformFeatureFlags.fg)('platform_disable_isolated_cloud_media_cdn_delivery') && (0, _atlassianContext.isIsolatedCloud)();
-  return (0, _isCommercial.isCommercial)() && !isIsolatedCloudWithDisabledCDN && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery');
+  return (0, _isCommercial.isCommercial)() && !(0, _atlassianContext.isIsolatedCloud)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery') && !(0, _platformFeatureFlags.fg)('platform_media_path_based_route');
 }
 function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/cjs/utils/pathBasedUrl.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapRetryUrlToPathBasedUrl = mapRetryUrlToPathBasedUrl;
+exports.mapToPathBasedUrl = mapToPathBasedUrl;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _getDocument3 = _interopRequireDefault(require("./getDocument"));
+function getRelativeUrl(absoluteUrl) {
+  var url = new URL(absoluteUrl);
+  return "".concat(url.pathname).concat(url.search).concat(url.hash);
+}
+function mapToPathBasedUrl(url) {
+  if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+    var _getDocument;
+    var parsedUrl = new URL(url);
+    parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+    var location = (_getDocument = (0, _getDocument3.default)()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+
+    // in this case we are most likely in SSR / a non browser environment so just return a relative URL
+    if (!location) {
+      return getRelativeUrl(url);
+    }
+    parsedUrl.host = location.host;
+    return parsedUrl.toString();
+  }
+  return url;
+}
+function mapRetryUrlToPathBasedUrl(url) {
+  var _getDocument$location, _getDocument2;
+  var parsedUrl = new URL(url);
+  parsedUrl.host = (_getDocument$location = (_getDocument2 = (0, _getDocument3.default)()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+
+  // remove CDN from the URL for retry if it exists
+  var pathname = parsedUrl.pathname;
+  if (pathname.endsWith('/cdn')) {
+    parsedUrl.pathname = pathname.replace('/cdn', '');
+  }
+  parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+  return parsedUrl;
+}

package/dist/cjs/utils/request/index.js

@@ -30,9 +30,15 @@ Object.defineProperty(exports, "isRequestError", {
 });
 exports.request = request;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _errors = require("./errors");
 var _helpers = require("./helpers");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _pathBasedUrl = require("../pathBasedUrl");
+var _getNavigator3 = _interopRequireDefault(require("../getNavigator"));
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function request(_x) {
   return _request.apply(this, arguments);
 }
@@ -53,6 +59,9 @@ function _request() {
       retryOptions,
       metadata,
       doFetch,
+      shouldRetryError,
+      _getNavigator2,
+      doFetchWithPathBasedUrl,
       _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -76,12 +85,51 @@ function _request() {
               signal: controller && controller.signal
             }).then((0, _helpers.createProcessFetchResponse)(metadata));
           };
+          if (!(0, _platformFeatureFlags.fg)('platform_media_retry_edge_error')) {
+            _context.next = 20;
+            break;
+          }
+          shouldRetryError = function shouldRetryError(err) {
+            var _getNavigator;
+            if ((0, _helpers.isFetchNetworkError)(err) && (_getNavigator = (0, _getNavigator3.default)()) !== null && _getNavigator !== void 0 && _getNavigator.userAgent.includes('Edg/')) {
+              return false;
+            }
+            return (0, _helpers.defaultShouldRetryError)(err);
+          };
+          _context.prev = 8;
+          _context.next = 11;
+          return (0, _helpers.fetchRetry)(doFetch, metadata, _objectSpread(_objectSpread({}, retryOptions), {}, {
+            shouldRetryError: shouldRetryError
+          }));
+        case 11:
+          return _context.abrupt("return", _context.sent);
+        case 14:
+          _context.prev = 14;
+          _context.t0 = _context["catch"](8);
+          if (!((0, _helpers.isFetchNetworkError)(_context.t0) && (_getNavigator2 = (0, _getNavigator3.default)()) !== null && _getNavigator2 !== void 0 && _getNavigator2.userAgent.includes('Edg/'))) {
+            _context.next = 19;
+            break;
+          }
+          doFetchWithPathBasedUrl = function doFetchWithPathBasedUrl() {
+            return fetch((0, _helpers.createUrl)((0, _pathBasedUrl.mapRetryUrlToPathBasedUrl)(url).toString(), {
+              params: params
+            }), {
+              method: method,
+              body: body,
+              headers: (0, _helpers.extendHeaders)(headers, auth, traceContext),
+              signal: controller && controller.signal
+            }).then((0, _helpers.createProcessFetchResponse)(metadata));
+          };
+          return _context.abrupt("return", (0, _helpers.fetchRetry)(doFetchWithPathBasedUrl, metadata, retryOptions));
+        case 19:
+          throw _context.t0;
+        case 20:
           return _context.abrupt("return", (0, _helpers.fetchRetry)(doFetch, metadata, retryOptions));
-        case 7:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[8, 14]]);
   }));
   return _request.apply(this, arguments);
 }

package/dist/es2019/client/media-store/MediaStore.js

@@ -7,6 +7,8 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultSho
 import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { mapToPathBasedUrl } from '../../utils/pathBasedUrl';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const extendImageParams = (params, fetchMaxRes = false) => {
@@ -266,6 +268,9 @@ export class MediaStore {
       auth
     };
     const imageEndpoint = cdnFeatureFlag('image');
+    if (fg('platform_media_path_based_route')) {
+      return mapToPathBasedUrl(createUrl(`${auth.baseUrl}/file/${id}/${imageEndpoint}`, options));
+    }
     return mapToMediaCdnUrl(createUrl(`${auth.baseUrl}/file/${id}/${imageEndpoint}`, options), auth.token);
   }
   async getFileBinary(id, collectionName, abortController, maxAge = FILE_CACHE_MAX_AGE) {
@@ -561,6 +566,9 @@ export class MediaStore {
     if (useMediaCdn) {
       url = mapToMediaCdnUrl(url, auth.token);
     }
+    if (fg('platform_media_path_based_route')) {
+      url = mapToPathBasedUrl(url);
+    }
     const response = await request(url, {
       method,
       endpoint,

package/dist/es2019/utils/getDocument.js

@@ -0,0 +1,9 @@
+export default (() => {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.document === 'undefined') {
+    return;
+  }
+  return window.document;
+});

package/dist/es2019/utils/getNavigator.js

@@ -0,0 +1,9 @@
+export default (() => {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.navigator === 'undefined') {
+    return;
+  }
+  return window.navigator;
+});

package/dist/es2019/utils/mediaCdn.js

@@ -11,8 +11,7 @@ export const MEDIA_CDN_MAP = {
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 const MEDIA_TOKEN_LENGTH_LIMIT = 7000;
 export function isCDNEnabled() {
-  const isIsolatedCloudWithDisabledCDN = fg('platform_disable_isolated_cloud_media_cdn_delivery') && isIsolatedCloud();
-  return isCommercial() && !isIsolatedCloudWithDisabledCDN && fg('platform_media_cdn_delivery');
+  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !fg('platform_media_path_based_route');
 }
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/es2019/utils/pathBasedUrl.js

@@ -0,0 +1,35 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import getDocument from './getDocument';
+function getRelativeUrl(absoluteUrl) {
+  const url = new URL(absoluteUrl);
+  return `${url.pathname}${url.search}${url.hash}`;
+}
+export function mapToPathBasedUrl(url) {
+  if (fg('platform_media_path_based_route')) {
+    var _getDocument;
+    const parsedUrl = new URL(url);
+    parsedUrl.pathname = `/media-api${parsedUrl.pathname}`;
+    const location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+
+    // in this case we are most likely in SSR / a non browser environment so just return a relative URL
+    if (!location) {
+      return getRelativeUrl(url);
+    }
+    parsedUrl.host = location.host;
+    return parsedUrl.toString();
+  }
+  return url;
+}
+export function mapRetryUrlToPathBasedUrl(url) {
+  var _getDocument$location, _getDocument2;
+  const parsedUrl = new URL(url);
+  parsedUrl.host = (_getDocument$location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+
+  // remove CDN from the URL for retry if it exists
+  const pathname = parsedUrl.pathname;
+  if (pathname.endsWith('/cdn')) {
+    parsedUrl.pathname = pathname.replace('/cdn', '');
+  }
+  parsedUrl.pathname = `/media-api${parsedUrl.pathname}`;
+  return parsedUrl;
+}

package/dist/es2019/utils/request/index.js

@@ -1,6 +1,9 @@
 export { RequestError, isRequestError } from './errors';
 export { isRateLimitedError, createRequestErrorReason } from './helpers';
-import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders } from './helpers';
+import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders, isFetchNetworkError, defaultShouldRetryError } from './helpers';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { mapRetryUrlToPathBasedUrl } from '../pathBasedUrl';
+import getNavigator from '../getNavigator';
 export async function request(url, options = {}, controller) {
   const {
     method = 'GET',
@@ -30,5 +33,34 @@ export async function request(url, options = {}, controller) {
     headers: extendHeaders(headers, auth, traceContext),
     signal: controller && controller.signal
   }).then(createProcessFetchResponse(metadata));
+  if (fg('platform_media_retry_edge_error')) {
+    const shouldRetryError = err => {
+      var _getNavigator;
+      if (isFetchNetworkError(err) && (_getNavigator = getNavigator()) !== null && _getNavigator !== void 0 && _getNavigator.userAgent.includes('Edg/')) {
+        return false;
+      }
+      return defaultShouldRetryError(err);
+    };
+    try {
+      return await fetchRetry(doFetch, metadata, {
+        ...retryOptions,
+        shouldRetryError
+      });
+    } catch (error) {
+      var _getNavigator2;
+      if (isFetchNetworkError(error) && (_getNavigator2 = getNavigator()) !== null && _getNavigator2 !== void 0 && _getNavigator2.userAgent.includes('Edg/')) {
+        const doFetchWithPathBasedUrl = () => fetch(createUrl(mapRetryUrlToPathBasedUrl(url).toString(), {
+          params
+        }), {
+          method,
+          body,
+          headers: extendHeaders(headers, auth, traceContext),
+          signal: controller && controller.signal
+        }).then(createProcessFetchResponse(metadata));
+        return fetchRetry(doFetchWithPathBasedUrl, metadata, retryOptions);
+      }
+      throw error;
+    }
+  }
   return fetchRetry(doFetch, metadata, retryOptions);
 }

package/dist/esm/client/media-store/MediaStore.js

@@ -13,6 +13,8 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultSho
 import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { mapToPathBasedUrl } from '../../utils/pathBasedUrl';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var extendImageParams = function extendImageParams(params) {
@@ -403,6 +405,9 @@ export var MediaStore = /*#__PURE__*/function () {
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
+      if (fg('platform_media_path_based_route')) {
+        return mapToPathBasedUrl(createUrl("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options));
+      }
       return mapToMediaCdnUrl(createUrl("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options), auth.token);
     }
   }, {
@@ -920,7 +925,10 @@ export var MediaStore = /*#__PURE__*/function () {
               if (useMediaCdn) {
                 url = mapToMediaCdnUrl(url, auth.token);
               }
-              _context16.next = 19;
+              if (fg('platform_media_path_based_route')) {
+                url = mapToPathBasedUrl(url);
+              }
+              _context16.next = 20;
               return _request(url, {
                 method: method,
                 endpoint: endpoint,
@@ -931,12 +939,12 @@ export var MediaStore = /*#__PURE__*/function () {
                 clientOptions: clientOptions,
                 traceContext: extendedTraceContext
               }, controller);
-            case 19:
+            case 20:
               response = _context16.sent;
               setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
               setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
               return _context16.abrupt("return", response);
-            case 23:
+            case 24:
             case "end":
               return _context16.stop();
           }

package/dist/esm/utils/getDocument.js

@@ -0,0 +1,9 @@
+export default (function () {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.document === 'undefined') {
+    return;
+  }
+  return window.document;
+});

package/dist/esm/utils/getNavigator.js

@@ -0,0 +1,9 @@
+export default (function () {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (typeof window.navigator === 'undefined') {
+    return;
+  }
+  return window.navigator;
+});

package/dist/esm/utils/mediaCdn.js

@@ -11,8 +11,7 @@ export var MEDIA_CDN_MAP = {
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 var MEDIA_TOKEN_LENGTH_LIMIT = 7000;
 export function isCDNEnabled() {
-  var isIsolatedCloudWithDisabledCDN = fg('platform_disable_isolated_cloud_media_cdn_delivery') && isIsolatedCloud();
-  return isCommercial() && !isIsolatedCloudWithDisabledCDN && fg('platform_media_cdn_delivery');
+  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !fg('platform_media_path_based_route');
 }
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/esm/utils/pathBasedUrl.js

@@ -0,0 +1,35 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import getDocument from './getDocument';
+function getRelativeUrl(absoluteUrl) {
+  var url = new URL(absoluteUrl);
+  return "".concat(url.pathname).concat(url.search).concat(url.hash);
+}
+export function mapToPathBasedUrl(url) {
+  if (fg('platform_media_path_based_route')) {
+    var _getDocument;
+    var parsedUrl = new URL(url);
+    parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+    var location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+
+    // in this case we are most likely in SSR / a non browser environment so just return a relative URL
+    if (!location) {
+      return getRelativeUrl(url);
+    }
+    parsedUrl.host = location.host;
+    return parsedUrl.toString();
+  }
+  return url;
+}
+export function mapRetryUrlToPathBasedUrl(url) {
+  var _getDocument$location, _getDocument2;
+  var parsedUrl = new URL(url);
+  parsedUrl.host = (_getDocument$location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+
+  // remove CDN from the URL for retry if it exists
+  var pathname = parsedUrl.pathname;
+  if (pathname.endsWith('/cdn')) {
+    parsedUrl.pathname = pathname.replace('/cdn', '');
+  }
+  parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+  return parsedUrl;
+}

package/dist/esm/utils/request/index.js

@@ -1,8 +1,14 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 export { RequestError, isRequestError } from './errors';
 export { isRateLimitedError, createRequestErrorReason } from './helpers';
-import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders } from './helpers';
+import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders, isFetchNetworkError, defaultShouldRetryError } from './helpers';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { mapRetryUrlToPathBasedUrl } from '../pathBasedUrl';
+import getNavigator from '../getNavigator';
 export function request(_x) {
   return _request.apply(this, arguments);
 }
@@ -23,6 +29,9 @@ function _request() {
       retryOptions,
       metadata,
       doFetch,
+      shouldRetryError,
+      _getNavigator2,
+      doFetchWithPathBasedUrl,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -46,12 +55,51 @@ function _request() {
               signal: controller && controller.signal
             }).then(createProcessFetchResponse(metadata));
           };
+          if (!fg('platform_media_retry_edge_error')) {
+            _context.next = 20;
+            break;
+          }
+          shouldRetryError = function shouldRetryError(err) {
+            var _getNavigator;
+            if (isFetchNetworkError(err) && (_getNavigator = getNavigator()) !== null && _getNavigator !== void 0 && _getNavigator.userAgent.includes('Edg/')) {
+              return false;
+            }
+            return defaultShouldRetryError(err);
+          };
+          _context.prev = 8;
+          _context.next = 11;
+          return fetchRetry(doFetch, metadata, _objectSpread(_objectSpread({}, retryOptions), {}, {
+            shouldRetryError: shouldRetryError
+          }));
+        case 11:
+          return _context.abrupt("return", _context.sent);
+        case 14:
+          _context.prev = 14;
+          _context.t0 = _context["catch"](8);
+          if (!(isFetchNetworkError(_context.t0) && (_getNavigator2 = getNavigator()) !== null && _getNavigator2 !== void 0 && _getNavigator2.userAgent.includes('Edg/'))) {
+            _context.next = 19;
+            break;
+          }
+          doFetchWithPathBasedUrl = function doFetchWithPathBasedUrl() {
+            return fetch(createUrl(mapRetryUrlToPathBasedUrl(url).toString(), {
+              params: params
+            }), {
+              method: method,
+              body: body,
+              headers: extendHeaders(headers, auth, traceContext),
+              signal: controller && controller.signal
+            }).then(createProcessFetchResponse(metadata));
+          };
+          return _context.abrupt("return", fetchRetry(doFetchWithPathBasedUrl, metadata, retryOptions));
+        case 19:
+          throw _context.t0;
+        case 20:
           return _context.abrupt("return", fetchRetry(doFetch, metadata, retryOptions));
-        case 7:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[8, 14]]);
   }));
   return _request.apply(this, arguments);
 }

package/dist/types/utils/getDocument.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Document | undefined;
+export default _default;

package/dist/types/utils/getNavigator.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Navigator | undefined;
+export default _default;

package/dist/types/utils/pathBasedUrl.d.ts

@@ -0,0 +1,2 @@
+export declare function mapToPathBasedUrl(url: string): string;
+export declare function mapRetryUrlToPathBasedUrl(url: string): URL;

package/dist/types-ts4.5/utils/getDocument.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Document | undefined;
+export default _default;

package/dist/types-ts4.5/utils/getNavigator.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Navigator | undefined;
+export default _default;

package/dist/types-ts4.5/utils/pathBasedUrl.d.ts

@@ -0,0 +1,2 @@
+export declare function mapToPathBasedUrl(url: string): string;
+export declare function mapRetryUrlToPathBasedUrl(url: string): URL;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "35.3.1",
+	"version": "35.3.3",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -22,11 +22,6 @@
 	},
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
-	"af:exports": {
-		"./constants": "./src/constants.ts",
-		"./test-helpers": "./src/test-helpers/index.ts",
-		".": "./src/index.ts"
-	},
 	"atlassian": {
 		"team": "Media Exif",
 		"website": {
@@ -58,7 +53,7 @@
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-state": "^1.8.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^6.0.0",
+		"@atlaskit/tokens": "^6.3.0",
 		"@atlassian/feature-flags-test-utils": "^0.3.0",
 		"@emotion/react": "^11.7.1",
 		"@types/deep-equal": "^1.0.1",
@@ -87,6 +82,12 @@
 		"platform_media_cdn_delivery": {
 			"type": "boolean"
 		},
+		"platform_media_path_based_route": {
+			"type": "boolean"
+		},
+		"platform_media_retry_edge_error": {
+			"type": "boolean"
+		},
 		"platform_disable_isolated_cloud_media_cdn_delivery": {
 			"type": "boolean"
 		}