@atlaskit/media-client 22.0.2 → 22.0.4

package/dist/esm/client/file-fetcher/index.js

@@ -6,9 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Subscription } from 'rxjs/Subscription';
-import { of } from 'rxjs/observable/of';
 import { map } from 'rxjs/operators/map';
-import { concatMap } from 'rxjs/operators/concatMap';
 import uuid from 'uuid/v4';
 // import setimmediate to temporary fix dataloader 2.0.0 bug
 // @see https://github.com/graphql/dataloader/issues/249
@@ -31,13 +29,12 @@ import { toPromise, fromObservable } from '../../utils/mediaSubscribable';
 import { getDimensionsFromBlob } from '../../utils/getDimensionsFromBlob';
 import { createMediaSubject } from '../../utils/createMediaSubject';
 import { isMimeTypeSupportedByBrowser, getMediaTypeFromMimeType } from '@atlaskit/media-common/mediaTypeUtils';
-import { shouldFetchRemoteFileStates, shouldFetchRemoteFileStatesObservable } from '../../utils/shouldFetchRemoteFileStates';
+import { shouldFetchRemoteFileStates } from '../../utils/shouldFetchRemoteFileStates';
 import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
-import { getMediaFeatureFlag } from '@atlaskit/media-common';
 export { isFileFetcherError, FileFetcherError } from './error';
 export var FileFetcherImpl = /*#__PURE__*/function () {
-  function FileFetcherImpl(mediaStore, featureFlags) {
+  function FileFetcherImpl(mediaStore) {
     var _this = this;
     _classCallCheck(this, FileFetcherImpl);
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
@@ -135,7 +132,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       };
     });
     this.mediaStore = mediaStore;
-    this.featureFlags = featureFlags;
     this.dataloader = createFileDataloader(mediaStore);
   }
   _createClass(FileFetcherImpl, [{
@@ -327,10 +323,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       return uploadExternal;
     }()
   }, {
-    key: "uploadAwlaysPullFileStates",
-    value:
-    // TODO: make this the public upload method when the FF is removed
-    function uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
+    key: "upload",
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
       var _this4 = this;
       var collection = file.collection;
       var upfrontId = uploadableFileUpfrontIds || this.generateUploadableFileUpfrontIds(collection, traceContext);
@@ -372,100 +366,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       setTimeout(onProgress, 0, 0);
       return fromObservable(subject);
     }
-  }, {
-    key: "uploadConditionallyPullFileStates",
-    value: function uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
-      var _this5 = this;
-      if (typeof file.content === 'string') {
-        file.content = convertBase64ToBlob(file.content);
-      }
-      var content = file.content,
-        _file$name2 = file.name,
-        name = _file$name2 === void 0 ? '' : _file$name2,
-        collection = file.collection;
-      if (!uploadableFileUpfrontIds) {
-        uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
-      }
-      var id = uploadableFileUpfrontIds.id;
-      var occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
-      var mimeType = '';
-      var size = 0;
-      var preview;
-      // TODO [MSW-796]: get file size for base64
-      var mediaType = getMediaTypeFromUploadableFile(file);
-      var subject = createMediaSubject();
-      var processingSubscription = new Subscription();
-      if (content instanceof Blob) {
-        size = content.size;
-        mimeType = content.type;
-        if (isMimeTypeSupportedByBrowser(content.type)) {
-          preview = {
-            value: content,
-            origin: 'local'
-          };
-        }
-      }
-      var stateBase = {
-        id: id,
-        occurrenceKey: occurrenceKey,
-        name: name,
-        size: size,
-        mediaType: mediaType,
-        mimeType: mimeType,
-        preview: preview
-      };
-      var onProgress = function onProgress(progress) {
-        subject.next(_objectSpread(_objectSpread({
-          status: 'uploading'
-        }, stateBase), {}, {
-          progress: progress
-        }));
-      };
-      var onUploadFinish = function onUploadFinish(error) {
-        if (error) {
-          return subject.error(error);
-        }
-        processingSubscription.add(shouldFetchRemoteFileStatesObservable(mediaType, mimeType, preview).pipe(concatMap(function (shouldFetchRemoteFileStates) {
-          if (shouldFetchRemoteFileStates) {
-            return _this5.createDownloadFileStream(id, collection, occurrenceKey).pipe(map(function (remoteFileState) {
-              return _objectSpread(_objectSpread(_objectSpread({}, stateBase), remoteFileState), overrideMediaTypeIfUnknown(remoteFileState, mediaType));
-            }));
-          }
-          return of(_objectSpread({
-            status: 'processing',
-            representations: {}
-          }, stateBase));
-        })).subscribe(subject));
-      };
-      var _uploadFile2 = uploadFile(file, this.mediaStore, uploadableFileUpfrontIds, {
-          onUploadFinish: onUploadFinish,
-          onProgress: onProgress
-        }, traceContext),
-        cancel = _uploadFile2.cancel;
-      getFileStreamsCache().set(id, subject);
-
-      // We should report progress asynchronously, since this is what consumer expects
-      // (otherwise in newUploadService file-converting event will be emitted before files-added)
-      setTimeout(function () {
-        onProgress(0);
-      }, 0);
-      if (controller) {
-        controller.setAbort(function () {
-          cancel();
-          processingSubscription.unsubscribe();
-        });
-      }
-      return fromObservable(subject);
-    }
-  }, {
-    key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext, featureFlags) {
-      var shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', featureFlags || this.featureFlags);
-      if (shouldAlwaysFetchFileState) {
-        return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
-      }
-      return this.uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
-    }
 
     // TODO: ----- ADD TICKET
   }, {

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

@@ -20,7 +20,7 @@ export var MediaClient = /*#__PURE__*/function () {
       initialAuth: mediaClientConfig.initialAuth
     }, featureFlags);
     this.config = mediaClientConfig;
