Bump @babel/preset-react from 7.12.13 to 7.18.6

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.12.13 to 7.18.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-preset-react) --- updated-dependencies: - dependency-name: "@babel/preset-react" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2025-12-24 14:31:52 +01:00 · 2022-06-28 03:04:24 +00:00
22 changed files with 1665 additions and 2929 deletions
--- a/.github/workflows/laravel-dev.yml
+++ b/.github/workflows/laravel-dev.yml
@@ -24,6 +24,6 @@ jobs:
        with:
          context: .
          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
          push: true
          tags: henrywhitaker3/speedtest-tracker:dev,henrywhitaker3/speedtest-tracker:dev-arm
--- a/.github/workflows/laravel-master.yml
+++ b/.github/workflows/laravel-master.yml
@@ -24,6 +24,6 @@ jobs:
        with:
          context: .
          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
          push: true
          tags: henrywhitaker3/speedtest-tracker:latest,henrywhitaker3/speedtest-tracker:latest-arm
--- a/.github/workflows/laravel-pr.yml
+++ b/.github/workflows/laravel-pr.yml
@@ -12,7 +12,7 @@ jobs:
    steps:
    - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
      with:
-        php-version: '8.2'
+        php-version: '7.4'
    - uses: actions/checkout@v2
    - name: Copy .env
      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
@@ -46,7 +46,7 @@ jobs:
    - name: Directory Permissions
      run: chmod -R 777 storage bootstrap/cache
    - name: Download Speedtest binary
-      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
+      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
    - name: Accept EULA
      env:
        DB_CONNECTION: sqlite
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Speedtest Tracker

