@atlaskit/media-client 36.0.5 → 36.1.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/media-client
 
+## 36.1.0
+
+### Minor Changes
+
+- [`5653e8be24c05`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5653e8be24c05) -
+  Replace `uuid-validate` with an inlined, browser-only `isValidUuid` helper in
+  `@atlaskit/media-common`. Removes the `uuid-validate` dependency from `media-card`,
+  `media-client`, `media-common` and `media-picker` so consumers no longer pull in the Node `Buffer`
+  polyfill purely for a `Buffer.isBuffer` check that always returned `false` in the browser.
+
+  Adds a new `@atlaskit/media-common/isValidUuid` subpath export so consumers can import the helper
+  without going through the package's barrel file (in line with the Debarreling Platform Packages
+  initiative).
+
+### Patch Changes
+
+- Updated dependencies
+
+## 36.0.6
+
+### Patch Changes
+
+- [`4a6982674a571`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a6982674a571) -
+  Anonymize filename in uploadExternal behind platform_media_upload_external_anonymize_filename
+  feature flag
+
 ## 36.0.5
 
 ### Patch Changes

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

@@ -26,6 +26,8 @@ var _Subscription = require("rxjs/Subscription");
 var _map = require("rxjs/operators/map");
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _mediaCore = require("@atlaskit/media-core");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isValidUuid = require("@atlaskit/media-common/isValidUuid");
 var _downloadUrl = require("@atlaskit/media-common/downloadUrl");
 var _mediaStore = require("../media-store");
 var _fileState2 = require("../../models/file-state");
@@ -35,7 +37,6 @@ var _uploader = require("../../uploader");
 var _fileStreamsCache = require("../../file-streams-cache");
 var _globalMediaEventEmitter = require("../../globalMediaEventEmitter");
 var _constants = require("../../constants");
-var _uuidValidate = _interopRequireDefault(require("uuid-validate"));
 var _createFileDataLoader = require("../../utils/createFileDataLoader");
 var _getMediaTypeFromUploadableFile = require("../../utils/getMediaTypeFromUploadableFile");
 var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknown");
@@ -464,7 +465,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
         occurrenceKey = options.occurrenceKey,
         includeHashForDuplicateFiles = options.includeHashForDuplicateFiles,
         forceRefresh = options.forceRefresh;
