@atlaskit/media-client 35.3.2 → 35.3.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @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

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

@@ -411,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);
     }
   }, {

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') && !(0, _platformFeatureFlags.fg)('platform_media_path_based_route');
+  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

@@ -8,20 +8,30 @@ 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$location, _getDocument;
+    var _getDocument;
     var parsedUrl = new URL(url);
-    parsedUrl.host = (_getDocument$location = (_getDocument = (0, _getDocument3.default)()) === null || _getDocument === void 0 ? void 0 : _getDocument.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : parsedUrl.host;
     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$location2, _getDocument2;
+  var _getDocument$location, _getDocument2;
   var parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location2 = (_getDocument2 = (0, _getDocument3.default)()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location2 !== void 0 ? _getDocument$location2 : parsedUrl.host;
+  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;

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

@@ -268,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) {

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') && !fg('platform_media_path_based_route');
+  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

@@ -1,19 +1,29 @@
 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$location, _getDocument;
+    var _getDocument;
     const parsedUrl = new URL(url);
-    parsedUrl.host = (_getDocument$location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : parsedUrl.host;
     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$location2, _getDocument2;
+  var _getDocument$location, _getDocument2;
   const parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location2 = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location2 !== void 0 ? _getDocument$location2 : parsedUrl.host;
+  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;

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

@@ -405,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);
     }
   }, {

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') && !fg('platform_media_path_based_route');
+  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

@@ -1,19 +1,29 @@
 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$location, _getDocument;
+    var _getDocument;
     var parsedUrl = new URL(url);
-    parsedUrl.host = (_getDocument$location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : parsedUrl.host;
     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$location2, _getDocument2;
+  var _getDocument$location, _getDocument2;
   var parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location2 = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location2 !== void 0 ? _getDocument$location2 : parsedUrl.host;
+  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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "35.3.2",
+	"version": "35.3.3",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"