-[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/henrywhitaker3/Speedtest-Tracker/laravel-master.yml?branch=master&label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/henrywhitaker3/Speedtest-Tracker/laravel-dev.yml?branch=dev&label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.3-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
+[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.2-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)

 This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.

--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -1,15 +0,0 @@
-version: "3"
-
-vars:
-  RTAG:
-    sh: head -n 25 /dev/random | md5sum | head -c 8
-
-tasks:
-  build:
-    cmds:
-      - docker build . -f docker/Dockerfile --tag henrywhitaker3/speedtest-tracker:{{ .RTAG }}
-
-  run:
-    deps: [build]
-    cmds:
-      - docker run --rm -p 8765:80 -e OOKLA_EULA_GDPR=true henrywhitaker3/speedtest-tracker:{{ .RTAG }}
--- a/app/Actions/QueueSpeedtest.php
+++ b/app/Actions/QueueSpeedtest.php
@@ -30,6 +30,6 @@ class QueueSpeedtest implements ActionInterface
    {
        SettingsHelper::loadIntegrationConfig();

-        SpeedtestJob::dispatch($this->speedtestProvider, false, config('integrations'));
+        SpeedtestJob::dispatch(false, config('integrations'), $this->speedtestProvider);
    }
 }
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -32,9 +32,9 @@ class Kernel extends ConsoleKernel
        if ((bool)SettingsHelper::get('schedule_enabled')->value) {
            $schedule->job(
                new SpeedtestJob(
-                    app()->make(SpeedtestProvider::class),
                    true,
                    config('integrations'),
+                    app()->make(SpeedtestProvider::class)
                )
            )
                ->cron(SettingsHelper::get('schedule')['value'])
--- a/app/Jobs/SpeedtestJob.php
+++ b/app/Jobs/SpeedtestJob.php
@@ -43,7 +43,7 @@ class SpeedtestJob implements ShouldQueue
     *
     * @return void
     */
-    public function __construct(SpeedtestProvider $speedtestProvider, $scheduled = true, $config = [])
+    public function __construct($scheduled = true, $config = [], SpeedtestProvider $speedtestProvider)
    {
        $this->scheduled = $scheduled;
        $this->config = $config;
--- a/changelog.json
+++ b/changelog.json
@@ -1,14 +1,4 @@
 {
-    "1.12.3": [
-        {
-            "description": "Updated to PHP 8.2",
-            "link": ""
-        },
-        {
-            "description": "Updated speedtest cli to 1.2.0 (#1119)",
-            "link": "https://github.com/henrywhitaker3/Speedtest-Tracker/issues/1119"
-        }
-    ],
    "1.12.2": [
        {
            "description": "Fixed a bug where the latest X days widget would not update for the failure graph",
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
    ],
    "license": "MIT",
    "require": {
-        "php": "^8",
+        "php": "^7.2.5",
        "doctrine/dbal": "^2.10",
        "dragonmantank/cron-expression": "^3",
        "fideloper/proxy": "^4.2",
--- a/composer.lock
+++ b/composer.lock
--- a/config/speedtest.php
+++ b/config/speedtest.php
@@ -7,7 +7,7 @@ return [
    |--------------------------------------------------------------------------
    */

-    'version' => '1.12.3',
+    'version' => '1.12.2',

    /*
    |--------------------------------------------------------------------------
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,8 +3,6 @@ LABEL maintainer=henrywhitaker3@outlook.com

 ENV arch='x86_64'

-RUN apk add php82-tokenizer
-
 COPY docker/conf/ /
 COPY . /site

--- a/docker/arm.Dockerfile
+++ b/docker/arm.Dockerfile
@@ -3,8 +3,6 @@ LABEL maintainer=henrywhitaker3@outlook.com

 ENV arch='arm'

-RUN apk add php82-tokenizer
-
 COPY docker/conf/ /
 COPY . /site

--- a/docker/conf/defaults/crontab
+++ b/docker/conf/defaults/crontab
@@ -6,5 +6,5 @@
 0       3       *       *       6       run-parts /etc/periodic/weekly
 0       5       1       *       *       run-parts /etc/periodic/monthly
 # speedtest cron
-* * * * * php82 /config/www/artisan schedule:run >> /config/log/speedtest/cron.log
-# */5 * * * * php82 /config/www/artisan queue:retry all >> /config/log/speedtest.cron.log
+* * * * * php /config/www/artisan schedule:run >> /config/log/speedtest/cron.log
+# */5 * * * * php /config/www/artisan queue:retry all >> /config/log/speedtest.cron.log
--- a/docker/conf/defaults/nginx/site-confs/default.conf.sample
+++ b/docker/conf/defaults/nginx/site-confs/default.conf.sample
--- a/docker/conf/etc/cont-init.d/50-speedtest
+++ b/docker/conf/etc/cont-init.d/50-speedtest
@@ -11,18 +11,6 @@ function eulaError()
    exit 1
 }

-function downloadSpeedtestCli()
-{
-    if [ $(uname -m) == "x86_64" ]; then
-        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -O speedtest.tgz > /dev/null
-    else
-        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-aarch64.tgz -O speedtest.tgz > /dev/null
-    fi
-
-    tar zxvf speedtest.tgz > /dev/null
-    cp speedtest /site/app/Bin/
-}
-
 # Do Ookla stuff
 if [ -z ${OOKLA_EULA_GDPR+x} ]; then
    eulaError
@@ -35,27 +23,24 @@ else
        echo "Ookla GDPR and EULA accepted. Downloading Speedtest CLI."
        cd /tmp

-        downloadSpeedtestCli
+        if [ $(uname -m) == "x86_64" ]; then
+            wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz > /dev/null
+        else
+            wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-arm-linux.tgz -O speedtest.tgz > /dev/null
+        fi
+
+        tar zxvf speedtest.tgz > /dev/null
+        cp speedtest /site/app/Bin/

        chmod +x /site/artisan
        HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
        HOME=/root
    else
-        /config/www/app/Bin/speedtest --version | grep -E "1\.2\.0"
-        rc=$?
-
-        if [ $rc -ne 0 ]; then
-            downloadSpeedtestCli
-        fi
-
        HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
        HOME=/root
    fi
 fi

-# Copy latest nginx config
-cp /defaults/nginx/nginx.conf.sample /config/nginx/nginx.conf
-
 # Copy site files to /config
 echo "Copying latest site files to config"
 cp -rfT /site/ /config/www/
@@ -84,19 +69,19 @@ fi

 echo 'Updating packages'
 apk add composer
-cd /config/www && php82 /usr/bin/composer.phar install && echo date > /config/www/.composer-time
+cd /config/www && composer install && echo date > /config/www/.composer-time

 sed "s,DB_DATABASE=.*,DB_DATABASE=/config/speed.db," -i.bak /config/www/.env

 echo "Running database migrations"
-php82 /config/www/artisan migrate
+php /config/www/artisan migrate

 # Check app key exists
 if grep -E "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /config/www/.env > /dev/null; then
    echo "App key exists"
 else
    echo "Generating app key"
-    php82 /config/www/artisan key:generate
+    php /config/www/artisan key:generate
 fi

 # Check JWT secret exists
@@ -104,7 +89,7 @@ if grep -E "JWT_SECRET=[0-9A-Za-z:+\/=]{1,}" /config/www/.env > /dev/null ; then
    echo "JWT secret exists"
 else
    echo "Generating JWT secret"
-    php82 /config/www/artisan jwt:secret
+    php /config/www/artisan jwt:secret
 fi

 if [ -z ${SLACK_WEBHOOK+x} ]; then
@@ -113,7 +98,7 @@ if [ -z ${SLACK_WEBHOOK+x} ]; then
 else
    echo "Slack webhook set, updating db"
    sed "s,SLACK_WEBHOOK=.*,SLACK_WEBHOOK=$SLACK_WEBHOOK," -i.bak /config/www/.env
-    php82 /config/www/artisan speedtest:slack $SLACK_WEBHOOK
+    php /config/www/artisan speedtest:slack $SLACK_WEBHOOK
 fi

 if [ -z ${TELEGRAM_BOT_TOKEN+x} ] && [ -z ${TELEGRAM_CHAT_ID+x} ]; then
@@ -124,7 +109,7 @@ else
    echo "Telegram chat id and bot token set, updating .env"
    sed "s,TELEGRAM_BOT_TOKEN=.*,TELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN," -i.bak /config/www/.env
    sed "s,TELEGRAM_CHAT_ID=.*,TELEGRAM_CHAT_ID=$TELEGRAM_CHAT_ID," -i.bak /config/www/.env
-    php82 /config/www/artisan speedtest:telegram --chat=$TELEGRAM_CHAT_ID --bot=$TELEGRAM_BOT_TOKEN
+    php /config/www/artisan speedtest:telegram --chat=$TELEGRAM_CHAT_ID --bot=$TELEGRAM_BOT_TOKEN
 fi

 if [ -z ${BASE_PATH+x} ]; then
@@ -137,19 +122,19 @@ fi

 if [ -z ${AUTH+x} ]; then
    echo "AUTH variable not set. Disabling authentication"
-    php82 /config/www/artisan speedtest:auth --disable
+    php /config/www/artisan speedtest:auth --disable
 else
    if [ $AUTH == 'true' ]; then
        echo "AUTH variable set. Enabling authentication"
-        php82 /config/www/artisan speedtest:auth --enable
+        php /config/www/artisan speedtest:auth --enable
    else
        echo "AUTH variable set, but not to 'true'. Disabling authentication"
-        php82 /config/www/artisan speedtest:auth --disable
+        php /config/www/artisan speedtest:auth --disable
    fi
 fi

 echo "Clearing old jobs from queue"
-php82 /config/www/artisan queue:clear
+php /config/www/artisan queue:clear

 mkdir -p /config/log/speedtest

--- a/docker/conf/etc/php82/php-fpm.d/www.conf
+++ b/docker/conf/etc/php82/php-fpm.d/www.conf
--- a/docker/conf/etc/services.d/speedtest/run
+++ b/docker/conf/etc/services.d/speedtest/run
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash

-exec s6-setuidgid abc php82 /config/www/artisan queue:work --timeout=120 >> /config/log/speedtest/queue.log
+exec s6-setuidgid abc php /config/www/artisan queue:work --timeout=120 >> /config/log/speedtest/queue.log
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
                "react-toastify": "^7.0.3"
            },
            "devDependencies": {
-                "@babel/preset-react": "^7.12.13",
+                "@babel/preset-react": "^7.18.6",
                "axios": "^0.21",
                "bootstrap": "^4.6.0",
                "cross-env": "^7.0",
@@ -86,12 +86,15 @@
            }
        },
        "node_modules/@babel/helper-annotate-as-pure": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-            "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+            "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
            "dev": true,
            "dependencies": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
            }
        },
        "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -199,11 +202,6 @@
                "@babel/types": "^7.12.13"
            }
        },