-    this.file = new FileFetcherImpl(this.mediaStore, featureFlags);
+    this.file = new FileFetcherImpl(this.mediaStore);
     this.eventEmitter = new EventEmitter2();
     this.stargate = new StargateClient(mediaClientConfig.stargateBaseUrl);
   }

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

@@ -1,11 +1,7 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["size"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -15,7 +11,6 @@ import { getArtifactUrl } from '../../models/artifacts';
 import { request as _request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
-import parseJwt from '../../utils/parseJwt';
 export { MediaStoreError, isMediaStoreError } from './error';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
@@ -214,17 +209,9 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "touchFiles",
     value: function () {
       var _touchFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(body) {
-        var _this2 = this;
         var params,
           traceContext,
           metadata,
-          auth,
-          maxFileSize,
-          decoded,
-          _body$descriptors$red,
-          _body$descriptors$red2,
-          filteredDescriptors,
-          rejectedResponse,
           options,
           _args3 = arguments;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -236,59 +223,16 @@ export var MediaStore = /*#__PURE__*/function () {
                 method: 'POST',
                 endpoint: '/upload/createWithFiles'
               };
-              _context3.next = 5;
-              return this.resolveAuth({
-                collectionName: params.collection
-              });
-            case 5:
-              auth = _context3.sent;
-              try {
-                decoded = parseJwt(auth.token);
-                maxFileSize = decoded.fileSizeLimit;
-              } catch (error) {
-                // we're relying on the backend to throw an error when there's an invalid token
-              }
-
-              // TODO MEX-2318: backend eventually will allow `size` in the body of this request, then some of this logic will need to be altered
-              _body$descriptors$red = body.descriptors.reduce(function (_ref, curr) {
-                var _ref2 = _slicedToArray(_ref, 2),
-                  filtered = _ref2[0],
-                  rejected = _ref2[1];
-                var size = curr.size,
-                  descriptor = _objectWithoutProperties(curr, _excluded);
-                if (maxFileSize && size && size > maxFileSize) {
-                  return [filtered, [].concat(_toConsumableArray(rejected), [_this2.getRejectedResponseFromDescriptor(curr, maxFileSize)])];
-                }
-                return [[].concat(_toConsumableArray(filtered), [descriptor]), rejected];
-              }, [[], []]), _body$descriptors$red2 = _slicedToArray(_body$descriptors$red, 2), filteredDescriptors = _body$descriptors$red2[0], rejectedResponse = _body$descriptors$red2[1];
               options = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: {
                   collectionName: params.collection
                 },
                 headers: jsonHeaders,
-                body: JSON.stringify(_objectSpread(_objectSpread({}, body), {}, {
-                  descriptors: filteredDescriptors
-                })),
-                traceContext: traceContext,
-                resolvedAuth: auth
-              });
-              if (!(filteredDescriptors.length === 0)) {
-                _context3.next = 11;
-                break;
-              }
-              return _context3.abrupt("return", {
-                data: {
-                  created: [],
-                  rejected: rejectedResponse
-                }
+                body: JSON.stringify(body),
+                traceContext: traceContext
               });
-            case 11:
-              return _context3.abrupt("return", this.request('/upload/createWithFiles', options).then(createMapResponseToJson(metadata)).then(function (res) {
-                // TODO MEX-2318: backend eventually will include `rejected`, then this logic will need to be removed
-                res.data.rejected = rejectedResponse;
-                return res;
-              }));
-            case 12:
+              return _context3.abrupt("return", this.request('/upload/createWithFiles', options).then(createMapResponseToJson(metadata)));
+            case 5:
             case "end":
               return _context3.stop();
           }
@@ -321,11 +265,11 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "getFileImageURL",
     value: function () {
       var _getFileImageURL = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, params) {
-        var _ref3, collectionName, auth;
+        var _ref, collectionName, auth;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _ref3 = params || {}, collectionName = _ref3.collection;
+              _ref = params || {}, collectionName = _ref.collection;
               _context4.next = 3;
               return this.resolveAuth({
                 collectionName: collectionName
@@ -611,7 +555,6 @@ export var MediaStore = /*#__PURE__*/function () {
           body,
           clientOptions,
           traceContext,
-          resolvedAuth,
           auth,
           extendedTraceContext,
           response,
@@ -625,25 +568,15 @@ export var MediaStore = /*#__PURE__*/function () {
                 authContext: {}
               };
               controller = _args11.length > 2 ? _args11[2] : undefined;
-              method = options.method, endpoint = options.endpoint, authContext = options.authContext, params = options.params, headers = options.headers, body = options.body, clientOptions = options.clientOptions, traceContext = options.traceContext, resolvedAuth = options.resolvedAuth;
-              if (!(resolvedAuth !== null && resolvedAuth !== void 0)) {
-                _context11.next = 7;
-                break;
-              }
-              _context11.t0 = resolvedAuth;
-              _context11.next = 10;
-              break;
-            case 7:
-              _context11.next = 9;
+              method = options.method, endpoint = options.endpoint, authContext = options.authContext, params = options.params, headers = options.headers, body = options.body, clientOptions = options.clientOptions, traceContext = options.traceContext;
+              _context11.next = 5;
               return this.resolveAuth(authContext);
-            case 9:
-              _context11.t0 = _context11.sent;
-            case 10:
-              auth = _context11.t0;
+            case 5:
+              auth = _context11.sent;
               extendedTraceContext = traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
                 spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(8)
               }) : undefined;
-              _context11.next = 14;
+              _context11.next = 9;
               return _request("".concat(auth.baseUrl).concat(path), {
                 method: method,
                 endpoint: endpoint,
@@ -654,12 +587,12 @@ export var MediaStore = /*#__PURE__*/function () {
                 clientOptions: clientOptions,
                 traceContext: extendedTraceContext
               }, controller);
-            case 14:
+            case 9:
               response = _context11.sent;
               setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
               setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
               return _context11.abrupt("return", response);
-            case 18:
+            case 13:
             case "end":
               return _context11.stop();
           }

package/dist/esm/models/media.js

@@ -1,15 +1,7 @@
-import { getMediaFeatureFlag } from '@atlaskit/media-common';
-
 // Warning! You can't add new media file processing status!
 // See packages/media/media-core/src/__tests__/cache-backward-compatibility.spec.ts
 export var isPreviewableType = function isPreviewableType(type, featureFlags) {
-  // in classic experience, only audio/video/image are previewable
-  var defaultPreviewableTypes = ['audio', 'video', 'image'];
-
-  // in the new experience, docs are previewable too
-  if (getMediaFeatureFlag('newCardExperience', featureFlags)) {
-    return [].concat(defaultPreviewableTypes, ['doc']).indexOf(type) > -1;
-  }
+  var defaultPreviewableTypes = ['audio', 'video', 'image', 'doc'];
   return defaultPreviewableTypes.indexOf(type) > -1;
 };
 export var DATA_UNIT = /*#__PURE__*/function (DATA_UNIT) {

package/dist/esm/utils/shouldFetchRemoteFileStates.js

@@ -1,6 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { from } from 'rxjs/observable/from';
 import { isMimeTypeSupportedByBrowser, isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';
 import { getVideoDimensionsFromBlob } from './getVideoDimensionsFromBlob';
 
@@ -65,7 +64,4 @@ function _shouldFetchRemoteFileStates() {
     }, _callee, null, [[8, 17]]);
   }));
   return _shouldFetchRemoteFileStates.apply(this, arguments);
-}
-export function shouldFetchRemoteFileStatesObservable(mediaType, mimeType, preview) {
-  return from(shouldFetchRemoteFileStates(mediaType, mimeType, preview));
 }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "22.0.2",
