Merge branch 'master' of github.com:Lissy93/dashy into FIX/ticket-fixes-1419

2024-12-24 01:12:06 +03:00 · 2023-12-31 23:15:19 +00:00 · 2023-12-31 23:15:19 +00:00 · 8e3c54f2d0
commit 8e3c54f2d0
parent d8c0919afc 3e75854520
12 changed files with 511 additions and 117 deletions
--- a/.github/AUTHORS.txt
+++ b/.github/AUTHORS.txt
@ -145,10 +145,10 @@ Marcell Fülöp <marekful@protonmail.com> - 27 commits
 Alicia Sykes <alicia@futr.ai> - 28 commits
 Lissy93 <gh@d0h.co> - 78 commits
 snyk-bot <snyk-bot@snyk.io> - 83 commits
-repo-visualizer <repo-visualizer@users.noreply.github.com> - 117 commits
+repo-visualizer <repo-visualizer@users.noreply.github.com> - 118 commits
 Lissy93 <Lissy93@users.noreply.github.com> - 210 commits
-liss-bot <liss-bot@d0h.co> - 212 commits
-Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 215 commits
+liss-bot <liss-bot@d0h.co> - 214 commits
+Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 216 commits
 Alicia Sykes <alicia@omg.lol> - 352 commits
 Alicia Sykes <gh@d0h.co> - 440 commits
 Alicia Sykes <sykes.alicia@gmail.com> - 1488 commits
--- a/README.md
+++ b/README.md
@ -538,6 +538,13 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <sub><b>Vincent Koc</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/peng1can">
+            <img src="https://avatars.githubusercontent.com/u/225854?v=4" width="80;" alt="peng1can"/>
+            <br />
+            <sub><b>peng1can</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/tbjers">
            <img src="https://avatars.githubusercontent.com/u/1117052?u=539d96d5e581b3139c75713ce35b89a36626404c&v=4" width="80;" alt="tbjers"/>
@ -554,7 +561,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
    </td>
    <td align="center">
        <a href="https://github.com/AnandChowdhary">
-            <img src="https://avatars.githubusercontent.com/u/2841780?u=2d606fd66dbb1e7a102d54b4c90f078760de6674&v=4" width="80;" alt="AnandChowdhary"/>
+            <img src="https://avatars.githubusercontent.com/u/2841780?u=747e554b3a7f12eb20b7910e1c87d817844f714f&v=4" width="80;" alt="AnandChowdhary"/>
            <br />
            <sub><b>Anand Chowdhary</b></sub>
        </a>
@ -565,15 +572,15 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <br />
            <sub><b>Shrippen</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/davidpaulyoung">
            <img src="https://avatars.githubusercontent.com/u/3418369?v=4" width="80;" alt="davidpaulyoung"/>
            <br />
            <sub><b>David Young</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/bile0026">
            <img src="https://avatars.githubusercontent.com/u/5022496?u=aec96ad173c0ea9baaba93807efa8a848af6595c&v=4" width="80;" alt="bile0026"/>
@ -608,6 +615,14 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <br />
            <sub><b>Vlad Timofeev</b></sub>
        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/helixzz">
+            <img src="https://avatars.githubusercontent.com/u/12218889?v=4" width="80;" alt="helixzz"/>
+            <br />
+            <sub><b>HeliXZz</b></sub>
+        </a>
    </td>
    <td align="center">
        <a href="https://github.com/Bastii717">
@ -615,8 +630,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <br />
            <sub><b>Bastii717</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/ratty222">
            <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
--- a/docs/assets/CONTRIBUTORS.svg
+++ b/docs/assets/CONTRIBUTORS.svg
--- a/docs/assets/repo-visualization.svg
+++ b/docs/assets/repo-visualization.svg
--- a/docs/credits.md
+++ b/docs/credits.md
@ -11,6 +11,13 @@
            <sub><b>Vincent Koc</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/peng1can">
+            <img src="https://avatars.githubusercontent.com/u/225854?v=4" width="80;" alt="peng1can"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/tbjers">
            <img src="https://avatars.githubusercontent.com/u/1117052?u=539d96d5e581b3139c75713ce35b89a36626404c&v=4" width="80;" alt="tbjers"/>
@ -27,7 +34,7 @@
    </td>
    <td align="center">
        <a href="https://github.com/AnandChowdhary">