-      if (!(0, _uuidValidate.default)(id)) {
+      if (!(0, _isValidUuid.isValidUuid)(id)) {
         var subject = (0, _createMediaSubject.createMediaSubject)();
         var err = new _error.FileFetcherError('invalidFileId', {
           id: id,
@@ -585,7 +586,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                   return _ref0.apply(this, arguments);
                 };
               }());
-              name = url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
+              name = (0, _platformFeatureFlags.fg)('platform_media_upload_external_anonymize_filename') ? crypto.randomUUID() : url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
               fileState = {
                 status: 'processing',
                 name: name,

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

@@ -4,6 +4,8 @@ import { map } from 'rxjs/operators/map';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { isValidUuid } from '@atlaskit/media-common/isValidUuid';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
 import { MediaStore as MediaApi } from '../media-store';
 import { isErrorFileState, isFinalFileState, isProcessingFileState, mapMediaFileToFileState, mapMediaItemToFileState } from '../../models/file-state';
@@ -13,7 +15,6 @@ import { uploadFile } from '../../uploader';
 import { getFileStreamsCache } from '../../file-streams-cache';
 import { globalMediaEventEmitter } from '../../globalMediaEventEmitter';
 import { RECENTS_COLLECTION } from '../../constants';
-import isValidId from 'uuid-validate';
 import { createFileDataloader } from '../../utils/createFileDataLoader';
 import { getMediaTypeFromUploadableFile } from '../../utils/getMediaTypeFromUploadableFile';
 import { overrideMediaTypeIfUnknown } from '../../utils/overrideMediaTypeIfUnknown';
@@ -276,7 +277,7 @@ export class FileFetcherImpl {
       includeHashForDuplicateFiles,
       forceRefresh
     } = options;
-    if (!isValidId(id)) {
+    if (!isValidUuid(id)) {
       const subject = createMediaSubject();
       const err = new FileFetcherError('invalidFileId', {
         id,
@@ -358,7 +359,7 @@ export class FileFetcherImpl {
         origin: 'remote'
       });
     });
-    const name = url.split('/').pop() || '';
+    const name = fg('platform_media_upload_external_anonymize_filename') ? crypto.randomUUID() : url.split('/').pop() || '';
     // we create a initial fileState with the minimum info that we have at this point
     const fileState = {
       status: 'processing',

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

@@ -10,6 +10,8 @@ import { map } from 'rxjs/operators/map';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { isValidUuid } from '@atlaskit/media-common/isValidUuid';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
 import { MediaStore as MediaApi } from '../media-store';
 import { isErrorFileState, isFinalFileState, isProcessingFileState, mapMediaFileToFileState, mapMediaItemToFileState } from '../../models/file-state';
@@ -19,7 +21,6 @@ import { uploadFile } from '../../uploader';
 import { getFileStreamsCache } from '../../file-streams-cache';
 import { globalMediaEventEmitter } from '../../globalMediaEventEmitter';
 import { RECENTS_COLLECTION } from '../../constants';
-import isValidId from 'uuid-validate';
 import { createFileDataloader } from '../../utils/createFileDataLoader';
 import { getMediaTypeFromUploadableFile } from '../../utils/getMediaTypeFromUploadableFile';
 import { overrideMediaTypeIfUnknown } from '../../utils/overrideMediaTypeIfUnknown';
@@ -447,7 +448,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         occurrenceKey = options.occurrenceKey,
         includeHashForDuplicateFiles = options.includeHashForDuplicateFiles,
         forceRefresh = options.forceRefresh;
-      if (!isValidId(id)) {
+      if (!isValidUuid(id)) {
         var subject = createMediaSubject();
         var err = new FileFetcherError('invalidFileId', {
           id: id,
@@ -568,7 +569,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   return _ref0.apply(this, arguments);
                 };
               }());
-              name = url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
+              name = fg('platform_media_upload_external_anonymize_filename') ? crypto.randomUUID() : url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
               fileState = {
                 status: 'processing',
                 name: name,

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

@@ -1,4 +1,5 @@
 import { type AuthProvider } from '@atlaskit/media-core';
+import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type MediaFileArtifacts } from '@atlaskit/media-state';
 import { MediaStore as MediaApi, type MediaStoreCopyFileWithTokenParams, type TouchedFiles, type TouchFileDescriptor } from '../media-store';
 import { type GetFileOptions } from '../../models/file-state';
@@ -7,7 +8,6 @@ import { type UploadableFile, type UploadableFileUpfrontIds } from '../../upload
 import { type UploadController } from '../../upload-controller';
 import { type MediaSubscribable } from '../../utils/mediaSubscribable';
 import { type Dimensions } from '../../utils/getDimensionsFromBlob';
-import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type FilePreview, type FileState, type MediaStore } from '@atlaskit/media-state';
 import { type UploadArtifactParams } from '../media-store/types';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason } from './error';

package/dist/types/uploader/error.d.ts

@@ -18,7 +18,7 @@ export declare class UploaderError extends BaseMediaClientError<UploaderErrorRea
     constructor(reason: UploaderErrorReason, metadata: UploaderErrorMetadata);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
-        reason: "fileSizeExceedsLimit";
+        reason: 'fileSizeExceedsLimit';
         id: string;
         collectionName: string | undefined;
         occurrenceKey: string | undefined;

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

@@ -27,4 +27,4 @@ export type FileIdsByCollection = {
  * @param mediaStore instance of MediaStore
  */
 export declare function createBatchLoadingFunc(mediaStore: MediaStore): (keys: ReadonlyArray<DataloaderKey>) => Promise<Array<DataloaderResult | Error>>;
-export declare function createFileDataloader(mediaStore: MediaStore): Dataloader<DataloaderKey, DataloaderResult, DataloaderKey>;
+export declare function createFileDataloader(mediaStore: MediaStore): Dataloader<DataloaderKey, DataloaderResult>;

package/dist/types/utils/polling/errors.d.ts

@@ -4,7 +4,7 @@ export declare class PollingError extends BaseMediaClientError<PollingErrorReaso
     constructor(reason: PollingErrorReason, metadata: PollingErrorMetadata);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
-        reason: "pollingMaxAttemptsExceeded";
+        reason: 'pollingMaxAttemptsExceeded';
         attempts: number;
     };
 }

package/dist/types/utils/request/errors.d.ts

@@ -1,11 +1,12 @@
+import type { MediaTraceContext } from '@atlaskit/media-common';
 import { BaseMediaClientError } from '../../models/errors';
-import { type RequestErrorReason, type RequestErrorMetadata, type RequestErrorAttributes } from './types';
+import { type RequestErrorReason, type RequestErrorMetadata, type RequestErrorAttributes, type RequestMethod } from './types';
 export declare class RequestError extends BaseMediaClientError<RequestErrorReason, RequestErrorMetadata | undefined, Error | undefined, RequestErrorAttributes> {
     constructor(reason: RequestErrorReason, metadata?: RequestErrorMetadata, innerError?: Error);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
         reason: RequestErrorReason;
-        method: import("./types").RequestMethod | undefined;
+        method: RequestMethod | undefined;
         endpoint: string | undefined;
         mediaRegion: string | undefined;
         mediaEnv: string | undefined;
@@ -13,7 +14,7 @@ export declare class RequestError extends BaseMediaClientError<RequestErrorReaso
         clientExhaustedRetries: boolean | undefined;
         statusCode: number | undefined;
         metadata: {
-            traceContext: import("@atlaskit/media-common").MediaTraceContext | undefined;
+            traceContext: MediaTraceContext | undefined;
         };
         innerError: Error | undefined;
     };

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

@@ -1,4 +1,5 @@
 import { type AuthProvider } from '@atlaskit/media-core';
+import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type MediaFileArtifacts } from '@atlaskit/media-state';
 import { MediaStore as MediaApi, type MediaStoreCopyFileWithTokenParams, type TouchedFiles, type TouchFileDescriptor } from '../media-store';
 import { type GetFileOptions } from '../../models/file-state';
@@ -7,7 +8,6 @@ import { type UploadableFile, type UploadableFileUpfrontIds } from '../../upload
 import { type UploadController } from '../../upload-controller';
 import { type MediaSubscribable } from '../../utils/mediaSubscribable';
 import { type Dimensions } from '../../utils/getDimensionsFromBlob';
-import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type FilePreview, type FileState, type MediaStore } from '@atlaskit/media-state';
 import { type UploadArtifactParams } from '../media-store/types';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason } from './error';