-        "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-validator-identifier": {
-            "version": "7.12.11",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-            "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="
-        },
        "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/highlight": {
            "version": "7.12.13",
            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
@@ -251,16 +249,6 @@
                "lodash": "^4.17.19"
            }
        },
-        "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/types": {
-            "version": "7.13.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-            "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.12.11",
-                "lodash": "^4.17.19",
-                "to-fast-properties": "^2.0.0"
-            }
-        },
        "node_modules/@babel/helper-create-regexp-features-plugin": {
            "version": "7.12.1",
            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
@@ -331,12 +319,15 @@
            }
        },
        "node_modules/@babel/helper-module-imports": {
-            "version": "7.12.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
-            "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+            "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
            "dev": true,
            "dependencies": {
-                "@babel/types": "^7.12.5"
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
            }
        },
        "node_modules/@babel/helper-module-transforms": {
@@ -366,10 +357,12 @@
            }
        },
        "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-            "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-            "dev": true
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz",
+            "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
        },
        "node_modules/@babel/helper-regex": {
            "version": "7.10.5",
@@ -431,16 +424,21 @@
            }
        },
        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-            "dev": true
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+            "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
        },
        "node_modules/@babel/helper-validator-option": {
-            "version": "7.12.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
-            "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==",
-            "dev": true
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+            "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
        },
        "node_modules/@babel/helper-wrap-function": {
            "version": "7.12.3",
@@ -508,11 +506,6 @@
                "@babel/helper-plugin-utils": "^7.13.0"
            }
        },
