Update to Node 20

kcal-app · May 4, 2024 · d77dba0 · d77dba0
1 parent e25d552
commit d77dba0
Show file tree

Hide file tree

Showing 13 changed files with 3,345 additions and 10,471 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14
+20
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -240,6 +240,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -481,6 +482,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -722,6 +724,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -963,6 +966,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -1204,6 +1208,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -1445,6 +1450,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -1686,6 +1692,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -1927,6 +1934,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -2168,6 +2176,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -2409,6 +2418,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
@@ -2650,6 +2660,7 @@
             'queue.worker' => \Illuminate\Queue\Worker::class,
             'redirect' => \Illuminate\Routing\Redirector::class,
             'redis' => \Illuminate\Redis\RedisManager::class,
+            'redis.connection' => \Illuminate\Redis\Connections\PhpRedisConnection::class,
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 ARG MEDIA_LIBRARY_DEPS="jpegoptim optipng pngquant gifsicle"
 
-FROM docker pull mcr.microsoft.com/devcontainers/php:8.2 AS base
+FROM php:8.2-fpm-alpine
+
 ARG MEDIA_LIBRARY_DEPS
 
 RUN apk add --no-cache --virtual \

diff --git a/database/Factories/RecipeFactory.php b/database/Factories/RecipeFactory.php
@@ -22,12 +22,12 @@ class RecipeFactory extends Factory
      */
     public function definition(): array
     {
-        $description = htmlspecialchars($this->faker->realText(500));
+        $description = $this->faker->realText(500);
         $volumes = [1/4, 1/3, 1/2, 2/3, 3/4, 1, 1 + 1/2, 1 + 3/4, 2, 2 + 1/2, 3, 3 + 1/2, 4, 5];
         return [
             'name' => Words::randomWords(Arr::random(['npan', 'npn', 'anpn'])),
             'description' => "<p>{$description}</p>",
-            'description_delta' => '{"ops":[{"insert":"' . htmlentities($description) . '\n"}]}"',
+            'description_delta' => '{"ops":[{"insert":"' . $description . '\n"}]}',
             'time_prep' => $this->faker->numberBetween(0, 20),
             'time_cook' => $this->faker->numberBetween(0, 90),
             'source' => $this->faker->optional()->url,