Merge pull request #1467 from coollabsio/next

v4.0.0-beta.142

app/Console/Commands/Init.php

@@ -48,6 +48,7 @@ class Init extends Command
     private function alive()
     {
         $id = config('app.id');
+        $version = config('version');
         $settings = InstanceSettings::get();
         $do_not_track = data_get($settings, 'do_not_track');
         if ($do_not_track == true) {
@@ -55,8 +56,8 @@ class Init extends Command
             return;
         }
         try {
+            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
             echo "I am alive!\n";
-            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id");
         } catch (\Throwable $e) {
             echo "Error in alive: {$e->getMessage()}\n";
         }

app/Console/Kernel.php

@@ -43,7 +43,7 @@ class Kernel extends ConsoleKernel
     }
     private function pull_helper_image($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
             $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
@@ -51,9 +51,9 @@ class Kernel extends ConsoleKernel
     private function check_resources($schedule)
     {
         if (isCloud()) {
-            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
         } else {
-            $servers = Server::all();
+            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
         }
         foreach ($servers as $server) {
             $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();

app/Http/Livewire/Project/Application/Heading.php

@@ -4,6 +4,7 @@ namespace App\Http\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
 use App\Jobs\ContainerStatusJob;
+use App\Jobs\ServerStatusJob;
 use App\Models\Application;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
@@ -28,6 +29,8 @@ class Heading extends Component
             $this->application->previews->each(function ($preview) {
                 $preview->refresh();
             });
+        } else {
+            dispatch(new ServerStatusJob($this->application->destination->server));
         }
     }
 

app/Http/Livewire/Project/Application/Rollback.php

@@ -42,28 +42,31 @@ class Rollback extends Component
     {
         try {
             $image = $this->application->uuid;
-            $output = instant_remote_process([
-                "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
-            ], $this->application->destination->server, throwError: false);
-            $current_tag = Str::of($output)->trim()->explode(":");
-            $this->current = data_get($current_tag, 1);
+            if ($this->application->destination->server->isFunctional()) {
+                $output = instant_remote_process([
+                    "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
+                ], $this->application->destination->server, throwError: false);
+                $current_tag = Str::of($output)->trim()->explode(":");
+                $this->current = data_get($current_tag, 1);
 
-            $output = instant_remote_process([
-                "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
-            ], $this->application->destination->server);
-            $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
-                return Str::of($item)->contains($image);
-            })->map(function ($item) {
-                $item = Str::of($item)->explode('#');
-                if ($item[1] === $this->current) {
-                    // $is_current = true;
-                }
-                return [
-                    'tag' => $item[1],
-                    'created_at' => $item[2],
-                    'is_current' => $is_current ?? null,
-                ];
-            })->toArray();
+                $output = instant_remote_process([
+                    "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
+                ], $this->application->destination->server);
+                $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
+                    return Str::of($item)->contains($image);
+                })->map(function ($item) {
+                    $item = Str::of($item)->explode('#');
+                    if ($item[1] === $this->current) {
+                        // $is_current = true;
+                    }
+                    return [
+                        'tag' => $item[1],
+                        'created_at' => $item[2],
+                        'is_current' => $is_current ?? null,
+                    ];
+                })->toArray();
+            }
+            return [];
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Jobs/ApplicationDeploymentJob.php

@@ -1022,10 +1022,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 listen  [::]:80;
                 server_name  localhost;
 
-                // real_ip_header    X-Forwarded-For;
-                // proxy_set_header        X-Real-IP       \$remote_addr;
-                // proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for;
-
                 location / {
                     root   /usr/share/nginx/html;
                     index  index.html;
@@ -1078,9 +1074,15 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             );
         } else {
             // Pure Dockerfile based deployment
-            $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-            ]);
+            if ($this->application->dockerfile) {
+                $this->execute_remote_command([
+                    executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                ]);
+            } else {
+                $this->execute_remote_command([
+                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                ]);
+            }
         }
     }
 

app/Jobs/ContainerStatusJob.php

