Use platform native UUID generation

davidje13 · Oct 28, 2023 · 4dcb35b · 4dcb35b
1 parent c81f147
commit 4dcb35b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 98 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -23,7 +23,6 @@
     "pwd-hasher": "1.x",
     "shared-reducer-backend": "3.x",
     "tslib": "2.6.x",
-    "uuid": "9.x",
     "websocket-express": "3.x",
     "ws": "8.x"
   },
@@ -36,7 +35,6 @@
     "@rollup/plugin-typescript": "11.x",
     "@tsconfig/strictest": "2.x",
     "@types/node": "20.x",
-    "@types/uuid": "9.x",
     "http-proxy-middleware": "2.x",
     "lean-test": "2.x",
     "prettier": "3.0.3",

diff --git a/backend/src/export/RetroJsonExport.ts b/backend/src/export/RetroJsonExport.ts
@@ -1,4 +1,4 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'node:crypto';
 import {
   type Retro,
   type RetroData,
@@ -86,7 +86,7 @@ export function exportRetroItem(item: RetroItem): RetroItemJsonExport {
 
 export function importRetroItem(item: RetroItemJsonExport): RetroItem {
   return {
-    id: uuidv4(),
+    id: randomUUID(),
     created: importTimestamp(item.created),
     category: item.category,
     group: item.group,

diff --git a/backend/src/services/RetroArchiveService.ts b/backend/src/services/RetroArchiveService.ts
@@ -1,4 +1,4 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'node:crypto';
 import { type Collection, type DB } from 'collection-storage';
 import { encryptByRecordWithMasterKey } from '../import-wrappers/collection-storage-wrap';
 import {
@@ -28,7 +28,7 @@ export class RetroArchiveService {
     data: RetroData,
     created?: number,
   ): Promise<string> {
-    const id = uuidv4();
+    const id = randomUUID();
     const now = Date.now();
 
     await this.archiveCollection.add({

diff --git a/backend/src/services/RetroService.ts b/backend/src/services/RetroService.ts
@@ -1,6 +1,6 @@
+import { randomUUID } from 'node:crypto';
 import listCommands from 'json-immutability-helper/commands/list';
 import { context, type Spec } from 'json-immutability-helper';
-import { v4 as uuidv4 } from 'uuid';
 import { type Collection, type DB } from 'collection-storage';
 import {
   encryptByRecordWithMasterKey,
@@ -93,7 +93,7 @@ export class RetroService {
     format: string,
   ): Promise<string> {
     validateSlug(slug);
-    const id = uuidv4();
+    const id = randomUUID();
 
     try {
       await this.retroCollection.add({

diff --git a/frontend/src/actions/retro.ts b/frontend/src/actions/retro.ts
@@ -4,7 +4,6 @@ import {
   type UserProvidedRetroItemDetails,
 } from '../shared/api-entities';
 import { type RetroDispatchSpec } from '../api/RetroTracker';
-import { uuidv4 } from '../helpers/uuidv4';
 
 const IRRELEVANT_WHITESPACE = /[ \t\v]+/g;
 const PADDING = /^[ \r\n]+|[ \r\n]+$/g;
@@ -34,7 +33,7 @@ export const addRetroItem = (
   }
 
   const item: RetroItem = {
-    id: uuidv4(),
+    id: crypto.randomUUID(),
     category,
     group,
     created: Date.now(),

diff --git a/frontend/src/helpers/uuidv4.ts b/frontend/src/helpers/uuidv4.ts