-        "node_modules/@babel/plugin-proposal-class-properties/node_modules/@babel/helper-plugin-utils": {
-            "version": "7.13.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-            "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="
-        },
        "node_modules/@babel/plugin-proposal-dynamic-import": {
            "version": "7.12.1",
            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
@@ -687,20 +680,20 @@
            }
        },
        "node_modules/@babel/plugin-syntax-jsx": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz",
-            "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+            "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
            "dev": true,
            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.12.13"
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
-        "node_modules/@babel/plugin-syntax-jsx/node_modules/@babel/helper-plugin-utils": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-            "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-            "dev": true
-        },
        "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
            "version": "7.10.4",
            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
@@ -995,91 +988,68 @@
            }
        },
        "node_modules/@babel/plugin-transform-react-display-name": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz",
-            "integrity": "sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
+            "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
            "dev": true,
            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.12.13"
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
-        "node_modules/@babel/plugin-transform-react-display-name/node_modules/@babel/helper-plugin-utils": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-            "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-            "dev": true
-        },
        "node_modules/@babel/plugin-transform-react-jsx": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz",
-            "integrity": "sha512-hhXZMYR8t9RvduN2uW4sjl6MRtUhzNE726JvoJhpjhxKgRUVkZqTsA0xc49ALZxQM7H26pZ/lLvB2Yrea9dllA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz",
+            "integrity": "sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==",
            "dev": true,
            "dependencies": {
-                "@babel/helper-annotate-as-pure": "^7.12.13",
-                "@babel/helper-module-imports": "^7.12.13",
-                "@babel/helper-plugin-utils": "^7.12.13",
-                "@babel/plugin-syntax-jsx": "^7.12.13",
-                "@babel/types": "^7.12.13"
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-jsx": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
        "node_modules/@babel/plugin-transform-react-jsx-development": {
-            "version": "7.12.12",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz",
-            "integrity": "sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
+            "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
            "dev": true,
            "dependencies": {
-                "@babel/plugin-transform-react-jsx": "^7.12.12"
-            }
-        },
-        "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-annotate-as-pure": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-            "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/types": "^7.12.13"
-            }
-        },
-        "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-module-imports": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-            "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
-            "dev": true,
-            "dependencies": {
-                "@babel/types": "^7.12.13"
-            }
-        },
-        "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-plugin-utils": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-            "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-            "dev": true
-        },
-        "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-validator-identifier": {
-            "version": "7.12.11",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-            "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-            "dev": true
-        },
-        "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/types": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz",
-            "integrity": "sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.12.11",
-                "lodash": "^4.17.19",
-                "to-fast-properties": "^2.0.0"
+                "@babel/plugin-transform-react-jsx": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
        "node_modules/@babel/plugin-transform-react-pure-annotations": {
-            "version": "7.12.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz",
-            "integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
+            "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
            "dev": true,
            "dependencies": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
        "node_modules/@babel/plugin-transform-regenerator": {
@@ -1289,24 +1259,25 @@
            }
        },
        "node_modules/@babel/preset-react": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.13.tgz",
