From f6190db2130c7a26835792fd8863b6ec0d423513 Mon Sep 17 00:00:00 2001
From: Xymorot <xymorot@mailbox.org>
Date: Mon, 2 Mar 2020 23:31:50 +0100
Subject: [PATCH] update: upgrade uuid to major version 7

---
 declarations/uuid.d.ts | 17 -----------------
 package-lock.json      | 23 ++++++++++++++++++++---
 package.json           |  3 ++-
 src/services/uuid.ts   |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 declarations/uuid.d.ts

diff --git a/declarations/uuid.d.ts b/declarations/uuid.d.ts
deleted file mode 100644
index 440d069..0000000
--- a/declarations/uuid.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// this declaration is based on https://github.com/uuidjs/uuid/blob/v3.4.0/README.md
-
-type UuidOptions = {
-  node?: number[];
-  clockseq?: number;
-  msecs?: number;
-  nescs?: number;
-};
-
-declare module 'uuid/v1' {
-  const v1: (options?: UuidOptions, buf?: number[] | Buffer, offset?: number) => string;
-  export = v1;
-}
-
-declare module 'uuid/v3';
-declare module 'uuid/v4';
-declare module 'uuid/v5';
diff --git a/package-lock.json b/package-lock.json
index a5b4792..6ff3e5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -760,6 +760,12 @@
         "source-map": "^0.6.1"
       }
     },
+    "@types/uuid": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.0.tgz",
+      "integrity": "sha512-RiX1I0lK9WFLFqy2xOxke396f0wKIzk5sAll0tL4J4XDYJXURI7JOs96XQb3nP+2gEpQ/LutBb66jgiT5oQshQ==",
+      "dev": true
+    },
     "@types/webdriverio": {
       "version": "4.13.3",
       "resolved": "https://registry.npmjs.org/@types/webdriverio/-/webdriverio-4.13.3.tgz",
@@ -7177,6 +7183,12 @@
           "requires": {
             "locate-path": "^3.0.0"
           }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -8324,6 +8336,11 @@
             "psl": "^1.1.24",
             "punycode": "^1.4.1"
           }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -10105,9 +10122,9 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.1.tgz",
+      "integrity": "sha512-yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="
     },
     "v8-compile-cache": {
       "version": "2.1.0",
diff --git a/package.json b/package.json
index 1a9e077..581280c 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "reflect-metadata": "^0.1.13",
     "sqlite3": "^4.1.1",
     "typeorm": "^0.2.21",
-    "uuid": "^3.3.3"
+    "uuid": "^7.0.1"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.0.0-beta.50",
@@ -63,6 +63,7 @@
     "@types/node": "^12.12.29",
     "@types/node-fetch": "^2.5.5",
     "@types/sinon": "^7.5.2",
+    "@types/uuid": "^7.0.0",
     "@types/webdriverio": "^4.13.3",
     "@types/webpack": "^4.41.7",
     "@typescript-eslint/eslint-plugin": "^2.22.0",
diff --git a/src/services/uuid.ts b/src/services/uuid.ts
index 238d864..b7966ca 100644
--- a/src/services/uuid.ts
+++ b/src/services/uuid.ts
@@ -1,4 +1,4 @@
-import uuidv1 from 'uuid/v1';
+import { v1 as uuidv1 } from 'uuid';
 
 const R = 0x52;
 const e = 0x65;