Merge 3d8f2fe9d0 into ae0e9e227d

package-lock.json

@@ -1,24 +1,24 @@
 {
   "name": "helioslauncher",
-  "version": "2.2.1",
+  "version": "2.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "helioslauncher",
-      "version": "2.2.1",
+      "version": "2.2.0",
       "license": "UNLICENSED",
       "dependencies": {
         "@electron/remote": "^2.1.2",
-        "adm-zip": "^0.5.12",
+        "adm-zip": "^0.5.9",
         "discord-rpc-patch": "^4.0.1",
-        "ejs": "^3.1.10",
+        "ejs": "^3.1.9",
         "ejs-electron": "^3.0.0",
         "electron-updater": "^6.1.8",
         "fs-extra": "^11.1.1",
         "github-syntax-dark": "^0.5.0",
         "got": "^11.8.5",
-        "helios-core": "~2.2.1",
+        "helios-core": "~2.2.0",
         "helios-distribution-types": "^1.3.0",
         "jquery": "^3.7.1",
         "lodash.merge": "^4.6.2",
@@ -26,7 +26,7 @@
         "toml": "^3.0.0"
       },
       "devDependencies": {
-        "electron": "^30.0.1",
+        "electron": "^29.1.0",
         "electron-builder": "^24.13.3",
         "eslint": "^8.57.0"
       },
@@ -809,9 +809,9 @@
       }
     },
     "node_modules/adm-zip": {
-      "version": "0.5.12",
+      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.12.tgz",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
       "engines": {
         "node": ">=6.0"
       }
@@ -1107,46 +1107,38 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/bare-events": {
-      "version": "2.2.2",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
-      "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==",
+      "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "2.3.0",
+      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.1.5.tgz",
-      "integrity": "sha512-TNFqa1B4N99pds2a5NYHR15o0ZpdNKbAeKTE/+G6ED/UeOavv8RY3dr/Fu99HW3zU3pXpo2kDNO8Sjsm2esfOw==",
+      "integrity": "sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==",
       "optional": true,
       "dependencies": {
         "bare-events": "^2.0.0",
+        "bare-os": "^2.0.0",
         "bare-path": "^2.0.0",
-        "bare-stream": "^1.0.0"
+        "streamx": "^2.13.0"
       }
     },
     "node_modules/bare-os": {
-      "version": "2.3.0",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.0.tgz",
-      "integrity": "sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==",
+      "integrity": "sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==",
       "optional": true
     },
     "node_modules/bare-path": {
-      "version": "2.1.2",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
-      "integrity": "sha512-o7KSt4prEphWUHa3QUwCxUI00R86VdjiuxmJK0iNVDHYPGo+HsDaVCnqCmPbf/MiW1ok8F4p3m8RTHlWk8K2ig==",
+      "integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
       "optional": true,
       "dependencies": {
         "bare-os": "^2.1.0"
       }
     },
-    "node_modules/bare-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-1.0.0.tgz",
-      "integrity": "sha512-KhNUoDL40iP4gFaLSsoGE479t0jHijfYdIcxRn/XtezA2BaUD0NRf/JGRpsMq6dMNM+SrCrB0YSSo/5wBY4rOQ==",
-      "optional": true,
-      "dependencies": {
-        "streamx": "^2.16.1"
-      }
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -1899,9 +1891,9 @@
       "dev": true
     },
     "node_modules/ejs": {
-      "version": "3.1.10",
+      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -1922,9 +1914,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "30.0.1",
+      "version": "29.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-29.1.0.tgz",
-      "integrity": "sha512-iwxkI/n2wBd29NH7TH0ZY8aWGzCoKpzJz+D10u7aGSJi1TV6d4MSM3rWyKvT/UkAHkTKOEgYfUyCa2vWQm8L0g==",
+      "integrity": "sha512-giJVIm0sWVp+8V1GXrKqKTb+h7no0P3ooYqEd34AD9wMJzGnAeL+usj+R0155/0pdvvP1mgydnA7lcaFA2M9lw==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
@@ -2796,9 +2788,9 @@
       }
     },
     "node_modules/helios-core": {
-      "version": "2.2.1",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.2.0.tgz",
-      "integrity": "sha512-l9WuNVdzKl/1boPPV4Y+p4z9sa1JckTakcDo9OUQCEDyczrlgSCSmHZIysz1AW6aOYZ182AtT5zofULDyHto4A==",
+      "integrity": "sha512-HGzBwmKF48ax72YTEmIBv7pjMtuaDuYYyC6trmWurF/hFq+AnGTOrefqgD/zRvR2wiuYk78YrUiTIWz1TvE0Pw==",
       "dependencies": {
         "fastq": "^1.17.1",
         "fs-extra": "^11.2.0",
@@ -2806,10 +2798,10 @@
         "luxon": "^3.4.4",
         "node-stream-zip": "^1.15.0",
         "semver": "^7.6.0",
-        "tar-fs": "^3.0.6",
+        "tar-fs": "^3.0.5",
         "triple-beam": "^1.4.1",
         "winreg": "^1.2.5",
-        "winston": "^3.13.0"
+        "winston": "^3.11.0"
       }
     },
     "node_modules/helios-distribution-types": {
@@ -4301,9 +4293,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.6",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "integrity": "sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==",
       "dependencies": {
         "pump": "^3.0.0",
         "tar-stream": "^3.1.5"
@@ -4528,9 +4520,9 @@
       "integrity": "sha512-uf7tHf+tw0B1y+x+mKTLHkykBgK2KMs3g+KlzmyMbLvICSHQyB/xOFjTT8qZ3oeTFyU7Bbj4FzXitGG6jvKhYw=="
     },
     "node_modules/winston": {
-      "version": "3.13.0",
+      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz",
-      "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==",
+      "integrity": "sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==",
       "dependencies": {
         "@colors/colors": "^1.6.0",
         "@dabh/diagnostics": "^2.0.2",
@@ -4542,7 +4534,7 @@
         "safe-stable-stringify": "^2.3.1",
         "stack-trace": "0.0.x",
         "triple-beam": "^1.3.0",
-        "winston-transport": "^4.7.0"
+        "winston-transport": "^4.5.0"
       },
       "engines": {
         "node": ">= 12.0.0"

package.json

@@ -24,15 +24,15 @@
   },
   "dependencies": {
     "@electron/remote": "^2.1.2",
-    "adm-zip": "^0.5.12",
+    "adm-zip": "^0.5.9",
     "discord-rpc-patch": "^4.0.1",
-    "ejs": "^3.1.10",
+    "ejs": "^3.1.9",
     "ejs-electron": "^3.0.0",
     "electron-updater": "^6.1.8",
     "fs-extra": "^11.1.1",
     "github-syntax-dark": "^0.5.0",
     "got": "^11.8.5",
-    "helios-core": "~2.2.1",
+    "helios-core": "~2.2.0",
     "helios-distribution-types": "^1.3.0",
     "jquery": "^3.7.1",
     "lodash.merge": "^4.6.2",
@@ -40,7 +40,7 @@
     "toml": "^3.0.0"
   },
   "devDependencies": {
-    "electron": "^30.0.1",
+    "electron": "^29.1.0",
     "electron-builder": "^24.13.3",
     "eslint": "^8.57.0"
   },