-            "integrity": "sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
+            "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
            "dev": true,
            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.12.13",
-                "@babel/plugin-transform-react-display-name": "^7.12.13",
-                "@babel/plugin-transform-react-jsx": "^7.12.13",
-                "@babel/plugin-transform-react-jsx-development": "^7.12.12",
-                "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "@babel/plugin-transform-react-display-name": "^7.18.6",
+                "@babel/plugin-transform-react-jsx": "^7.18.6",
+                "@babel/plugin-transform-react-jsx-development": "^7.18.6",
+                "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
            }
        },
-        "node_modules/@babel/preset-react/node_modules/@babel/helper-plugin-utils": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-            "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-            "dev": true
-        },
        "node_modules/@babel/runtime": {
            "version": "7.13.10",
            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
@@ -1344,14 +1315,15 @@
            }
        },
        "node_modules/@babel/types": {
-            "version": "7.12.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
-            "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
-            "dev": true,
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.6.tgz",
+            "integrity": "sha512-NdBNzPDwed30fZdDQtVR7ZgaO4UKjuaQFH9VArS+HMnurlOY0JWN+4ROlu/iapMFwjRQU4pOG4StZfDmulEwGA==",
            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.10.4",
-                "lodash": "^4.17.19",
+                "@babel/helper-validator-identifier": "^7.18.6",
                "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
            }
        },
        "node_modules/@mrmlnc/readdir-enhanced": {
@@ -13194,12 +13166,12 @@
            }
        },
        "@babel/helper-annotate-as-pure": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-            "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+            "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
            "dev": true,
            "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.18.6"
            }
        },
        "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -13307,11 +13279,6 @@
                        "@babel/types": "^7.12.13"
                    }
                },
-                "@babel/helper-validator-identifier": {
-                    "version": "7.12.11",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-                    "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="
-                },
                "@babel/highlight": {
                    "version": "7.12.13",
                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
@@ -13352,16 +13319,6 @@
                        "globals": "^11.1.0",
                        "lodash": "^4.17.19"
                    }
-                },
-                "@babel/types": {
-                    "version": "7.13.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-                    "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.12.11",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
                }
            }
        },
@@ -13435,12 +13392,12 @@
            }
        },
        "@babel/helper-module-imports": {
-            "version": "7.12.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
-            "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+            "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
            "dev": true,
            "requires": {
-                "@babel/types": "^7.12.5"
+                "@babel/types": "^7.18.6"
            }
        },
        "@babel/helper-module-transforms": {
@@ -13470,10 +13427,9 @@
            }
        },
        "@babel/helper-plugin-utils": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-            "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-            "dev": true
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz",
+            "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg=="
        },
        "@babel/helper-regex": {
            "version": "7.10.5",
@@ -13535,15 +13491,14 @@
            }
        },
        "@babel/helper-validator-identifier": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-            "dev": true
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+            "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
        },
        "@babel/helper-validator-option": {
-            "version": "7.12.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
-            "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+            "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
            "dev": true
        },
        "@babel/helper-wrap-function": {
@@ -13604,13 +13559,6 @@
            "requires": {
                "@babel/helper-create-class-features-plugin": "^7.13.0",
                "@babel/helper-plugin-utils": "^7.13.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.13.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-                    "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="
-                }
            }
        },
        "@babel/plugin-proposal-dynamic-import": {
@@ -13786,20 +13734,12 @@
            }
        },
        "@babel/plugin-syntax-jsx": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz",
-            "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+            "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
            "dev": true,
            "requires": {
-                "@babel/helper-plugin-utils": "^7.12.13"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-                    "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-                    "dev": true
-                }
+                "@babel/helper-plugin-utils": "^7.18.6"
            }
        },
        "@babel/plugin-syntax-logical-assignment-operators": {
@@ -14096,95 +14036,44 @@
            }
        },
        "@babel/plugin-transform-react-display-name": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz",
-            "integrity": "sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
+            "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
            "dev": true,
            "requires": {
-                "@babel/helper-plugin-utils": "^7.12.13"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-                    "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-                    "dev": true
-                }
+                "@babel/helper-plugin-utils": "^7.18.6"
            }
        },
        "@babel/plugin-transform-react-jsx": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz",