-            <img src="https://avatars.githubusercontent.com/u/2841780?u=2d606fd66dbb1e7a102d54b4c90f078760de6674&v=4" width="80;" alt="AnandChowdhary"/>
+            <img src="https://avatars.githubusercontent.com/u/2841780?u=747e554b3a7f12eb20b7910e1c87d817844f714f&v=4" width="80;" alt="AnandChowdhary"/>
            <br />
            <sub><b>Anand Chowdhary</b></sub>
        </a>
@ -38,15 +45,15 @@
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/davidpaulyoung">
            <img src="https://avatars.githubusercontent.com/u/3418369?v=4" width="80;" alt="davidpaulyoung"/>
            <br />
            <sub><b>David Young</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/bile0026">
            <img src="https://avatars.githubusercontent.com/u/5022496?u=aec96ad173c0ea9baaba93807efa8a848af6595c&v=4" width="80;" alt="bile0026"/>
@ -81,6 +88,14 @@
            <br />
            <sub><b>Vlad Timofeev</b></sub>
        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/helixzz">
+            <img src="https://avatars.githubusercontent.com/u/12218889?v=4" width="80;" alt="helixzz"/>
+            <br />
+            <sub><b>HeliXZz</b></sub>
+        </a>
    </td>
    <td align="center">
        <a href="https://github.com/Bastii717">
@ -88,8 +103,7 @@
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/ratty222">
            <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
--- a/docs/widgets.md
+++ b/docs/widgets.md
@ -2333,6 +2333,22 @@ Live-updating current CPU usage, as a combined average across all cores

 ---

+### Current CPU Usage Speedometer
+
+Speedometer styled version of the Current CPU Usage widget
+
+<p align="center"><img width="400" src="https://i.ibb.co/7RHTRNq/gl-cpu-speedometer.png" /></p>
+
+#### Example
+
+```yaml
+- type: gl-cpu-speedometer
+  options:
+    hostname: http://192.168.130.2:61208
+```
+
+---
+
 ### CPU Usage Per Core

 Live-updating CPU usage breakdown per core
@ -2388,6 +2404,22 @@ Real-time memory usage gauge, with more info visible on click

 ---

+### Current Memory Usage Speedometer
+
+Speedometer styled version of the Current Memory Usage widget
+
+<p align="center"><img width="400" src="https://i.ibb.co/wsNW7Xr/gl-mem-speedometer.png" /></p>
+
+#### Example
+
+```yaml
+- type: gl-mem-speedometer
+  options:
+    hostname: http://192.168.130.2:61208
+```
+
+---
+
 ### Memory Usage History

 Recent memory usage chart
--- a/package.json
+++ b/package.json
@ -21,16 +21,16 @@
    "@sentry/tracing": "^6.17.5",
    "@sentry/vue": "^6.17.4",
    "ajv": "^8.10.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.0",
    "connect-history-api-fallback": "^1.6.0",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
    "express": "^4.17.2",
    "frappe-charts": "^1.6.2",
    "js-yaml": "^4.1.0",
    "keycloak-js": "^20.0.3",
    "register-service-worker": "^1.7.2",
    "remedial": "^1.0.8",
-    "rsup-progress": "^3.0.0",
+    "rsup-progress": "^3.2.0",
    "simple-icons": "^7.19.0",
    "v-jsoneditor": "^1.4.5",
    "v-tooltip": "^2.1.3",
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@ -316,6 +316,8 @@
    "general": {
      "loading": "Loading...",
      "show-more": "Expand Details",
+      "cpu-details": "CPU Details",
+      "mem-details": "Memory Details",
      "show-less": "Show Less",
      "open-link": "Continue Reading"
    },
