laravel framework upgrade from version 8 to 9 (#7)

* laravel framework upgrade from version 8 to 9

.env.example

@@ -1,10 +1,16 @@
-USER_UID=1000
-USER_NAME=laravel
-
 APP_NAME=KamilCraftAPI
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 
-DB_CONNECTION=sqlite
+DB_CONNECTION=mysql
+DB_HOST=kamilcraft-api_db
+DB_PORT=3306
+DB_DATABASE=kamilcraft-api
+DB_USERNAME=kamilcraft-api
+DB_PASSWORD=password
+
+EXTERNAL_WEBSERVER_PORT=80
+CURRENT_UID=1000
+XDG_CONFIG_HOME=/tmp

.gitignore

@@ -1,8 +1,10 @@
+/.idea
+/.vscode
 /node_modules
-/public/hot
 /public/storage
 /storage/*.key
 /vendor
+/.composer
 .env
 .env.backup
 .phpunit.result.cache
@@ -11,5 +13,3 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-/.idea
-/.vscode

README.md

@@ -10,9 +10,9 @@ API for kamilcraft.com projects
 
 ### Optional
 
-* PHP 8.0 or later
-* Composer 2.3.x or later
-* Nodejs 16.14.x or later
+* PHP 8.1.x or later
+* Composer 2.4.x or later
+* Nodejs 18.14.x or later
 
 ## Preparation and installation
 
@@ -21,9 +21,9 @@ API for kamilcraft.com projects
    cp .env.example .env
    ```
 
-2) Build the image needed for Laravel
+2) Build the image needed for Laravel and Node.js
    ```shell
-   docker-compose build
+   docker-compose build --no-cache --pull
    ```
 
 3) Run the images prepared in ``docker-compose.yml``
@@ -31,11 +31,23 @@ API for kamilcraft.com projects
    docker-compose up -d
    ```
 
-4) Install the dependencies needed for Laravel and Nodejs. \
-   **The installer for Laravel generates the key and migrates the database.** \
-   **In the case of Nodejs, it generates page styles.**
+4) Install the dependencies needed for Laravel and Nodejs
    ```shell
-   docker-compose exec laravel install
+   docker-compose exec -u "$(id -u):$(id -g)" php composer install
    ```
-   
-5) Go to ``http://localhost/dashboard`` in your browser.
+   ```shell
+   docker-compose run --rm -u "$(id -u):$(id -g)" npm install
+   ```
+
+5) Key and data generation
+   ```shell
+   docker-compose exec -u "$(id -u):$(id -g)" php php artisan key:generate
+   ```
+   ```shell
+   docker-compose exec -u "$(id -u):$(id -g)" php php artisan migrate:fresh --seed
+   ```
+   ```shell
+   docker-compose run --rm -u "$(id -u):$(id -g)" npm run dev
+   ```
+
+6) Go to ``http://localhost/dashboard`` in your browser.

app/Http/Kernel.php

@@ -12,7 +12,7 @@ class Kernel extends HttpKernel
 
     protected $middleware = [
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -39,6 +39,7 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

app/Providers/RouteServiceProvider.php

@@ -34,7 +34,7 @@ class RouteServiceProvider extends ServiceProvider
     protected function configureRateLimiting()
     {
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });
     }
 

composer.json

@@ -5,19 +5,19 @@
     "keywords": ["kamilcraft", "api"],
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.75",
-        "laravel/tinker": "^2.5"
+        "php": "^8.1",
+        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^9.19",
+        "laravel/tinker": "^2.7"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.6",
-        "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
+        "laravel/pint": "^1.0",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10",
-        "phpunit/phpunit": "^9.5.10"
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -54,7 +54,10 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

config/app.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use Illuminate\Support\Facades\Facade;
+
 return [
     'name' => env('APP_NAME', 'KamilCraft API'),
     'env' => env('APP_ENV', 'production'),
@@ -14,7 +16,9 @@ return [
     'faker_locale' => 'en_US',
     'key' => env('APP_KEY'),
     'cipher' => 'AES-256-CBC',
-    /* Laravel Framework Service Providers */
+    'maintenance' => [
+        'driver' => 'file',
+    ],
     'providers' => [
         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
@@ -35,55 +39,13 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        /* Package Service Providers */
 
-        /* Application Service Providers */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
-        /* Custom */
         App\Providers\CategoryServiceProvider::class,
         App\Providers\ProjectServiceProvider::class,
-
-    ],
-
-    'aliases' => [
-        'App' => Illuminate\Support\Facades\App::class,
-        'Arr' => Illuminate\Support\Arr::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'Date' => Illuminate\Support\Facades\Date::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Http' => Illuminate\Support\Facades\Http::class,
-        'Js' => Illuminate\Support\Js::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'Str' => Illuminate\Support\Str::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
     ],
+    'aliases' => Facade::defaultAliases()->merge([])->toArray()
 ];

