Upgrade npm modules and some minor refactoring to remove redundant variable

3 files changed, 53 insertions, 58 deletions

diff --git a/esbuild.mjs b/esbuild.mjs
index 0df31be47..ae940b586 100755
--- a/esbuild.mjs
+++ b/esbuild.mjs
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { build, serve } from 'esbuild';
+import * as esbuild from 'esbuild';
 import { sassPlugin } from 'esbuild-sass-plugin';
 import { copy } from 'esbuild-plugin-copy';
 import glob from 'tiny-glob';
@@ -60,7 +60,7 @@ const staticAssets = () => [
   }),
 ];
 
-const copyManualAssets = async () => {
+const copyManualAssets = () => {
   if (!fs.existsSync(outDir)) {
     fs.mkdirSync(outDir);
   }
@@ -72,27 +72,21 @@ const copyManualAssets = async () => {
     gitHashShort: buildInfo.gitHashShort,
     gitBranch: buildInfo.gitBranch,
   };
-  await fsPkg.outputJson(`${outDir}/buildInfo.json`, buildInfoData);
+  fsPkg.outputJsonSync(`${outDir}/buildInfo.json`, buildInfoData);
 };
 
 const runEsbuild = async () => {
   const startTime = performance.now();
 
-  let watch = false;
-  let isDev = false;
-
   const myArgs = process.argv.slice(2);
-  if (myArgs.includes('--watch')) {
-    watch = true;
-    isDev = true;
-  }
+  const isDev = myArgs.includes('--watch');
   log(chalk.blue(`Starting with args`), myArgs);
 
   if (fs.existsSync(outDir)) {
     fs.rmSync(outDir, { force: true, recursive: true });
     log(chalk.blue(`Cleaning`), outDir);
   }
-  await copyManualAssets();
+  copyManualAssets();
 
   // Source files
   const entryPoints = await glob('./src/**/*.{ts,tsx,js,jsx}');
@@ -105,7 +99,7 @@ const runEsbuild = async () => {
   );
 
   // Run build
-  await build({
+  await esbuild.build({
     entryPoints,
     format: 'cjs',
     minify: false,
@@ -113,23 +107,22 @@ const runEsbuild = async () => {
     minifyIdentifiers: true,
     keepNames: true,
     outdir: outDir,
-    watch: isDev &&
-      watch && {
-        onRebuild(error, result) {
-          if (error) {
-            log(chalk.red(`watch build failed: ${error}`));
-          } else {
-            log(chalk.blue(`watch build success:`), result);
-            livereload.reload();
-          }
-        },
+    watch: isDev && {
+      onRebuild(error, result) {
+        if (error) {
+          log(chalk.red(`watch build failed: ${error}`));
+        } else {
+          log(chalk.blue(`watch build success:`), result);
+          livereload.reload();
+        }
       },
-    incremental: isDev && watch,
+    },
+    incremental: isDev,
     plugins: [sassPlugin(), ...staticAssets()],
   });
 
-  if (watch) {
-    const serveResult = await serve(
+  if (isDev) {
+    const serveResult = await esbuild.serve(
       {
         servedir: outDir,
         port: 8080,
diff --git a/package.json b/package.json
index 019b28e8c..2ce901a51 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "languagedetect": "2.0.0",
     "lodash": "4.17.21",
     "macos-version": "5.2.1",
-    "markdown-to-jsx": "7.2.0",
+    "markdown-to-jsx": "7.2.1",
     "minimist": "1.2.8",
     "mobx": "6.9.0",
     "mobx-localstorage": "1.2.0",
@@ -118,7 +118,7 @@
     "semver": "7.5.1",
     "sqlite3": "5.1.6",
     "tar": "6.1.15",
-    "tslib": "2.5.2",
+    "tslib": "2.5.3",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
     "uuid": "9.0.0",
     "validator": "13.9.0",
@@ -144,9 +144,9 @@
     "@types/validator": "13.7.17",
     "@typescript-eslint/eslint-plugin": "5.59.8",
     "@typescript-eslint/parser": "5.59.8",
-    "all-contributors-cli": "6.25.1",
+    "all-contributors-cli": "6.26.0",
     "chalk": "5.2.0",
-    "concurrently": "8.0.1",
+    "concurrently": "8.1.0",
     "cross-env": "7.0.3",
     "electron": "25.0.1",
     "electron-builder": "24.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bddbd02ca..90b15b214 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ dependencies:
     specifier: 5.2.1
     version: 5.2.1
   markdown-to-jsx:
-    specifier: 7.2.0
-    version: 7.2.0(react@18.2.0)
+    specifier: 7.2.1
+    version: 7.2.1(react@18.2.0)
   minimist:
     specifier: 1.2.8
     version: 1.2.8
@@ -234,8 +234,8 @@ dependencies:
     specifier: 6.1.15
     version: 6.1.15
   tslib:
-    specifier: 2.5.2
-    version: 2.5.2
+    specifier: 2.5.3
+    version: 2.5.3
   useragent-generator:
     specifier: 1.1.1-amkt-22079-finish.0
     version: 1.1.1-amkt-22079-finish.0
@@ -316,14 +316,14 @@ devDependencies:
     specifier: 5.59.8
     version: 5.59.8(eslint@8.39.0)(typescript@5.0.4)
   all-contributors-cli:
-    specifier: 6.25.1
-    version: 6.25.1
+    specifier: 6.26.0
+    version: 6.26.0
   chalk:
     specifier: 5.2.0
     version: 5.2.0
   concurrently:
-    specifier: 8.0.1
-    version: 8.0.1
+    specifier: 8.1.0
+    version: 8.1.0
   cross-env:
     specifier: 7.0.3
     version: 7.0.3
@@ -1526,13 +1526,13 @@ packages:
     resolution: {integrity: sha512-7bAYAv0w4AIao9DNg0avfOLTCPE9woAgs6SpXuMq11IN3A+l+cq8ghczwqSZBM11myvPSJA7vLn72q0rJ0QK6Q==}
     dependencies:
       '@formatjs/intl-localematcher': 0.2.32
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/fast-memoize@2.0.1:
     resolution: {integrity: sha512-M2GgV+qJn5WJQAYewz7q2Cdl6fobQa69S1AzSM2y0P68ZDbK5cWrJIcPCO395Of1ksftGZoOt4LYCO/j9BKBSA==}
     dependencies:
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/icu-messageformat-parser@2.4.0:
@@ -1540,14 +1540,14 @@ packages:
     dependencies:
       '@formatjs/ecma402-abstract': 1.15.0
       '@formatjs/icu-skeleton-parser': 1.4.0
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/icu-skeleton-parser@1.4.0:
     resolution: {integrity: sha512-Qq347VM616rVLkvN6QsKJELazRyNlbCiN47LdH0Mc5U7E2xV0vatiVhGqd3KFgbc055BvtnUXR7XX60dCGFuWg==}
     dependencies:
       '@formatjs/ecma402-abstract': 1.15.0
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/intl-displaynames@6.3.2:
@@ -1555,7 +1555,7 @@ packages:
     dependencies:
       '@formatjs/ecma402-abstract': 1.15.0
       '@formatjs/intl-localematcher': 0.2.32
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/intl-listformat@7.2.2:
@@ -1563,13 +1563,13 @@ packages:
     dependencies:
       '@formatjs/ecma402-abstract': 1.15.0
       '@formatjs/intl-localematcher': 0.2.32
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/intl-localematcher@0.2.32:
     resolution: {integrity: sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==}
     dependencies:
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /@formatjs/intl@2.7.2(typescript@5.0.4):
@@ -1586,7 +1586,7 @@ packages:
       '@formatjs/intl-displaynames': 6.3.2
       '@formatjs/intl-listformat': 7.2.2
       intl-messageformat: 10.3.5
-      tslib: 2.5.2
+      tslib: 2.5.3
       typescript: 5.0.4
     dev: false
 
@@ -2202,7 +2202,7 @@ packages:
       '@sentry/types': 7.16.0
       '@sentry/utils': 7.16.0
       deepmerge: 4.2.2
-      tslib: 2.5.2
+      tslib: 2.5.3
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -2865,8 +2865,8 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /all-contributors-cli@6.25.1:
-    resolution: {integrity: sha512-Q9MfsO6FH09h71IG6OobfESA7lbooB3/bnO2wnuXbLPye1lFsYsa/jpNZP0YBx6zbhwXqqm6CXRZ9HO/tmD4NQ==}
+  /all-contributors-cli@6.26.0:
+    resolution: {integrity: sha512-HOMfawD0XyNbOvLUn7rOAP5N9RLnbH+Y/9/IoxwPzCmy6srHSFyRMwbpD0H7Tw+1QzdJT8RH7bTe1IZkPhF+NQ==}
     engines: {node: '>=4'}
     hasBin: true
     dependencies:
@@ -2880,6 +2880,8 @@ packages:
       node-fetch: 2.6.11
       pify: 5.0.0
       yargs: 15.4.1
+    optionalDependencies:
+      prettier: 2.8.8
     transitivePeerDependencies:
       - encoding
     dev: true
@@ -4268,8 +4270,8 @@ packages:
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  /concurrently@8.0.1:
-    resolution: {integrity: sha512-Sh8bGQMEL0TAmAm2meAXMjcASHZa7V0xXQVDBLknCPa9TPtkY9yYs+0cnGGgfdkW0SV1Mlg+hVGfXcoI8d3MJA==}
+  /concurrently@8.1.0:
+    resolution: {integrity: sha512-0AB6eOAtaW/r/kX2lCdolaWtT191ICeuJjEJvI9hT3zbPFuZ/iZaJwMRKwbuwADome7OKxk73L7od+fsveZ7tA==}
     engines: {node: ^14.13.0 || >=16.0.0}
     hasBin: true
     dependencies:
@@ -5914,7 +5916,7 @@ packages:
     resolution: {integrity: sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==}
     engines: {node: '>= 12'}
     dependencies:
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /file-uri-to-path@1.0.0:
@@ -6835,7 +6837,7 @@ packages:
       '@formatjs/ecma402-abstract': 1.15.0
       '@formatjs/fast-memoize': 2.0.1
       '@formatjs/icu-messageformat-parser': 2.4.0
-      tslib: 2.5.2
+      tslib: 2.5.3
     dev: false
 
   /invariant@2.2.4:
@@ -8488,8 +8490,8 @@ packages:
       object-visit: 1.0.1
     dev: false
 
-  /markdown-to-jsx@7.2.0(react@18.2.0):
-    resolution: {integrity: sha512-3l4/Bigjm4bEqjCR6Xr+d4DtM1X6vvtGsMGSjJYyep8RjjIvcWtrXBS8Wbfe1/P+atKNMccpsraESIaWVplzVg==}
+  /markdown-to-jsx@7.2.1(react@18.2.0):
+    resolution: {integrity: sha512-9HrdzBAo0+sFz9ZYAGT5fB8ilzTW+q6lPocRxrIesMO+aB40V9MgFfbfMXxlGjf22OpRy+IXlvVaQenicdpgbg==}
     engines: {node: '>= 10'}
     peerDependencies:
       react: '>= 0.14.0'
@@ -10010,7 +10012,7 @@ packages:
       hoist-non-react-statics: 3.3.2
       intl-messageformat: 10.3.5
       react: 18.2.0
-      tslib: 2.5.2
+      tslib: 2.5.3
       typescript: 5.0.4
     dev: false
 
@@ -10570,7 +10572,7 @@ packages:
   /rxjs@7.8.1:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
     dependencies:
-      tslib: 2.5.2
+      tslib: 2.5.3
 
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
@@ -11654,8 +11656,8 @@ packages:
     resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
     dev: true
 
-  /tslib@2.5.2:
-    resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==}
+  /tslib@2.5.3:
+    resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==}
 
   /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}