--- a/src/components/Widgets/GlCpuSpeedometer.vue
+++ b/src/components/Widgets/GlCpuSpeedometer.vue
@ -0,0 +1,150 @@
+<template>
+  <div class="glances-cpu-gauge-wrapper">
+    <GaugeChart class="gl-speedometer" :value="gaugeValue"
+    :baseColor="baseColor" :shadowColor="shadowColor" :gaugeColor="gaugeColor"
+    :startAngle="startAngle" :endAngle="endAngle" :innerRadius="innerRadius"
+    :separatorThickness="separatorThickness">
+      <p class="percentage">{{ gaugeValue }}%</p>
+    </GaugeChart>
+    <p class="show-more-btn" @click="toggleMoreInfo">
+      {{ showMoreInfo ? $t('widgets.general.show-less') : $t('widgets.general.cpu-details') }}
+    </p>
+    <div class="more-info" v-if="moreInfo && showMoreInfo">
+      <div class="more-info-row" v-for="(info, key) in moreInfo" :key="key">
+        <p class="label">{{ info.label }}</p>
+        <p class="value">{{ info.value }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+import GlancesMixin from '@/mixins/GlancesMixin';
+import GaugeChart from '@/components/Charts/Gauge';
+import { capitalize } from '@/utils/MiscHelpers';
+
+export default {
+  mixins: [WidgetMixin, GlancesMixin],
+  components: {
+    GaugeChart,
+  },
+  data() {
+    return {
+      gaugeValue: 0,
+      baseColor: '#101010ED',
+      shadowColor: '#00000000',
+      gaugeColor: [
+        { offset: 0, color: '#20e253' },
+        { offset: 35, color: '#f6f000' },
+        { offset: 65, color: '#fca016' },
+        { offset: 90, color: '#f80363' },
+      ],
+      showMoreInfo: false,
+      moreInfo: null,
+      startAngle: -135,
+      endAngle: 135,
+      innerRadius: 80,
+      separatorThickness: 0,
+    };
+  },
+  computed: {
+    endpoint() {
+      return this.makeGlancesUrl('cpu');
+    },
+  },
+  methods: {
+    processData(cpuData) {
+      this.gaugeValue = cpuData.total;
+      const moreInfo = [];
+      const ignore = ['total', 'cpucore', 'time_since_update',
+        'interrupts', 'soft_interrupts', 'ctx_switches', 'syscalls'];
+      Object.keys(cpuData).forEach((key) => {
+        if (!ignore.includes(key) && cpuData[key]) {
+          moreInfo.push({ label: capitalize(key), value: `${cpuData[key].toFixed(1)}%` });
+        }
+      });
+      this.moreInfo = moreInfo;
+    },
+    toggleMoreInfo() {
+      this.showMoreInfo = !this.showMoreInfo;
+    },
+  },
+  created() {
+    this.overrideUpdateInterval = 2;
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.glances-cpu-gauge-wrapper {
+  max-width: 15rem;
+  margin: 0rem auto;
+
+  p.percentage {
+    color: var(--widget-text-color);
+    text-align: center;
+    position: absolute;
+    font-size: 1.3rem;
+    margin: 3.5rem 0;
+    width: 100%;
+    bottom: 0;
+  }
+
+  .more-info {
+    background: var(--widget-accent-color);
+    border-radius: var(--curve-factor);
+    padding: 0.25rem 0.5rem;
+    margin: 0.5rem auto;
+
+    .more-info-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      p.label, p.value {
+        color: var(--widget-text-color);
+        margin: 0.25rem 0;
+      }
+
+      p.value {
+        font-family: var(--font-monospace);
+      }
+
+      &:not(:last-child) {
+        border-bottom: 1px dashed var(--widget-text-color);
+      }
+    }
+  }
+
+  p.show-more-btn {
+    cursor: pointer;
+    font-size: 0.9rem;
+    text-align: center;
+    width: fit-content;
+    margin: -1.1rem auto 0 auto;
+    padding: 0.1rem 0.25rem;
+    border: 1px solid transparent;
+    color: var(--widget-text-color);
+    opacity: var(--dimming-factor);
+    border-radius: var(--curve-factor);
+
+    &:hover {
+      border: 1px solid var(--widget-text-color);
+    }
+
+    &:focus,
+    &:active {
+      background: var(--widget-text-color);
+      color: var(--widget-background-color);
+    }
+  }
+}
+</style>
+<style>
+/* global override for the Guage tick lines */
+.gl-speedometer svg line {
+  stroke: var(--widget-text-color);
+  opacity: .3;
+}
+</style>
--- a/src/components/Widgets/GlMemSpeedometer.vue
+++ b/src/components/Widgets/GlMemSpeedometer.vue
@ -0,0 +1,150 @@
+<template>
+  <div class="glances-cpu-gauge-wrapper">
+    <GaugeChart class="gl-speedometer" :value="gaugeValue"
+      :baseColor="baseColor" :shadowColor="shadowColor" :gaugeColor="gaugeColor"
+      :startAngle="startAngle" :endAngle="endAngle" :innerRadius="innerRadius"
+      :separatorThickness="separatorThickness">
+      <p class="percentage">{{ gaugeValue }}%</p>
+    </GaugeChart>
+    <p class="show-more-btn" @click="toggleMoreInfo">
+      {{ showMoreInfo ? $t('widgets.general.show-less') : $t('widgets.general.mem-details') }}
+    </p>
+    <div class="more-info" v-if="moreInfo && showMoreInfo">
+      <div class="more-info-row" v-for="(info, key) in moreInfo" :key="key">
+        <p class="label">{{ info.label }}</p>
+        <p class="value">{{ info.value }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+import GlancesMixin from '@/mixins/GlancesMixin';
+import GaugeChart from '@/components/Charts/Gauge';
+import { capitalize, convertBytes } from '@/utils/MiscHelpers';
+
+export default {
+  mixins: [WidgetMixin, GlancesMixin],
+  components: {
+    GaugeChart,
+  },
+  data() {
+    return {
+      gaugeValue: 0,
+      baseColor: '#101010ED',
+      shadowColor: '#00000000',
+      gaugeColor: [
+        { offset: 0, color: '#20e253' },
+        { offset: 35, color: '#f6f000' },
+        { offset: 65, color: '#fca016' },
+        { offset: 90, color: '#f80363' },
+      ],
+      showMoreInfo: false,
+      moreInfo: null,
+      startAngle: -135,
+      endAngle: 135,
+      innerRadius: 80,
+      separatorThickness: 0,
+    };
+  },
+  computed: {
+    endpoint() {
+      return this.makeGlancesUrl('mem');
+    },
+  },
+  methods: {
+    processData(memData) {
+      this.gaugeValue = memData.percent;
+      const moreInfo = [];
+      const ignore = ['percent'];
+      Object.keys(memData).forEach((key) => {
+        if (!ignore.includes(key) && memData[key]) {
+          moreInfo.push({ label: capitalize(key), value: convertBytes(memData[key]) });
+        }
+      });
+      this.moreInfo = moreInfo;
+    },
+    toggleMoreInfo() {
+      this.showMoreInfo = !this.showMoreInfo;
+    },
+  },
+  created() {
+    this.overrideUpdateInterval = 2;
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.glances-cpu-gauge-wrapper {
+  max-width: 15rem;
+  margin: 0rem auto;
+
+  p.percentage {
+    color: var(--widget-text-color);
+    text-align: center;
+    position: absolute;
+    font-size: 1.3rem;
+    margin: 3.5rem 0;
+    width: 100%;
+    bottom: 0;
+  }
+
+  .more-info {
+    background: var(--widget-accent-color);
+    border-radius: var(--curve-factor);
+    padding: 0.25rem 0.5rem;
+    margin: 0.5rem auto;
+
+    .more-info-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      p.label,
+      p.value {
+        color: var(--widget-text-color);
+        margin: 0.25rem 0;
+      }
+
+      p.value {
+        font-family: var(--font-monospace);
+      }
+
+      &:not(:last-child) {
+        border-bottom: 1px dashed var(--widget-text-color);
+      }
+    }
+  }
+
+  p.show-more-btn {
+    cursor: pointer;
+    font-size: 0.9rem;
+    text-align: center;
+    width: fit-content;
+    margin: -1.1rem auto 0 auto;
+    padding: 0.1rem 0.25rem;
+    border: 1px solid transparent;
+    color: var(--widget-text-color);
+    opacity: var(--dimming-factor);
+    border-radius: var(--curve-factor);
+
+    &:hover {
+      border: 1px solid var(--widget-text-color);
+    }
+
+    &:focus,
+    &:active {
+      background: var(--widget-text-color);
+      color: var(--widget-background-color);
+    }
+  }
+}
+</style>
+<style>
+/* global override for the Guage tick lines */
+.gl-speedometer svg line {
+  stroke: var(--widget-text-color);
+  opacity: .3;
+}
+</style>
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@ -67,12 +67,14 @@ const COMPAT = {
  'gl-alerts': 'GlAlerts',
  'gl-current-cores': 'GlCpuCores',
  'gl-current-cpu': 'GlCpuGauge',
+  'gl-cpu-speedometer': 'GlCpuSpeedometer',
  'gl-cpu-history': 'GlCpuHistory',
  'gl-disk-io': 'GlDiskIo',
  'gl-disk-space': 'GlDiskSpace',
  'gl-ip-address': 'GlIpAddress',
  'gl-load-history': 'GlLoadHistory',
  'gl-current-mem': 'GlMemGauge',
+  'gl-mem-speedometer': 'GlMemSpeedometer',
  'gl-mem-history': 'GlMemHistory',
  'gl-network-interfaces': 'GlNetworkInterfaces',
  'gl-network-traffic': 'GlNetworkTraffic',
--- a/yarn.lock
+++ b/yarn.lock
@ -2306,13 +2306,14 @@ aws4@^1.8.0:
  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==

-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
  dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.0"
    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"

 babel-eslint@^10.0.1:
  version "10.1.0"
@ -2482,7 +2483,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==

-bn.js@^5.0.0, bn.js@^5.1.1:
+bn.js@^5.0.0, bn.js@^5.2.1:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
@ -2619,7 +2620,7 @@ browserify-des@^1.0.0:
    inherits "^2.0.1"
    safe-buffer "^5.1.2"

-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0, browserify-rsa@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
@ -2628,19 +2629,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
    randombytes "^2.0.1"

 browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e"
+  integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==
  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
    create-hash "^1.2.0"
    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    parse-asn1 "^5.1.6"
+    readable-stream "^3.6.2"
+    safe-buffer "^5.2.1"

 browserify-zlib@^0.2.0:
  version "0.2.0"
@ -3432,10 +3433,10 @@ crypto-browserify@^3.11.0:
    randombytes "^2.0.0"
    randomfill "^1.0.3"

-crypto-js@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
-  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+crypto-js@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==

 crypto-random-string@^2.0.0:
  version "2.0.0"
@ -4022,7 +4023,7 @@ electron-to-chromium@^1.4.118:
  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.146.tgz#fd20970c3def2f9e6b32ac13a2e7a6b64e1b0c48"
  integrity sha512-4eWebzDLd+hYLm4csbyMU2EbBnqhwl8Oe9eF/7CBDPWcRxFmqzx4izxvHH+lofQxzieg8UbB8ZuzNTxeukzfTg==

-elliptic@^6.5.3:
+elliptic@^6.5.3, elliptic@^6.5.4:
  version "6.5.4"
  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@ -4816,10 +4817,10 @@ flush-write-stream@^1.0.0:
    inherits "^2.0.3"
    readable-stream "^2.3.6"

-follow-redirects@^1.0.0, follow-redirects@^1.14.9:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.0.0, follow-redirects@^1.15.0:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==

 for-in@^1.0.2:
  version "1.0.2"
@ -7414,7 +7415,7 @@ parent-module@^1.0.0:
  dependencies:
    callsites "^3.0.0"

-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0, parse-asn1@^5.1.6:
  version "5.1.6"
  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
@ -8064,6 +8065,11 @@ proxy-addr@~2.0.7:
    forwarded "0.2.0"
    ipaddr.js "1.9.1"

+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@ -8284,6 +8290,15 @@ readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

+readable-stream@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@ -8603,10 +8618,10 @@ rss-parser@3.13.0:
    entities "^2.0.3"
    xml2js "^0.5.0"

-rsup-progress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rsup-progress/-/rsup-progress-3.0.0.tgz#e5eab5c1e75794cc288d567aa765b50faaf0cc89"
-  integrity sha512-Gmm9Vv8Ti8CqpzWBv0V5cM9q6MsjA4rVsKQBYTRyCClwbnCBWYnHPBos0G3hsAXtcf4odQgw9dZfa+q9W4xVtA==
+rsup-progress@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/rsup-progress/-/rsup-progress-3.2.0.tgz#f9f3fa3158b8ced9dace14f33f4e9157717b5837"
+  integrity sha512-icnpDOj4bYrpCJ4cZYWf/jNqfyKwSKh8ULCZ1TWpGFZ3Y3b7SlhFhLz2CIGakcf+RPQ/UGB9WirH5E0mOX9+zg==

 run-async@^2.4.0:
  version "2.4.1"
@ -8649,7 +8664,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==