config/cache.php

@@ -43,6 +43,5 @@ return [
             ],
         ],
     ],
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'KamilCraftAPI'), '_').'_cache'),
-
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'KamilCraftAPI'), '_').'_cache_'),
 ];

config/database.php

@@ -25,6 +25,7 @@ return [
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
             'prefix_indexes' => true,
+            'search_path' => 'public',
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([

config/docker/dev/laravel/Dockerfile

@@ -1,27 +0,0 @@
-FROM php:8.0-fpm
-
-ARG USER_UID
-ARG USER_NAME
-ENV COMPOSER_HOME=/home/$USER_NAME/.composer
-
-RUN useradd -G www-data,root -u $USER_UID -d /home/$USER_NAME $USER_NAME
-RUN mkdir -p /home/$USER_NAME/.composer && \
-    chown $USER_NAME:$USER_NAME -R /home/$USER_NAME
-RUN set -eux \
-    && apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install git zip unzip dos2unix -y
-RUN curl -sS https://getcomposer.org/installer \
-    | php -- --version=2.3.5 --install-dir=/usr/local/bin --filename=composer
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN set -eux \
-    && apt-get install nodejs -y
-RUN npm install --global npm@latest
-
-COPY ./install.sh /usr/local/bin/install
-RUN dos2unix /usr/local/bin/install \
-    && chmod +x /usr/local/bin/install
-
-USER $USER_UID
-
-EXPOSE 9000

config/docker/dev/laravel/install.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-if [ ! -d "vendor" ] && [ -f "composer.json" ]; then
-    echo ""
-    echo "########################################"
-    echo "# vendor directory not found...        #"
-    echo "########################################"
-    composer install \
-    && php artisan key:generate
-    
-    if [ ! -f "database/database.sqlite" ]; then
-        touch database/database.sqlite
-    fi
-    
-    php artisan migrate:fresh --seed
-fi
-
-if [ ! -d "node_modules" ] && [ -f "package.json" ]; then
-    echo ""
-    echo "########################################"
-    echo "# node_modules directory not found...  #"
-    echo "########################################"
-    npm install
-    npm run dev
-fi
-
-echo "$@"
-exec "$@"

config/filesystems.php

@@ -8,12 +8,14 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'throw' => false,
         ],
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
+            'throw' => false,
         ],
     ],
 

config/logging.php

@@ -8,7 +8,10 @@ use Monolog\Handler\SyslogUdpHandler;
 
 return [
     'default' => env('LOG_CHANNEL', 'stack'),
-    'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+    'deprecations' => [
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => false,
+    ],
     'channels' => [
         'stack' => [
             'driver' => 'stack',
@@ -36,10 +39,11 @@ return [
         'papertrail' => [
             'driver' => 'monolog',
             'level' => env('LOG_LEVEL', 'debug'),
-            'handler' => SyslogUdpHandler::class,
+            'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
             ],
         ],
         'stderr' => [

database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -22,4 +24,4 @@ class CreateUsersTable extends Migration
     {
         Schema::dropIfExists('users');
     }
-}
+};

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePasswordResetsTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -19,4 +21,4 @@ class CreatePasswordResetsTable extends Migration
     {
         Schema::dropIfExists('password_resets');
     }
-}
+};

database/migrations/2019_08_19_000000_create_failed_jobs_table.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFailedJobsTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -23,4 +25,4 @@ class CreateFailedJobsTable extends Migration
     {
         Schema::dropIfExists('failed_jobs');
     }
-}
+};

database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePersonalAccessTokensTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -23,4 +25,4 @@ class CreatePersonalAccessTokensTable extends Migration
     {
         Schema::dropIfExists('personal_access_tokens');
     }
-}
+};

database/migrations/2022_02_08_114741_create_categories_table.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateCategoriesTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -23,4 +25,4 @@ class CreateCategoriesTable extends Migration
     {
         Schema::dropIfExists('categories');
     }
-}
+};