package/dist/types-ts4.5/uploader/error.d.ts

@@ -18,7 +18,7 @@ export declare class UploaderError extends BaseMediaClientError<UploaderErrorRea
     constructor(reason: UploaderErrorReason, metadata: UploaderErrorMetadata);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
-        reason: "fileSizeExceedsLimit";
+        reason: 'fileSizeExceedsLimit';
         id: string;
         collectionName: string | undefined;
         occurrenceKey: string | undefined;

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

@@ -27,4 +27,4 @@ export type FileIdsByCollection = {
  * @param mediaStore instance of MediaStore
  */
 export declare function createBatchLoadingFunc(mediaStore: MediaStore): (keys: ReadonlyArray<DataloaderKey>) => Promise<Array<DataloaderResult | Error>>;
-export declare function createFileDataloader(mediaStore: MediaStore): Dataloader<DataloaderKey, DataloaderResult, DataloaderKey>;
+export declare function createFileDataloader(mediaStore: MediaStore): Dataloader<DataloaderKey, DataloaderResult>;

package/dist/types-ts4.5/utils/polling/errors.d.ts

@@ -4,7 +4,7 @@ export declare class PollingError extends BaseMediaClientError<PollingErrorReaso
     constructor(reason: PollingErrorReason, metadata: PollingErrorMetadata);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
-        reason: "pollingMaxAttemptsExceeded";
+        reason: 'pollingMaxAttemptsExceeded';
         attempts: number;
     };
 }

package/dist/types-ts4.5/utils/request/errors.d.ts

@@ -1,11 +1,12 @@
+import type { MediaTraceContext } from '@atlaskit/media-common';
 import { BaseMediaClientError } from '../../models/errors';
-import { type RequestErrorReason, type RequestErrorMetadata, type RequestErrorAttributes } from './types';
+import { type RequestErrorReason, type RequestErrorMetadata, type RequestErrorAttributes, type RequestMethod } from './types';
 export declare class RequestError extends BaseMediaClientError<RequestErrorReason, RequestErrorMetadata | undefined, Error | undefined, RequestErrorAttributes> {
     constructor(reason: RequestErrorReason, metadata?: RequestErrorMetadata, innerError?: Error);
     /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
         reason: RequestErrorReason;
-        method: import("./types").RequestMethod | undefined;
+        method: RequestMethod | undefined;
         endpoint: string | undefined;
         mediaRegion: string | undefined;
         mediaEnv: string | undefined;
@@ -13,7 +14,7 @@ export declare class RequestError extends BaseMediaClientError<RequestErrorReaso
         clientExhaustedRetries: boolean | undefined;
         statusCode: number | undefined;
         metadata: {
-            traceContext: import("@atlaskit/media-common").MediaTraceContext | undefined;
+            traceContext: MediaTraceContext | undefined;
         };
         innerError: Error | undefined;
     };