@@ -37,7 +37,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        // ray("checking server status for {$this->server->id}");
+        ray("checking container statuses for {$this->server->id}");
         try {
             $this->server->checkServerRediness();
             $containers = instant_remote_process(["docker container ls -q"], $this->server);

app/Models/Server.php

@@ -120,14 +120,22 @@ class Server extends BaseModel
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
     }
+    public function skipServer()
+    {
+        if ($this->ip === '1.2.3.4') {
+            ray('skipping 1.2.3.4');
+            return true;
+        }
+        return false;
+    }
     public function checkServerRediness()
     {
         $serverUptimeCheckNumber = $this->unreachable_count;
-        $serverUptimeCheckNumberMax = 5;
+        $serverUptimeCheckNumberMax = 3;
 
         $currentTime = now()->timestamp;
         $runtime5Minutes = 1 * 60;
-        // Run for 1 minutes max and check every 5 seconds
+        // Run for 1 minutes max and check every 5 seconds for 3 times
         while ($currentTime + $runtime5Minutes > now()->timestamp) {
             if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                 if ($this->unreachable_notification_sent === false) {
@@ -169,25 +177,9 @@ class Server extends BaseModel
                 Sleep::for(5)->seconds();
                 return;
             }
-            $this->update([
-                'unreachable_count' => 0,
-            ]);
-            if (data_get($this, 'unreachable_notification_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->team->notify(new Revived($this));
-                $this->update(['unreachable_notification_sent' => false]);
-            }
-            if (
-                data_get($this, 'settings.is_reachable') === false ||
-                data_get($this, 'settings.is_usable') === false
-            ) {
-                $this->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
             break;
         }
+        return true;
     }
     public function getDiskUsage()
     {
@@ -308,19 +300,41 @@ class Server extends BaseModel
     {
         return $this->settings->is_reachable && $this->settings->is_usable;
     }
-    public function isDrainLogActivated() {
+    public function isDrainLogActivated()
+    {
         return $this->settings->is_logdrain_newrelic_enabled || $this->settings->is_logdrain_highlight_enabled || $this->settings->is_logdrain_axiom_enabled;
     }
     public function validateConnection()
     {
-        $uptime = instant_remote_process(['uptime'], $this, false);
-        if (!$uptime) {
-            $this->settings->is_reachable = false;
-            $this->settings->save();
+        if ($this->skipServer()) {
             return false;
         }
-        $this->settings->is_reachable = true;
-        $this->settings->save();
+
+        $uptime = instant_remote_process(['uptime'], $this, false);
+        if (!$uptime) {
+            $this->settings()->update([
+                'is_reachable' => false,
+                'is_usable' => false
+            ]);
+            return false;
+        }
+
+        if (data_get($this, 'unreachable_notification_sent') === true) {
+            $this->team->notify(new Revived($this));
+            $this->update(['unreachable_notification_sent' => false]);
+        }
+        if (
+            data_get($this, 'settings.is_reachable') === false ||
+            data_get($this, 'settings.is_usable') === false
+        ) {
+            $this->settings()->update([
+                'is_reachable' => true,
+                'is_usable' => true
+            ]);
+        }
+        $this->update([
+            'unreachable_count' => 0,
+        ]);
         return true;
     }
     public function validateDockerEngine($throwError = false)

app/Models/User.php

@@ -52,7 +52,6 @@ class User extends Authenticatable implements SendsEmail
     }
     public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
     {
-        ray('asd');
         $plainTextToken = sprintf(
             '%s%s%s',
             config('sanctum.token_prefix', ''),

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.139',
+    'release' => '4.0.0-beta.142',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.139';
+return '4.0.0-beta.142';

package-lock.json

@@ -6,19 +6,19 @@
         "": {
             "dependencies": {
                 "@tailwindcss/typography": "0.5.10",
-                "alpinejs": "3.13.1",
-                "daisyui": "4.0.3",
+                "alpinejs": "3.13.2",
+                "daisyui": "4.3.1",
                 "tailwindcss-scrollbar": "0.1.0"
             },
             "devDependencies": {
-                "@vitejs/plugin-vue": "4.4.0",
+                "@vitejs/plugin-vue": "4.5.0",
                 "autoprefixer": "10.4.16",
-                "axios": "1.5.1",
+                "axios": "1.6.2",
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.31",
                 "tailwindcss": "3.3.5",
-                "vite": "4.4.11",
-                "vue": "3.3.4"
+                "vite": "4.5.0",
+                "vue": "3.3.8"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -33,9 +33,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.22.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz",
-            "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==",
+            "version": "7.23.3",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+            "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -503,90 +503,90 @@
             }
         },
         "node_modules/@vitejs/plugin-vue": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.4.0.tgz",
-            "integrity": "sha512-xdguqb+VUwiRpSg+nsc2HtbAUSGak25DXYvpQQi4RVU1Xq1uworyoH/md9Rfd8zMmPR/pSghr309QNcftUVseg==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.5.0.tgz",
+            "integrity": "sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==",
             "dev": true,
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
             },
             "peerDependencies": {
-                "vite": "^4.0.0",
+                "vite": "^4.0.0 || ^5.0.0",
                 "vue": "^3.2.25"
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
-            "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz",
+            "integrity": "sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.21.3",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
-            "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz",
+            "integrity": "sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-core": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
-            "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz",
+            "integrity": "sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/reactivity-transform": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.8",
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/compiler-ssr": "3.3.8",
+                "@vue/reactivity-transform": "3.3.8",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0",
-                "postcss": "^8.1.10",
+                "magic-string": "^0.30.5",
+                "postcss": "^8.4.31",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
-            "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz",
+            "integrity": "sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -598,83 +598,83 @@
             }
         },
         "node_modules/@vue/reactivity-transform": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
-            "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz",
+            "integrity": "sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.8",
+                "@vue/shared": "3.3.8",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0"
+                "magic-string": "^0.30.5"
             }
         },
         "node_modules/@vue/reactivity-transform/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
-            "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.8.tgz",
+            "integrity": "sha512-qurzOlb6q26KWQ/8IShHkMDOuJkQnQcTIp1sdP4I9MbCf9FJeGVRXJFr2mF+6bXh/3Zjr9TDgURXrsCr9bfjUw==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/reactivity": "3.3.8",
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
-            "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.8.tgz",
+            "integrity": "sha512-ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.3.4"
+                "@vue/shared": "3.3.8"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
-            "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.8.tgz",
+            "integrity": "sha512-Noy5yM5UIf9UeFoowBVgghyGGPIDPy1Qlqt0yVsUdAVbqI8eeMSsTqBtauaEoT2UFXUk5S64aWVNJN4MJ2vRdA==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.3.4",
-                "@vue/shared": "3.3.4",
-                "csstype": "^3.1.1"
+                "@vue/runtime-core": "3.3.8",
+                "@vue/shared": "3.3.8",
+                "csstype": "^3.1.2"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
-            "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.8.tgz",
+            "integrity": "sha512-zVCUw7RFskvPuNlPn/8xISbrf0zTWsTSdYTsUTN1ERGGZGVnRxM2QZ3x1OR32+vwkkCm0IW6HmJ49IsPm7ilLg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-ssr": "3.3.8",
+                "@vue/shared": "3.3.8"
             },
             "peerDependencies": {
-                "vue": "3.3.4"
+                "vue": "3.3.8"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -683,9 +683,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/alpinejs": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.1.tgz",
-            "integrity": "sha512-/LZ7mumW02V7AV5xTTftJFHS0I3KOXLl7tHm4xpxXAV+HJ/zjTT0n8MU7RZ6UoGPhmO/i+KEhQojaH/0RsH5tg==",
+            "version": "3.13.2",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.2.tgz",
+            "integrity": "sha512-WzojeeN082kLZznGI1HAuP8yFJSWqJ1fGdz2mUjj45H4y0XwToE7fFqtI3mCPRR+BpcSbxT/NL+FyPnYAWSltw==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -756,9 +756,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-            "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
             "dev": true,
             "dependencies": {
                 "follow-redirects": "^1.15.0",
@@ -956,9 +956,9 @@
             }
         },
         "node_modules/daisyui": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.0.3.tgz",
-            "integrity": "sha512-mG6PsdIA6MEHzdJwBlJxc1rqsIAAlcfhj2O8g0ol1uWg5y6C5zTcqfG8vKBqK4y2YfCxGIVgMsMWRTSm32N1Ow==",
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.3.1.tgz",
+            "integrity": "sha512-dCi91VD+57lkoBd10CjdW4wPOeOPYvvzQbxti6xmyQbDMbCeCXwNq2KdoU798I4OsCcD5B+n7yVG7HAgYW+cvw==",
             "dependencies": {
                 "css-selector-tokenizer": "^0.8",
                 "culori": "^3",
@@ -1153,9 +1153,9 @@
             "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
         },
         "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "hasInstallScript": true,
             "optional": true,
             "os": [
@@ -1335,12 +1335,12 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
         },
         "node_modules/magic-string": {
-            "version": "0.30.0",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-            "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+            "version": "0.30.5",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.4.13"
+                "@jridgewell/sourcemap-codec": "^1.4.15"
             },
             "engines": {
                 "node": ">=12"
@@ -1711,9 +1711,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "3.29.3",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz",
-            "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==",
+            "version": "3.29.4",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+            "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
             "dev": true,
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -1922,9 +1922,9 @@
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "node_modules/vite": {
-            "version": "4.4.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
-            "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
+            "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.18.10",
@@ -1977,35 +1977,40 @@
             }
         },
         "node_modules/vite-plugin-full-reload": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.0.5.tgz",
-            "integrity": "sha512-kVZFDFWr0DxiHn6MuDVTQf7gnWIdETGlZh0hvTiMXzRN80vgF4PKbONSq8U1d0WtHsKaFODTQgJeakLacoPZEQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.1.0.tgz",
+            "integrity": "sha512-3cObNDzX6DdfhD9E7kf6w2mNunFpD7drxyNgHLw+XwIYAgb+Xt16SEXo0Up4VH+TMf3n+DSVJZtW2POBGcBYAA==",
             "dev": true,
             "dependencies": {
                 "picocolors": "^1.0.0",
                 "picomatch": "^2.3.1"
-            },
-            "peerDependencies": {
-                "vite": "^2 || ^3 || ^4"
             }
         },
         "node_modules/vue": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