database/migrations/2022_02_09_075749_create_projects_table.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateProjectsTable extends Migration
+return new class extends Migration
 {
     public function up(): void
     {
@@ -30,5 +30,4 @@ class CreateProjectsTable extends Migration
     {
         Schema::dropIfExists('projects');
     }
-
-}
+};

docker-compose.yml

@@ -6,28 +6,67 @@ services:
     container_name: kamilcraft-api_www
     working_dir: /application
     ports:
-      - "80:80"
+      - ${EXTERNAL_WEBSERVER_PORT:-80}:80
     volumes:
+      - ./environment/dev/nginx/default.conf:/etc/nginx/conf.d/default.conf
       - .:/application
-      - ./config/docker/dev/nginx/default.conf:/etc/nginx/conf.d/default.conf
-    links:
-      - laravel
     networks:
-      - localnet
+      - kamilcraft
+    depends_on:
+        - php
+        - db
 
-  laravel:
-    build:
-      args:
-          USER_UID: ${USER_UID}
-          USER_NAME: ${USER_NAME}
-      context: ./config/docker/dev/laravel
-    container_name: kamilcraft-api_laravel
-    working_dir: /application
-    volumes:
-      - .:/application
-    networks:
-      - localnet
+  php:
+      build:
+          context: environment/dev/php
+      container_name: kamilcraft-api_php
+      working_dir: /application
+      user: ${CURRENT_UID:-1000}
+      volumes:
+          - .:/application
+          - ./environment/dev/php/php.ini:/usr/local/etc/php/conf.d/php.ini
+      networks:
+          - kamilcraft
+      extra_hosts:
+          - host.docker.internal:host-gateway
+      restart: unless-stopped
+
+  npm:
+      build:
+          context: environment/dev/npm
+      container_name: kamilcraft-api_node
+      working_dir: /application
+      entrypoint: [ 'npm' ]
+      ports:
+          - '3000:3000'
+          - '3001:3001'
+      volumes:
+          - .:/application
+      networks:
+          - kamilcraft
+
+  db:
+      image: mysql:8.0
+      container_name: kamilcraft-api_db
+      ports:
+          - '${DB_PORT}:3306'
+      environment:
+          MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
+          MYSQL_DATABASE: '${DB_DATABASE}'
+          MYSQL_USER: '${DB_USERNAME}'
+          MYSQL_PASSWORD: '${DB_PASSWORD}'
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      volumes:
+          - 'mysql-db-data:/var/lib/mysql'
+      networks:
+          - kamilcraft
+      restart: unless-stopped
 
 networks:
-    localnet:
+    kamilcraft:
         driver: bridge
+
+volumes:
+    mysql-db-data:
+        name: ib-mysql-data
+        driver: local

environment/dev/nginx/default.conf

@@ -9,7 +9,7 @@ server {
     }
 
     location ~ \.php$ {
-        fastcgi_pass laravel:9000;
+        fastcgi_pass php:9000;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;

environment/dev/npm/Dockerfile

@@ -0,0 +1,3 @@
+FROM node:18-alpine
+
+RUN npm install -g npm@latest

environment/dev/php/Dockerfile

@@ -0,0 +1,34 @@
+FROM php:8.1-fpm-alpine
+
+ARG XDEBUG_VERSION=3.1.6
+ARG INSTALL_XDEBUG=false
+
+ARG COMPOSER_VERSION=2.4.4
+ENV COMPOSER_HOME=/application/.composer
+ENV COMPOSER_MEMORY_LIMIT=-1
+
+RUN if [ ${INSTALL_XDEBUG} = true ]; then \
+    apk --no-cache add $PHPIZE_DEPS \
+    && pecl install xdebug-${XDEBUG_VERSION} \
+    && docker-php-ext-enable xdebug \
+;fi
+
+RUN apk update && apk upgrade \
+    && apk add --no-cache pcre-dev $PHPIZE_DEPS \
+    icu-dev \
+    zip \
+    libzip-dev \
+    libpng-dev \
+    && curl -sS https://getcomposer.org/installer | php -- --version="${COMPOSER_VERSION}" --install-dir=/usr/local/bin --filename=composer \
+    && pecl install redis \
+    && docker-php-ext-install \
+    mysqli \
+    pdo \
+    pdo_mysql \
+    zip \
+    gd \
+    bcmath \
+    && docker-php-ext-configure \
+    zip \
+    && docker-php-ext-enable \
+    redis

environment/dev/php/php.ini

@@ -0,0 +1,9 @@
+[PHP]
+memory_limit = 1G
+
+[xdebug]
+xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
+xdebug.mode=debug
+xdebug.start_with_request=yes
+xdebug.log_level=0

package-lock.json

@@ -1715,6 +1715,20 @@
                 "node": ">=10.0.0"
             }
         },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
         "node_modules/@jridgewell/resolve-uri": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
