chore: resolve conflicts

nestjs · Jan 17, 2025 · d6885ba · d6885ba
2 parents 2c011fa + 1f7e661
commit d6885ba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9,254 deletions.
diff --git a/lib/common/typeorm.utils.ts b/lib/common/typeorm.utils.ts
@@ -10,7 +10,6 @@ import {
   EntitySchema,
   Repository,
 } from 'typeorm';
-import { v4 as uuid } from 'uuid';
 import { CircularDependencyException } from '../exceptions/circular-dependency.exception';
 import { EntityClassOrSchema } from '../interfaces/entity-class-or-schema.type';
 import { DEFAULT_DATA_SOURCE_NAME } from '../typeorm.constants';
@@ -178,4 +177,4 @@ export function getDataSourceName(options: DataSourceOptions): string {
   return options && options.name ? options.name : DEFAULT_DATA_SOURCE_NAME;
 }
 
-export const generateString = (): string => uuid();
+export const generateString = (): string => crypto.randomUUID();