Merge branch 'main' into improve-charts

# Conflicts:
#	package-lock.json

Author: aguingand

.github/workflows/junie.yml

@@ -0,0 +1,21 @@
+name: Junie
+run-name: Junie run ${{ inputs.run_id }}
+
+permissions:
+  pull-requests: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      run_id:
+        description: "id of workflow process"
+        required: true
+      workflow_params:
+        description: "stringified params"
+        required: true
+
+jobs:
+  call-workflow-passing-data:
+    uses: jetbrains-junie/junie-workflows/.github/workflows/ej-issue.yml@main
+    with:
+      workflow_params: ${{ inputs.workflow_params }}

.github/workflows/tests.yml

@@ -22,6 +22,10 @@ jobs:
             env:
               LARAVEL: 11.*
               TESTBENCH: 9.*
+          - php: 8.5
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
           - php: 8.3
             env:
               LARAVEL: 12.*
@@ -30,6 +34,10 @@ jobs:
             env:
               LARAVEL: 12.*
               TESTBENCH: 10.*
+          - php: 8.5
+            env:
+              LARAVEL: 12.*
+              TESTBENCH: 10.*
 
     env: ${{ matrix.env }}
     steps:

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "8.3.*|8.4.*",
+        "php": "8.3.*|8.4.*|8.5.*",
         "ext-dom": "*",
         "ext-intl": "*",
         "ext-json": "*",
@@ -39,9 +39,9 @@
         "mockery/mockery": "^1.5.0",
         "nunomaduro/collision": "^8.0",
         "orchestra/testbench": "^9.0|^10.0",
-        "pestphp/pest": "^3.0",
-        "pestphp/pest-plugin-laravel": "^3.0",
-        "phpunit/phpunit": "^11.0",
+        "pestphp/pest": "^3.0|^4.0",
+        "pestphp/pest-plugin-laravel": "^3.0|^4.0",
+        "phpunit/phpunit": "^11.0|^12.0",
         "spatie/laravel-ray": "^1.26",
         "spatie/laravel-typescript-transformer": "^2.3",
         "spatie/typescript-transformer": "^2.2"
@@ -62,7 +62,7 @@
     },
     "scripts": {
         "test": "vendor/bin/pest --parallel",
-        "typescript:generate": "php demo/artisan ziggy:generate --types-only; php demo/artisan typescript:transform",
+        "typescript:generate": "php demo/artisan sharp:typescript-generate",
         "post-autoload-dump": [
             "git config core.hooksPath scripts/hooks"
         ]

demo/app/Sharp/Posts/PostForm.php

@@ -6,7 +6,6 @@
 use App\Models\Post;
 use App\Models\User;
 use App\Sharp\Utils\Embeds\AuthorEmbed;
-use App\Sharp\Utils\Embeds\CodeEmbed;
 use App\Sharp\Utils\Embeds\RelatedPostEmbed;
 use App\Sharp\Utils\Embeds\TableOfContentsEmbed;
 use Code16\Sharp\Form\Eloquent\Uploads\Transformers\SharpUploadModelFormAttributeTransformer;
@@ -59,14 +58,13 @@ public function buildFormFields(FieldsContainer $formFields): void
                         SharpFormEditorField::SEPARATOR,
                         SharpFormEditorField::IFRAME,
                         SharpFormEditorField::UPLOAD,
+                        SharpFormEditorField::CODE_BLOCK,
                         AuthorEmbed::class,
-                        CodeEmbed::class,
                     ])
                     ->allowEmbeds([
                         RelatedPostEmbed::class,
                         AuthorEmbed::class,
                         TableOfContentsEmbed::class,
-                        CodeEmbed::class,
                     ])
                     ->allowUploads(
                         SharpFormEditorUpload::make()

demo/app/Sharp/Posts/PostShow.php

@@ -10,7 +10,6 @@
 use App\Sharp\Posts\Commands\EvaluateDraftPostWizardCommand;
 use App\Sharp\Posts\Commands\PreviewPostCommand;
 use App\Sharp\Utils\Embeds\AuthorEmbed;
-use App\Sharp\Utils\Embeds\CodeEmbed;
 use App\Sharp\Utils\Embeds\RelatedPostEmbed;
 use App\Sharp\Utils\Embeds\TableOfContentsEmbed;
 use App\Sharp\Utils\Filters\CategoryFilter;
@@ -41,7 +40,6 @@ protected function buildShowFields(FieldsContainer $showFields): void
                     ->allowEmbeds([
                         RelatedPostEmbed::class,
                         AuthorEmbed::class,
-                        CodeEmbed::class,
                         TableOfContentsEmbed::class,
                     ])
                     ->collapseToWordCount(40)
@@ -157,7 +155,9 @@ public function find(mixed $id): array
                     ->renderAsText($instance->author->name)
                 : null
             )
-            ->setCustomTransformer('categories', new SharpTagsTransformer('name')->setFilterLink(PostEntity::class, CategoryFilter::class))
+            ->setCustomTransformer('categories', (new SharpTagsTransformer('name'))
+                ->setFilterLink(PostEntity::class, CategoryFilter::class)
+            )
             ->setCustomTransformer('cover', new SharpUploadModelThumbnailUrlTransformer(500))
             ->setCustomTransformer(
                 'attachments[document]',

demo/app/Sharp/Utils/Embeds/CodeEmbed.php

@@ -6,7 +6,7 @@
         "bacon/bacon-qr-code": "~2.0",
         "blade-ui-kit/blade-icons": "^1.6",
         "code16/laravel-content-renderer": "^1.2",
-        "enshrined/svg-sanitize": "^0.21.0",
+        "enshrined/svg-sanitize": "^0.22.0",
         "guzzlehttp/guzzle": "^7.2",
         "inertiajs/inertia-laravel": "^2.0",
         "intervention/image": "^3.4",
@@ -27,7 +27,7 @@
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^8.6",
-        "phpunit/phpunit": "^11.0",
+        "phpunit/phpunit": "^12.0",
         "spatie/laravel-ignition": "^2.0",
         "spatie/laravel-ray": "^1.29",
         "spatie/laravel-typescript-transformer": "^2.3"