@@ -1724,6 +1738,25 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
         "node_modules/@jridgewell/sourcemap-codec": {
             "version": "1.4.11",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
@@ -1731,9 +1764,9 @@
             "dev": true
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-            "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+            "version": "0.3.15",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+            "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.0.3",
@@ -4930,9 +4963,9 @@
             }
         },
         "node_modules/html-minifier-terser/node_modules/terser": {
-            "version": "4.8.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-            "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+            "version": "4.8.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+            "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
             "dev": true,
             "dependencies": {
                 "commander": "^2.20.0",
@@ -5144,9 +5177,9 @@
             }
         },
         "node_modules/img-loader/node_modules/loader-utils": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-            "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
             "dev": true,
             "dependencies": {
                 "big.js": "^5.2.2",
@@ -5607,9 +5640,9 @@
             }
         },
         "node_modules/loader-utils": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-            "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
             "dev": true,
             "dependencies": {
                 "big.js": "^5.2.2",
@@ -8162,14 +8195,14 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.12.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
-            "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
+            "version": "5.15.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+            "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
             "dev": true,
             "dependencies": {
+                "@jridgewell/source-map": "^0.3.2",
                 "acorn": "^8.5.0",
                 "commander": "^2.20.0",
-                "source-map": "~0.7.2",
                 "source-map-support": "~0.5.20"
             },
             "bin": {
@@ -8246,15 +8279,6 @@
             "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
             "dev": true
         },
-        "node_modules/terser/node_modules/source-map": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
         "node_modules/thunky": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -8503,9 +8527,9 @@
             }
         },
         "node_modules/vue-style-loader/node_modules/loader-utils": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-            "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
             "dev": true,
             "dependencies": {
                 "big.js": "^5.2.2",
@@ -10252,12 +10276,39 @@
             "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
             "dev": true
         },
+        "@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
         "@jridgewell/resolve-uri": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
             "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
             "dev": true
         },
+        "@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "dev": true
+        },
+        "@jridgewell/source-map": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
         "@jridgewell/sourcemap-codec": {
             "version": "1.4.11",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
@@ -10265,9 +10316,9 @@
             "dev": true
         },
         "@jridgewell/trace-mapping": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-            "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+            "version": "0.3.15",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+            "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
             "dev": true,
             "requires": {
                 "@jridgewell/resolve-uri": "^3.0.3",
@@ -12831,9 +12882,9 @@
                     "dev": true
                 },
                 "terser": {
-                    "version": "4.8.0",
-                    "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-                    "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+                    "version": "4.8.1",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+                    "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
                     "dev": true,
                     "requires": {
                         "commander": "^2.20.0",
@@ -12986,9 +13037,9 @@
                     }
                 },
                 "loader-utils": {
-                    "version": "1.4.0",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-                    "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+                    "version": "1.4.2",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
                     "dev": true,
                     "requires": {
                         "big.js": "^5.2.2",
@@ -13326,9 +13377,9 @@
             "dev": true
         },
         "loader-utils": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-            "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
             "dev": true,
             "requires": {
                 "big.js": "^5.2.2",
@@ -15212,14 +15263,14 @@
             "dev": true
         },
         "terser": {
-            "version": "5.12.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
-            "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
+            "version": "5.15.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+            "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
             "dev": true,
             "requires": {
+                "@jridgewell/source-map": "^0.3.2",
                 "acorn": "^8.5.0",
                 "commander": "^2.20.0",
-                "source-map": "~0.7.2",
                 "source-map-support": "~0.5.20"
             },
             "dependencies": {
@@ -15228,12 +15279,6 @@
                     "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
                     "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
                     "dev": true
-                },
-                "source-map": {
-                    "version": "0.7.3",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-                    "dev": true
                 }
             }
         },
@@ -15475,9 +15520,9 @@
                     }
                 },
                 "loader-utils": {
-                    "version": "1.4.0",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-                    "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+                    "version": "1.4.2",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
                     "dev": true,
                     "requires": {
                         "big.js": "^5.2.2",