From 6061c9672aabf8a779a5d2242ebf25aa42f9b1bd Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Wed, 23 Nov 2022 21:15:42 +0200
Subject: [PATCH] Fix nanoid warning by replacing it with own function

Closes #1160
---
 app/components/Planner.tsx |  4 ++--
 package-lock.json          | 17 -----------------
 package.json               |  1 -
 tsconfig.json              |  2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/components/Planner.tsx b/app/components/Planner.tsx
index 98fd66585..f6458d042 100644
--- a/app/components/Planner.tsx
+++ b/app/components/Planner.tsx
@@ -23,9 +23,9 @@ import {
 } from "~/utils/urls";
 import { Button } from "./Button";
 import { Image } from "./Image";
-import { nanoid } from "nanoid";
 import randomInt from "just-random-integer";
 import type { LanguageCode } from "~/modules/i18n";
+import { semiRandomId } from "~/utils/strings";
 
 export default function Planner() {
   const { t } = useTranslation(["common", "weapons"]);
@@ -81,7 +81,7 @@ export default function Planner() {
       });
 
       app.createShapes({
-        id: nanoid(),
+        id: semiRandomId(),
         type: TDShapeType.Image,
         assetId: src,
         size,
diff --git a/package-lock.json b/package-lock.json
index 51dfb2e4d..4d0db64f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,6 @@
         "just-random-integer": "^4.1.1",
         "just-shuffle": "^4.1.1",
         "markdown-to-jsx": "^7.1.7",
-        "nanoid": "^4.0.0",
         "node-cron": "3.0.2",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -11810,17 +11809,6 @@
         "react-dom": "*"
       }
     },
-    "node_modules/nanoid": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
-      "integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg==",
-      "bin": {
-        "nanoid": "bin/nanoid.js"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      }
-    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -25322,11 +25310,6 @@
         "stylis": "^4.0.6"
       }
     },
-    "nanoid": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
-      "integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg=="
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
diff --git a/package.json b/package.json
index bd66b176d..f9dee72ca 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "just-random-integer": "^4.1.1",
     "just-shuffle": "^4.1.1",
     "markdown-to-jsx": "^7.1.7",
-    "nanoid": "^4.0.0",
     "node-cron": "3.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/tsconfig.json b/tsconfig.json
index 0be48cb13..2cc9ed802 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
   "exclude": ["discord-bot/*"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2019"],
-    "module": "commonjs",
+    "module": "ES2020",
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",