@atlaskit/media-common 13.1.0 → 13.2.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/media-common
 
+## 13.2.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).
+
 ## 13.1.0
 
 ### Minor Changes

package/dist/cjs/analytics/sanitisePayload.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sanitiseAnalyticsPayload = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _uuidValidate = _interopRequireDefault(require("uuid-validate"));
 var _immer = require("immer");
+var _isValidUuid = require("../utils/isValidUuid");
 var sanitiseFileId = function sanitiseFileId(draft) {
   var fileId = draft.attributes.fileAttributes.fileId;
-  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || (0, _uuidValidate.default)(fileId) ? fileId : 'INVALID_FILE_ID';
+  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || (0, _isValidUuid.isValidUuid)(fileId) ? fileId : 'INVALID_FILE_ID';
 };
 var hasFileAttributesWithFileId = function hasFileAttributesWithFileId(payload) {
   return 'attributes' in payload && !!payload.attributes && (0, _typeof2.default)(payload.attributes) === 'object' && 'fileAttributes' in payload.attributes && !!payload.attributes.fileAttributes && (0, _typeof2.default)(payload.attributes.fileAttributes) === 'object' && 'fileId' in payload.attributes.fileAttributes && typeof payload.attributes.fileAttributes.fileId === 'string';

package/dist/cjs/utils/isValidUuid.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isValidUuid = void 0;
+var BASIC_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+// Modified copy of `uuid-validate` package
+var isValidUuid = exports.isValidUuid = function isValidUuid(value) {
+  if (typeof value !== 'string') {
+    return false;
+  }
+  var normalizedValue = value.toLowerCase();
+  if (!BASIC_UUID_REGEX.test(normalizedValue)) {
+    return false;
+  }
+  var version = normalizedValue[14];
+  if (version === '1' || version === '2') {
+    return true;
+  }
+  if (version === '3' || version === '4' || version === '5') {
+    var variant = normalizedValue[19];
+    return variant === '8' || variant === '9' || variant === 'a' || variant === 'b';
+  }
+  return false;
+};

package/dist/es2019/analytics/sanitisePayload.js

@@ -1,10 +1,10 @@
-import isValidId from 'uuid-validate';
 import { produce } from 'immer';
+import { isValidUuid } from '../utils/isValidUuid';
 const sanitiseFileId = draft => {
   const {
     fileId
   } = draft.attributes.fileAttributes;
-  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || isValidId(fileId) ? fileId : 'INVALID_FILE_ID';
+  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || isValidUuid(fileId) ? fileId : 'INVALID_FILE_ID';
 };
 const hasFileAttributesWithFileId = payload => 'attributes' in payload && !!payload.attributes && typeof payload.attributes === 'object' && 'fileAttributes' in payload.attributes && !!payload.attributes.fileAttributes && typeof payload.attributes.fileAttributes === 'object' && 'fileId' in payload.attributes.fileAttributes && typeof payload.attributes.fileAttributes.fileId === 'string';
 export const sanitiseAnalyticsPayload = payload => hasFileAttributesWithFileId(payload) ? produce(payload, sanitiseFileId) : payload;

package/dist/es2019/utils/isValidUuid.js

@@ -0,0 +1,21 @@
+const BASIC_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+// Modified copy of `uuid-validate` package
+export const isValidUuid = value => {
+  if (typeof value !== 'string') {
+    return false;
+  }
+  const normalizedValue = value.toLowerCase();
+  if (!BASIC_UUID_REGEX.test(normalizedValue)) {
+    return false;
+  }
+  const version = normalizedValue[14];
+  if (version === '1' || version === '2') {
+    return true;
+  }
+  if (version === '3' || version === '4' || version === '5') {
+    const variant = normalizedValue[19];
+    return variant === '8' || variant === '9' || variant === 'a' || variant === 'b';
+  }
+  return false;
+};

package/dist/esm/analytics/sanitisePayload.js

@@ -1,9 +1,9 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import isValidId from 'uuid-validate';
 import { produce } from 'immer';
+import { isValidUuid } from '../utils/isValidUuid';
 var sanitiseFileId = function sanitiseFileId(draft) {
   var fileId = draft.attributes.fileAttributes.fileId;
-  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || isValidId(fileId) ? fileId : 'INVALID_FILE_ID';
+  draft.attributes.fileAttributes.fileId = fileId === 'external-image' || isValidUuid(fileId) ? fileId : 'INVALID_FILE_ID';
 };
 var hasFileAttributesWithFileId = function hasFileAttributesWithFileId(payload) {
   return 'attributes' in payload && !!payload.attributes && _typeof(payload.attributes) === 'object' && 'fileAttributes' in payload.attributes && !!payload.attributes.fileAttributes && _typeof(payload.attributes.fileAttributes) === 'object' && 'fileId' in payload.attributes.fileAttributes && typeof payload.attributes.fileAttributes.fileId === 'string';

package/dist/esm/utils/isValidUuid.js

@@ -0,0 +1,21 @@
+var BASIC_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+// Modified copy of `uuid-validate` package
+export var isValidUuid = function isValidUuid(value) {
+  if (typeof value !== 'string') {
+    return false;
+  }
+  var normalizedValue = value.toLowerCase();
+  if (!BASIC_UUID_REGEX.test(normalizedValue)) {
+    return false;
+  }
+  var version = normalizedValue[14];
+  if (version === '1' || version === '2') {
+    return true;
+  }
+  if (version === '3' || version === '4' || version === '5') {
+    var variant = normalizedValue[19];
+    return variant === '8' || variant === '9' || variant === 'a' || variant === 'b';
+  }
+  return false;
+};

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

@@ -0,0 +1 @@
+export declare const isValidUuid: (value: unknown) => value is string;

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

@@ -0,0 +1 @@
+export declare const isValidUuid: (value: unknown) => value is string;

package/isValidUuid/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@atlaskit/media-common/isValidUuid",
+  "main": "../dist/cjs/utils/isValidUuid.js",
+  "module": "../dist/esm/utils/isValidUuid.js",
+  "module:es2019": "../dist/es2019/utils/isValidUuid.js",
+  "sideEffects": false,
+  "types": "../dist/types/utils/isValidUuid.d.ts",
+  "typesVersions": {
+    ">=4.5 <5.9": {
+      "*": [
+        "../dist/types-ts4.5/utils/isValidUuid.d.ts"
+      ]
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-common",
-	"version": "13.1.0",
+	"version": "13.2.0",
 	"description": "Includes common utilities used by other media packages",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,8 +35,7 @@
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@babel/runtime": "^7.0.0",
-		"immer": "11.1.4",
-		"uuid-validate": "^0.0.3"
+		"immer": "11.1.4"
 	},
 	"peerDependencies": {
 		"enzyme": ">=3.10.0",
@@ -49,7 +48,6 @@
 		}
 	},
 	"devDependencies": {
-		"@types/uuid-validate": "^0.0.2",
 		"enzyme": "^3.10.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"