-            "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.8.tgz",
+            "integrity": "sha512-5VSX/3DabBikOXMsxzlW8JyfeLKlG9mzqnWgLQLty88vdZL7ZJgrdgBOmrArwxiLtmS+lNNpPcBYqrhE6TQW5w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-sfc": "3.3.4",
-                "@vue/runtime-dom": "3.3.4",
-                "@vue/server-renderer": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.8",
+                "@vue/compiler-sfc": "3.3.8",
+                "@vue/runtime-dom": "3.3.8",
+                "@vue/server-renderer": "3.3.8",
+                "@vue/shared": "3.3.8"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz",
+            "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -6,19 +6,19 @@
         "build": "vite build"
     },
     "devDependencies": {
-        "@vitejs/plugin-vue": "4.4.0",
+        "@vitejs/plugin-vue": "4.5.0",
         "autoprefixer": "10.4.16",
-        "axios": "1.5.1",
+        "axios": "1.6.2",
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.31",
         "tailwindcss": "3.3.5",
-        "vite": "4.4.11",
-        "vue": "3.3.4"
+        "vite": "4.5.0",
+        "vue": "3.3.8"
     },
     "dependencies": {
         "@tailwindcss/typography": "0.5.10",
-        "alpinejs": "3.13.1",
-        "daisyui": "4.0.3",
+        "alpinejs": "3.13.2",
+        "daisyui": "4.3.1",
         "tailwindcss-scrollbar": "0.1.0"
     }
 }

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.139"
+            "version": "4.0.0-beta.142"
         }
     }
 }