@atlaskit/media-client 17.0.0 → 17.1.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/media-client
 
+## 17.1.2
+
+### Patch Changes
+
+- [`45b6d35ea96`](https://bitbucket.org/atlassian/atlassian-frontend/commits/45b6d35ea96) - [ME-1327] Added new upload methods to editor mobile bridge to support previews and progress for media cards.
+
+## 17.1.1
+
+### Patch Changes
+
+- [`8d4228767b0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8d4228767b0) - Upgrade Typescript from `4.2.4` to `4.3.5`.
+- Updated dependencies
+
+## 17.1.0
+
+### Minor Changes
+
+- [`c07a8176ddf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c07a8176ddf) - New BlobType SlicedBlob that includes partnumber introduced and used for uploading chunks
+- [`a2e6bd37426`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a2e6bd37426) - add uploadId to prob function to support new media upload api
+
+### Patch Changes
+
+- [`e80f52696fe`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e80f52696fe) - Migrated styled-components to emotion
+- [`de9dc9e7cbd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/de9dc9e7cbd) - Renamed internal helpers and files
+- Updated dependencies
+
 ## 17.0.0
 
 ### Major Changes

package/dist/cjs/client/collection-fetcher.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectionCache = exports.CollectionFetcher = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -25,7 +25,7 @@ var _fileStreamsCache = require("../file-streams-cache");
 
 var _fileState = require("../models/file-state");
 
-var _toMediaSubscribable = require("../utils/toMediaSubscribable");
+var _mediaSubscribable = require("../utils/mediaSubscribable");
 
 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; }
 
@@ -116,7 +116,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
       }).catch(function (error) {
         return subject.error(error);
       });
-      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
+      return (0, _mediaSubscribable.fromObservable)(subject);
     }
   }, {
     key: "removeFile",

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

@@ -69,7 +69,7 @@ var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknow
 
 var _convertBase64ToBlob = require("../../utils/convertBase64ToBlob");
 
-var _mediaSubscribableToPromise = require("../../utils/mediaSubscribableToPromise");
+var _mediaSubscribable = require("../../utils/mediaSubscribable");
 
 var _getDimensionsFromBlob = require("../../utils/getDimensionsFromBlob");
 
@@ -83,8 +83,6 @@ var _polling = require("../../utils/polling");
 
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
 
-var _toMediaSubscribable = require("../../utils/toMediaSubscribable");
-
 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) { (0, _defineProperty2.default)(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; }
@@ -182,17 +180,17 @@ var FileFetcherImpl = /*#__PURE__*/function () {
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
         }));
-        return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
+        return (0, _mediaSubscribable.fromObservable)(subject);
       }
 
-      return (0, _toMediaSubscribable.toMediaSubscribable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
+      return (0, _mediaSubscribable.fromObservable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
         return _this2.createDownloadFileStream(id, collectionName);
       }));
     }
   }, {
     key: "getCurrentState",
     value: function getCurrentState(id, options) {
-      return (0, _mediaSubscribableToPromise.mediaSubscribableToPromise)(this.getFileState(id, options));
+      return (0, _mediaSubscribable.toPromise)(this.getFileState(id, options));
     }
   }, {
     key: "getArtifactURL",
@@ -480,7 +478,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         });
       }
 
-      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
+      return (0, _mediaSubscribable.fromObservable)(subject);
     }
   }, {
     key: "downloadBinary",

package/dist/cjs/index.js

@@ -108,7 +108,7 @@ Object.defineProperty(exports, "createMediaSubject", {
 Object.defineProperty(exports, "createMediaSubscribable", {
   enumerable: true,
   get: function get() {
-    return _toMediaSubscribable.createMediaSubscribable;
+    return _mediaSubscribable.createMediaSubscribable;
   }
 });
 Object.defineProperty(exports, "createUrl", {
@@ -417,7 +417,7 @@ var _globalMediaEventEmitter = require("./globalMediaEventEmitter");
 
 var _url = require("./utils/url");
 
-var _toMediaSubscribable = require("./utils/toMediaSubscribable");
+var _mediaSubscribable = require("./utils/mediaSubscribable");
 
 var _constants = require("./constants");
 

package/dist/cjs/uploader/index.js

@@ -9,6 +9,8 @@ exports.uploadFile = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _chunkinator = require("@atlaskit/chunkinator");
@@ -27,6 +29,10 @@ var _calculateChunkSize = require("./calculateChunkSize");
 
 var _mediaCommon = require("@atlaskit/media-common");
 
+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) { (0, _defineProperty2.default)(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; }
+
 var hashingFunction = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(blob) {
     var hasher;
@@ -54,7 +60,7 @@ var hashingFunction = /*#__PURE__*/function () {
   };
 }();
 
-var createProbingFunction = function createProbingFunction(store, collectionName) {
+var createProbingFunction = function createProbingFunction(store, deferredUploadId, collectionName) {
   return /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(chunks) {
       var response, results;
@@ -62,19 +68,43 @@ var createProbingFunction = function createProbingFunction(store, collectionName
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
-              return store.probeChunks(hashedChunks(chunks), {
-                collectionName: collectionName
-              });
+              _context2.t0 = store;
+              _context2.t1 = hashedChunks(chunks);
+              _context2.t2 = collectionName;
+
+              if (!(0, _mediaCommon.getMediaFeatureFlag)('mediaUploadApiV2', store.featureFlags)) {
+                _context2.next = 9;
+                break;
+              }
+
+              _context2.next = 6;
+              return deferredUploadId;
+
+            case 6:
+              _context2.t3 = _context2.sent;
+              _context2.next = 10;
+              break;
+
+            case 9:
+              _context2.t3 = undefined;
+
+            case 10:
+              _context2.t4 = _context2.t3;
+              _context2.t5 = {
+                collectionName: _context2.t2,
+                uploadId: _context2.t4
+              };
+              _context2.next = 14;
+              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5);
 
-            case 2:
+            case 14:
               response = _context2.sent;
               results = response.data.results;
               return _context2.abrupt("return", Object.values(results).map(function (result) {
                 return result.exists;
               }));
 
-            case 5:
+            case 17:
             case "end":
               return _context2.stop();
           }
@@ -88,63 +118,108 @@ var createProbingFunction = function createProbingFunction(store, collectionName
   }();
 };
 
-var createUploadingFunction = function createUploadingFunction(store, collectionName) {
-  return function (chunk) {
-    return store.uploadChunk(chunk.hash, chunk.blob, {
-      collectionName: collectionName
-    });
-  };
+var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName) {
+  return /*#__PURE__*/function () {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunk) {
+      var options;
+      return _regenerator.default.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(0, _mediaCommon.getMediaFeatureFlag)('mediaUploadApiV2', store.featureFlags)) {
+                _context3.next = 8;
+                break;
+              }
+
+              _context3.t1 = chunk.partNumber;
+              _context3.next = 4;
+              return deferredUploadId;
+
+            case 4:
+              _context3.t2 = _context3.sent;
+              _context3.t0 = {
+                partNumber: _context3.t1,
+                uploadId: _context3.t2
+              };
+              _context3.next = 9;
+              break;
+
+            case 8:
+              _context3.t0 = {};
+
+            case 9:
+              options = _context3.t0;
+              _context3.next = 12;
+              return store.uploadChunk(chunk.hash, chunk.blob, _objectSpread({
+                collectionName: collectionName
+              }, options));
+
+            case 12:
+              return _context3.abrupt("return", _context3.sent);
+
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function (_x3) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
 };
 
 var createProcessingFunction = function createProcessingFunction(store, deferredUploadId, collection) {
   var offset = 0;
   return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunks) {
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(chunks) {
+      return _regenerator.default.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.t0 = store;
-              _context3.next = 3;
+              _context4.t0 = store;
+              _context4.next = 3;
               return deferredUploadId;
 
             case 3:
-              _context3.t1 = _context3.sent;
-              _context3.t2 = {
+              _context4.t1 = _context4.sent;
+              _context4.t2 = {
                 chunks: hashedChunks(chunks),
                 offset: offset
               };
-              _context3.t3 = collection;
-              _context3.next = 8;
-              return _context3.t0.appendChunksToUpload.call(_context3.t0, _context3.t1, _context3.t2, _context3.t3);
+              _context4.t3 = collection;
+              _context4.next = 8;
+              return _context4.t0.appendChunksToUpload.call(_context4.t0, _context4.t1, _context4.t2, _context4.t3);
 
             case 8:
               offset += chunks.length;
 
             case 9:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
 
-    return function (_x3) {
-      return _ref3.apply(this, arguments);
+    return function (_x4) {
+      return _ref4.apply(this, arguments);
     };
   }();
 };
 
 var createFileFromUpload = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(file, store, uploadableFileUpfrontIds, uploadId) {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId) {
     var collection, name, mimeType, id, occurrenceKey;
-    return _regenerator.default.wrap(function _callee4$(_context4) {
+    return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
             collection = file.collection, name = file.name, mimeType = file.mimeType;
             id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
-            return _context4.abrupt("return", store.createFileFromUpload({
+            return _context5.abrupt("return", store.createFileFromUpload({
               uploadId: uploadId,
               name: name,
               mimeType: mimeType
@@ -156,14 +231,14 @@ var createFileFromUpload = /*#__PURE__*/function () {
 
           case 3:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
 
-  return function createFileFromUpload(_x4, _x5, _x6, _x7) {
-    return _ref4.apply(this, arguments);
+  return function createFileFromUpload(_x5, _x6, _x7, _x8) {
+    return _ref5.apply(this, arguments);
   };
 }();
 
@@ -200,8 +275,8 @@ var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, call
     probingBatchSize: 100,
     chunkSize: chunkSize,
     uploadingConcurrency: 3,
-    uploadingFunction: createUploadingFunction(store, collection),
-    probingFunction: createProbingFunction(store, collection),
+    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection),
+    probingFunction: createProbingFunction(store, deferredUploadId, collection),
     processingBatchSize: _constants.PROCESSING_BATCH_SIZE,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection)
   }, {

package/dist/cjs/utils/{toMediaSubscribable.js → mediaSubscribable/fromObservable.js}

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMediaSubscribable = createMediaSubscribable;
-exports.toMediaSubscribable = toMediaSubscribable;
+exports.fromObservable = fromObservable;
 
-var _createMediaSubject = require("./createMediaSubject");
+var _createMediaSubject = require("../createMediaSubject");
 
-function toMediaSubscribable(observable) {
+function fromObservable(observable) {
   return {
     subscribe: function subscribe(observer) {
       var subscription = // This is needed to handle "subscribe" function overload.
@@ -24,5 +24,5 @@ function toMediaSubscribable(observable) {
 }
 
 function createMediaSubscribable(mediaSubscribableItem) {
-  return toMediaSubscribable((0, _createMediaSubject.createMediaSubject)(mediaSubscribableItem));
+  return fromObservable((0, _createMediaSubject.createMediaSubject)(mediaSubscribableItem));
 }

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "createMediaSubscribable", {
+  enumerable: true,
+  get: function get() {
+    return _fromObservable.createMediaSubscribable;
+  }
+});
+Object.defineProperty(exports, "fromObservable", {
+  enumerable: true,
+  get: function get() {
+    return _fromObservable.fromObservable;
+  }
+});
+Object.defineProperty(exports, "toPromise", {
+  enumerable: true,
+  get: function get() {
+    return _toPromise.toPromise;
+  }
+});
+
+var _toPromise = require("./toPromise");
+
+var _fromObservable = require("./fromObservable");

package/dist/cjs/utils/{mediaSubscribableToPromise.js → mediaSubscribable/toPromise.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mediaSubscribableToPromise = void 0;
+exports.toPromise = void 0;
 
 var _Subscription = require("rxjs/Subscription");
 
@@ -13,7 +13,7 @@ var _Subscription = require("rxjs/Subscription");
  * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
  * @param subscription a default Subscription (this parameter exists for testing purpose)
  */
-var mediaSubscribableToPromise = function mediaSubscribableToPromise(mediaSubscribable) {
+var toPromise = function toPromise(mediaSubscribable) {
   var subscription = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _Subscription.Subscription();
   return new Promise(function (resolve, reject) {
     return subscription.add(mediaSubscribable.subscribe({
@@ -29,4 +29,4 @@ var mediaSubscribableToPromise = function mediaSubscribableToPromise(mediaSubscr
   });
 };
 
-exports.mediaSubscribableToPromise = mediaSubscribableToPromise;
+exports.toPromise = toPromise;

package/dist/cjs/utils/mediaSubscribable/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/version.json

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

package/dist/es2019/client/collection-fetcher.js

@@ -1,7 +1,7 @@
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
-import { toMediaSubscribable } from '../utils/toMediaSubscribable';
+import { fromObservable } from '../utils/mediaSubscribable';
 export const collectionCache = {};
 
 const createCacheEntry = () => ({
@@ -67,7 +67,7 @@ export class CollectionFetcher {
       collection.nextInclusiveStartKey = nextInclusiveStartKey;
       subject.next(collection.items);
     }).catch(error => subject.error(error));
-    return toMediaSubscribable(subject);
+    return fromObservable(subject);
   }
 
   async removeFile(id, collectionName, occurrenceKey) {

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

@@ -21,14 +21,13 @@ import { createFileDataloader } from '../../utils/createFileDataLoader';
 import { getMediaTypeFromUploadableFile } from '../../utils/getMediaTypeFromUploadableFile';
 import { overrideMediaTypeIfUnknown } from '../../utils/overrideMediaTypeIfUnknown';
 import { convertBase64ToBlob } from '../../utils/convertBase64ToBlob';
-import { mediaSubscribableToPromise } from '../../utils/mediaSubscribableToPromise';
+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 { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
-import { toMediaSubscribable } from '../../utils/toMediaSubscribable';
 export { isFileFetcherError, FileFetcherError } from './error';
 export class FileFetcherImpl {
   constructor(mediaStore) {
@@ -91,14 +90,14 @@ export class FileFetcherImpl {
         collectionName,
         occurrenceKey
       }));
-      return toMediaSubscribable(subject);
+      return fromObservable(subject);
     }
 
-    return toMediaSubscribable(getFileStreamsCache().getOrInsert(id, () => this.createDownloadFileStream(id, collectionName)));
+    return fromObservable(getFileStreamsCache().getOrInsert(id, () => this.createDownloadFileStream(id, collectionName)));
   }
 
   getCurrentState(id, options) {
-    return mediaSubscribableToPromise(this.getFileState(id, options));
+    return toPromise(this.getFileState(id, options));
   }
 
   getArtifactURL(artifacts, artifactName, collectionName) {
@@ -307,7 +306,7 @@ export class FileFetcherImpl {
       });
     }
 
-    return toMediaSubscribable(subject);
+    return fromObservable(subject);
   }
 
   async downloadBinary(id, name = 'download', collectionName) {

package/dist/es2019/index.js

@@ -25,7 +25,7 @@ export { isFileIdentifier, isExternalImageIdentifier, isDifferentIdentifier } fr
 export { withMediaClient, getMediaClient } from './utils/with-media-client-hoc';
 export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString } from './utils/url';
-export { createMediaSubscribable } from './utils/toMediaSubscribable';
+export { createMediaSubscribable } from './utils/mediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants'; // TODO MEX-659 Remove these exports when all the usages from media-client are replaced with media-common.
 
 import { getMediaTypeFromMimeType as _getMediaTypeFromMimeType, isImageMimeTypeSupportedByBrowser as _isImageMimeTypeSupportedByBrowser, isDocumentMimeTypeSupportedByBrowser as _isDocumentMimeTypeSupportedByBrowser, isMimeTypeSupportedByBrowser as _isMimeTypeSupportedByBrowser, isImageMimeTypeSupportedByServer as _isImageMimeTypeSupportedByServer, isDocumentMimeTypeSupportedByServer as _isDocumentMimeTypeSupportedByServer, isAudioMimeTypeSupportedByServer as _isAudioMimeTypeSupportedByServer, isVideoMimeTypeSupportedByServer as _isVideoMimeTypeSupportedByServer, isUnknownMimeTypeSupportedByServer as _isUnknownMimeTypeSupportedByServer, isMimeTypeSupportedByServer as _isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';

package/dist/es2019/uploader/index.js

@@ -12,17 +12,23 @@ const hashingFunction = async blob => {
   return hasher.hash(blob);
 };
 
-const createProbingFunction = (store, collectionName) => async chunks => {
+const createProbingFunction = (store, deferredUploadId, collectionName) => async chunks => {
   const response = await store.probeChunks(hashedChunks(chunks), {
-    collectionName
+    collectionName,
+    uploadId: getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? await deferredUploadId : undefined
   });
   const results = response.data.results;
   return Object.values(results).map(result => result.exists);
 };
 
-const createUploadingFunction = (store, collectionName) => {
-  return chunk => store.uploadChunk(chunk.hash, chunk.blob, {
-    collectionName
+const createUploadingFunction = (store, deferredUploadId, collectionName) => async chunk => {
+  const options = getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? {
+    partNumber: chunk.partNumber,
+    uploadId: await deferredUploadId
+  } : {};
+  return await store.uploadChunk(chunk.hash, chunk.blob, {
+    collectionName,
+    ...options
   });
 };
 
@@ -95,8 +101,8 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) =>
     probingBatchSize: 100,
     chunkSize,
     uploadingConcurrency: 3,
-    uploadingFunction: createUploadingFunction(store, collection),
-    probingFunction: createProbingFunction(store, collection),
+    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection),
+    probingFunction: createProbingFunction(store, deferredUploadId, collection),
     processingBatchSize: PROCESSING_BATCH_SIZE,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection)
   }, {

package/dist/es2019/utils/{toMediaSubscribable.js → mediaSubscribable/fromObservable.js}

@@ -1,5 +1,5 @@
-import { createMediaSubject } from './createMediaSubject';
-export function toMediaSubscribable(observable) {
+import { createMediaSubject } from '../createMediaSubject';
+export function fromObservable(observable) {
   return {
     subscribe: observer => {
       const subscription = // This is needed to handle "subscribe" function overload.
@@ -14,5 +14,5 @@ export function toMediaSubscribable(observable) {
   };
 }
 export function createMediaSubscribable(mediaSubscribableItem) {
-  return toMediaSubscribable(createMediaSubject(mediaSubscribableItem));
+  return fromObservable(createMediaSubject(mediaSubscribableItem));
 }

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

@@ -0,0 +1,2 @@
+export { toPromise } from './toPromise';
+export { createMediaSubscribable, fromObservable } from './fromObservable';

package/dist/es2019/utils/{mediaSubscribableToPromise.js → mediaSubscribable/toPromise.js}

@@ -6,7 +6,7 @@ import { Subscription } from 'rxjs/Subscription';
  * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
  * @param subscription a default Subscription (this parameter exists for testing purpose)
  */
-export const mediaSubscribableToPromise = (mediaSubscribable, subscription = new Subscription()) => {
+export const toPromise = (mediaSubscribable, subscription = new Subscription()) => {
   return new Promise((resolve, reject) => subscription.add(mediaSubscribable.subscribe({
     next: state => {
       resolve(state);

package/dist/es2019/utils/mediaSubscribable/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/version.json

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

package/dist/esm/client/collection-fetcher.js

@@ -1,9 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+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; }
 
@@ -12,7 +12,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
-import { toMediaSubscribable } from '../utils/toMediaSubscribable';
+import { fromObservable } from '../utils/mediaSubscribable';
 export var collectionCache = {};
 
 var createCacheEntry = function createCacheEntry() {
@@ -98,7 +98,7 @@ export var CollectionFetcher = /*#__PURE__*/function () {
       }).catch(function (error) {
         return subject.error(error);
       });
-      return toMediaSubscribable(subject);
+      return fromObservable(subject);
     }
   }, {
     key: "removeFile",