package/example-helpers/styles.ts

@@ -1,32 +1,32 @@
 import { token } from '@atlaskit/tokens';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { css } from '@emotion/react';
+import { css, type SerializedStyles } from '@emotion/react';
 import { type FileStatus } from '../src';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const wrapperStyles = css({
+export const wrapperStyles: SerializedStyles = css({
 	display: 'flex',
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const imagePreviewStyles = css({
+export const imagePreviewStyles: SerializedStyles = css({
 	width: '300px',
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const previewWrapperStyles = css({
+export const previewWrapperStyles: SerializedStyles = css({
 	flex: 1,
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const metadataWrapperStyles = css({
+export const metadataWrapperStyles: SerializedStyles = css({
 	width: '400px',
 	overflow: 'scroll',
 	flex: 1,
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const fileInputStyles = css({
+export const fileInputStyles: SerializedStyles = css({
 	color: 'transparent',
 });
 
@@ -44,7 +44,7 @@ const statusColorMap: { [key in FileStatus]: string } = {
 };
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-export const fileWrapperStyles = (status: FileStatus) =>
+export const fileWrapperStyles = (status: FileStatus): SerializedStyles =>
 	css({
 		padding: '5px',
 		margin: '10px',
@@ -55,7 +55,7 @@ export const fileWrapperStyles = (status: FileStatus) =>
 	});
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const cardsWrapperStyles = css({
+export const cardsWrapperStyles: SerializedStyles = css({
 	width: '900px',
 	padding: '10px',
 	borderRight: `${token('border.width', '1px')} solid ${token('color.border')}`,
@@ -73,7 +73,7 @@ export const cardsWrapperStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const headerStyles = css({
+export const headerStyles: SerializedStyles = css({
 	// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
 	button: {
 		margin: '5px',
@@ -81,7 +81,7 @@ export const headerStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const fileStateWrapperStyles = css({
+export const fileStateWrapperStyles: SerializedStyles = css({
 	border: `${token('border.width', '1px')} solid ${token('color.border')}`,
 	margin: '10px',
 	padding: '10px',
@@ -89,7 +89,7 @@ export const fileStateWrapperStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const uploadTouchWrapperStyles = css({
+export const uploadTouchWrapperStyles: SerializedStyles = css({
 	height: '100%',
 	width: '100%',
 	display: 'flex',
@@ -101,7 +101,7 @@ export const uploadTouchWrapperStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const rowStyles = css({
+export const rowStyles: SerializedStyles = css({
 	flexDirection: 'row',
 	justifyContent: 'center',
 	// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -111,7 +111,7 @@ export const rowStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const responseStyles = css({
+export const responseStyles: SerializedStyles = css({
 	// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
 	fontFamily: 'monospace',
 	whiteSpace: 'pre',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "36.0.5",
+	"version": "36.1.0",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,8 +30,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/atlassian-context": "^0.8.0",
-		"@atlaskit/chunkinator": "^7.0.0",
-		"@atlaskit/media-common": "^13.0.0",
+		"@atlaskit/chunkinator": "^7.1.0",
+		"@atlaskit/media-common": "^13.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
@@ -42,23 +42,21 @@
 		"rusha": "^0.8.13",
 		"rxjs": "^5.5.0",
 		"uuid": "^3.1.0",
-		"uuid-validate": "^0.0.3",
 		"xstate": "4.20.0"
 	},
 	"peerDependencies": {
 		"@atlaskit/media-core": "^37.0.0",
-		"@atlaskit/media-state": "^2.0.0"
+		"@atlaskit/media-state": "^2.1.0"
 	},
 	"devDependencies": {
 		"@atlaskit/media-core": "^37.0.0",
-		"@atlaskit/media-state": "^2.0.0",
+		"@atlaskit/media-state": "^2.1.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^11.4.0",
+		"@atlaskit/tokens": "^13.0.0",
 		"@atlassian/a11y-jest-testing": "^0.11.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@emotion/react": "^11.7.1",
 		"@types/deep-equal": "^1.0.1",
-		"@types/uuid-validate": "^0.0.2",
 		"fetch-mock": "^8.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
@@ -77,6 +75,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_media_upload_external_anonymize_filename": {
+			"type": "boolean"
+		},
 		"platform_media_cdn_single_host": {
 			"type": "boolean"
 		},