+	"version": "22.0.4",
 	"sideEffects": false
 }

package/dist/types/client/file-fetcher/error.d.ts

@@ -1,5 +1,5 @@
 import { BaseMediaClientError } from '../../models/errors';
-export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile';
+export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName';
 export type FileFetcherErrorAttributes = {
     readonly reason: FileFetcherErrorReason;
     readonly id: string;

package/dist/types/client/file-fetcher/index.d.ts

@@ -8,7 +8,7 @@ import { MediaFileArtifacts } from '../../models/artifacts';
 import { UploadController } from '../../upload-controller';
 import { MediaSubscribable } from '../../utils/mediaSubscribable';
 import { Dimensions } from '../../utils/getDimensionsFromBlob';
-import { MediaFeatureFlags, MediaTraceContext } from '@atlaskit/media-common';
+import { MediaTraceContext } from '@atlaskit/media-common';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason, } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -32,7 +32,7 @@ export interface FileFetcher {
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
@@ -41,9 +41,8 @@ export interface FileFetcher {
 }
 export declare class FileFetcherImpl implements FileFetcher {
     private readonly mediaStore;
-    private readonly featureFlags?;
     private readonly dataloader;
-    constructor(mediaStore: MediaStore, featureFlags?: MediaFeatureFlags | undefined);
+    constructor(mediaStore: MediaStore);
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
@@ -53,9 +52,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private generateUploadableFileUpfrontIds;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     private getUploadingFileStateBase;
-    private uploadAwlaysPullFileStates;
-    private uploadConditionallyPullFileStates;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
 }

package/dist/types/client/media-store/index.d.ts

@@ -67,7 +67,6 @@ export type MediaStoreRequestOptions = RequestMetadata & {
     readonly body?: any;
     readonly clientOptions?: ClientOptions;
     readonly traceContext?: MediaTraceContext;
-    readonly resolvedAuth?: Auth;
 };
 export type MediaStoreCreateFileFromUploadParams = {
     readonly collection?: string;
@@ -162,7 +161,7 @@ export type RejectionError = {
 };
 export type TouchedFiles = {
     created: CreatedTouchedFile[];
-    rejected: RejectedTouchFile[];
+    rejected?: RejectedTouchFile[];
 };
 export interface EmptyFile {
     readonly id: string;

package/dist/types/models/errors/types.d.ts

@@ -1,4 +1,4 @@
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export interface MediaClientErrorAttributes {
     reason: MediaClientErrorReason;
 }

package/dist/types/models/media.d.ts

@@ -1,4 +1,4 @@
-import { MediaFeatureFlags, MediaTraceContext, MediaType } from '@atlaskit/media-common';
+import { MediaTraceContext, MediaFeatureFlags, MediaType } from '@atlaskit/media-common';
 import type { MediaFileArtifacts } from './artifacts';
 export type MediaFileProcessingStatus = 'pending' | 'succeeded' | 'failed';
 export type { MediaType } from '@atlaskit/media-common';

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

@@ -1,4 +1,3 @@
-import { Observable } from 'rxjs/Observable';
 import { FilePreview } from '../models/file-state';
 import { MediaType } from '../models/media';
 /**
@@ -13,4 +12,3 @@ import { MediaType } from '../models/media';
  *
  */
 export declare function shouldFetchRemoteFileStates(mediaType: MediaType, mimeType: string, preview?: FilePreview | Promise<FilePreview>): Promise<boolean>;
-export declare function shouldFetchRemoteFileStatesObservable(mediaType: MediaType, mimeType: string, preview?: FilePreview | Promise<FilePreview>): Observable<boolean>;

package/dist/types-ts4.5/client/file-fetcher/error.d.ts

@@ -1,5 +1,5 @@
 import { BaseMediaClientError } from '../../models/errors';
-export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile';
+export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName';
 export type FileFetcherErrorAttributes = {
     readonly reason: FileFetcherErrorReason;
     readonly id: string;

package/dist/types-ts4.5/client/file-fetcher/index.d.ts

@@ -8,7 +8,7 @@ import { MediaFileArtifacts } from '../../models/artifacts';
 import { UploadController } from '../../upload-controller';
 import { MediaSubscribable } from '../../utils/mediaSubscribable';
 import { Dimensions } from '../../utils/getDimensionsFromBlob';
-import { MediaFeatureFlags, MediaTraceContext } from '@atlaskit/media-common';
+import { MediaTraceContext } from '@atlaskit/media-common';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason, } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -32,7 +32,7 @@ export interface FileFetcher {
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
@@ -41,9 +41,8 @@ export interface FileFetcher {
 }
 export declare class FileFetcherImpl implements FileFetcher {
     private readonly mediaStore;
-    private readonly featureFlags?;
     private readonly dataloader;
-    constructor(mediaStore: MediaStore, featureFlags?: MediaFeatureFlags | undefined);
+    constructor(mediaStore: MediaStore);
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
@@ -53,9 +52,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private generateUploadableFileUpfrontIds;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     private getUploadingFileStateBase;
-    private uploadAwlaysPullFileStates;
-    private uploadConditionallyPullFileStates;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
 }

package/dist/types-ts4.5/client/media-store/index.d.ts

@@ -67,7 +67,6 @@ export type MediaStoreRequestOptions = RequestMetadata & {
     readonly body?: any;
     readonly clientOptions?: ClientOptions;
     readonly traceContext?: MediaTraceContext;
-    readonly resolvedAuth?: Auth;
 };
 export type MediaStoreCreateFileFromUploadParams = {
     readonly collection?: string;
@@ -162,7 +161,7 @@ export type RejectionError = {
 };
 export type TouchedFiles = {
     created: CreatedTouchedFile[];
-    rejected: RejectedTouchFile[];
+    rejected?: RejectedTouchFile[];
 };
 export interface EmptyFile {
     readonly id: string;

package/dist/types-ts4.5/models/errors/types.d.ts

@@ -1,4 +1,4 @@
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export interface MediaClientErrorAttributes {
     reason: MediaClientErrorReason;
 }

package/dist/types-ts4.5/models/media.d.ts

@@ -1,4 +1,4 @@
-import { MediaFeatureFlags, MediaTraceContext, MediaType } from '@atlaskit/media-common';
+import { MediaTraceContext, MediaFeatureFlags, MediaType } from '@atlaskit/media-common';
 import type { MediaFileArtifacts } from './artifacts';
 export type MediaFileProcessingStatus = 'pending' | 'succeeded' | 'failed';
 export type { MediaType } from '@atlaskit/media-common';

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

@@ -1,4 +1,3 @@
-import { Observable } from 'rxjs/Observable';
 import { FilePreview } from '../models/file-state';
 import { MediaType } from '../models/media';
 /**
@@ -13,4 +12,3 @@ import { MediaType } from '../models/media';
  *
  */
 export declare function shouldFetchRemoteFileStates(mediaType: MediaType, mimeType: string, preview?: FilePreview | Promise<FilePreview>): Promise<boolean>;
-export declare function shouldFetchRemoteFileStatesObservable(mediaType: MediaType, mimeType: string, preview?: FilePreview | Promise<FilePreview>): Observable<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "22.0.2",
+  "version": "22.0.4",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.2.0",
-    "@atlaskit/media-common": "^4.1.0",
+    "@atlaskit/media-common": "^5.0.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -57,11 +57,11 @@
   "devDependencies": {
     "@atlaskit/button": "^16.7.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^75.0.0",
+    "@atlaskit/media-card": "^76.0.0",
     "@atlaskit/media-core": "^34.1.0",
     "@atlaskit/media-test-helpers": "^33.0.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/tokens": "^1.4.0",
+    "@atlaskit/tokens": "^1.5.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@emotion/react": "^11.7.1",
     "@types/deep-equal": "^1.0.1",