-            "integrity": "sha512-hhXZMYR8t9RvduN2uW4sjl6MRtUhzNE726JvoJhpjhxKgRUVkZqTsA0xc49ALZxQM7H26pZ/lLvB2Yrea9dllA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz",
+            "integrity": "sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==",
            "dev": true,
            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.12.13",
-                "@babel/helper-module-imports": "^7.12.13",
-                "@babel/helper-plugin-utils": "^7.12.13",
-                "@babel/plugin-syntax-jsx": "^7.12.13",
-                "@babel/types": "^7.12.13"
-            },
-            "dependencies": {
-                "@babel/helper-annotate-as-pure": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-                    "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.12.13"
-                    }
-                },
-                "@babel/helper-module-imports": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-                    "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.12.13"
-                    }
-                },
-                "@babel/helper-plugin-utils": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-                    "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-                    "dev": true
-                },
-                "@babel/helper-validator-identifier": {
-                    "version": "7.12.11",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-                    "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-                    "dev": true
-                },
-                "@babel/types": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz",
-                    "integrity": "sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.12.11",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                }
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-jsx": "^7.18.6",
+                "@babel/types": "^7.18.6"
            }
        },
        "@babel/plugin-transform-react-jsx-development": {
-            "version": "7.12.12",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz",
-            "integrity": "sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
+            "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
            "dev": true,
            "requires": {
-                "@babel/plugin-transform-react-jsx": "^7.12.12"
+                "@babel/plugin-transform-react-jsx": "^7.18.6"
            }
        },
        "@babel/plugin-transform-react-pure-annotations": {
-            "version": "7.12.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz",
-            "integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
+            "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
            "dev": true,
            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
            }
        },
        "@babel/plugin-transform-regenerator": {
@@ -14396,24 +14285,17 @@
            }
        },
        "@babel/preset-react": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.13.tgz",
-            "integrity": "sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==",
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
+            "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
            "dev": true,
            "requires": {
-                "@babel/helper-plugin-utils": "^7.12.13",
-                "@babel/plugin-transform-react-display-name": "^7.12.13",
-                "@babel/plugin-transform-react-jsx": "^7.12.13",
-                "@babel/plugin-transform-react-jsx-development": "^7.12.12",
-                "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-                    "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-                    "dev": true
-                }
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "@babel/plugin-transform-react-display-name": "^7.18.6",
+                "@babel/plugin-transform-react-jsx": "^7.18.6",
+                "@babel/plugin-transform-react-jsx-development": "^7.18.6",
+                "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
            }
        },
        "@babel/runtime": {
@@ -14453,13 +14335,11 @@
            }
        },
        "@babel/types": {
-            "version": "7.12.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
-            "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
-            "dev": true,
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.6.tgz",
+            "integrity": "sha512-NdBNzPDwed30fZdDQtVR7ZgaO4UKjuaQFH9VArS+HMnurlOY0JWN+4ROlu/iapMFwjRQU4pOG4StZfDmulEwGA==",
            "requires": {
-                "@babel/helper-validator-identifier": "^7.10.4",
-                "lodash": "^4.17.19",
+                "@babel/helper-validator-identifier": "^7.18.6",
                "to-fast-properties": "^2.0.0"
            }
        },
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
    },
    "devDependencies": {
-        "@babel/preset-react": "^7.12.13",
+        "@babel/preset-react": "^7.18.6",
        "axios": "^0.21",
        "bootstrap": "^4.6.0",
        "cross-env": "^7.0",
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,6 @@
 <?php

 use App\Helpers\SettingsHelper;
-use GuzzleHttp\Psr7\MimeType;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
@@ -22,7 +21,7 @@ Route::get(SettingsHelper::getBase() . 'files/{path?}', function ($file) {
    $fileP = public_path() . '/' . $fileP;
    if (file_exists($fileP)) {
        $contents = File::get($fileP);
-        $mime = MimeType::fromFilename($fileP);
+        $mime = \GuzzleHttp\Psr7\mimetype_from_filename($fileP);
        return Response::make(File::get($fileP), 200, ['Content-type' => $mime]);
    } else {
        abort(404);