Sharp 9

.browserslistrc

@@ -0,0 +1,2 @@
+> 0.25%
+not dead

.gitattributes

@@ -11,6 +11,7 @@
 /docs export-ignore
 /README.md export-ignore
 /ABOUT.md export-ignore
-/resources/assets/js export-ignore
-/resources/assets/sass export-ignore
+/resources/js export-ignore
+/resources/sass export-ignore
 /packages export-ignore
+/src/Dev export-ignore

.github/workflows/e2e.yml

@@ -0,0 +1,64 @@
+name: E2E Tests (playwright)
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, dom, fileinfo, mysql
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Install dependencies
+        run: npm ci
+      - name: Install Composer dependencies
+        run: composer install
+      - name: Build assets
+        run: npm run build
+      - name: Install dependencies
+        run: npm ci
+        working-directory: tests-e2e
+      - name: Install Playwright Browsers
+        run: npx playwright install chromium --with-deps
+        working-directory: tests-e2e
+      - name: Install Composer dependencies
+        run: composer install
+        working-directory: tests-e2e/site
+      - name: Create .env
+        run: cp .env.e2e.ci .env
+        working-directory: tests-e2e/site
+      - name: Generate app key
+        run: php artisan key:generate
+        working-directory: tests-e2e/site
+      - name: Setup DB
+        run: |
+          touch database/database.sqlite
+          php artisan snapshot:load e2e-seed
+        working-directory: tests-e2e/site
+      - name: Run server
+        run: php artisan serve --host=127.0.0.1 --port=8080 &
+        working-directory: tests-e2e/site
+      - name: Run Playwright tests
+        run: npx playwright test
+        working-directory: tests-e2e
+        env:
+          CI: true
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: report
+          path: |
+            tests-e2e/playwright-report/
+            tests-e2e/site/storage/logs/
+          retention-days: 30

.github/workflows/tests.yml

@@ -0,0 +1,68 @@
+name: Tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+      - "9.0"
+jobs:
+
+  # Unit tests back (phpunit)
+  laravel-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - php: 8.2
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
+          - php: 8.3
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
+          - php: 8.4
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
+    env: ${{ matrix.env }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, dom, fileinfo, mysql
+      - name: Setup locales
+        run: sudo locale-gen fr_FR.UTF-8
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install Composer dependencies
+        run: |
+          composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
+          composer update --prefer-stable --prefer-dist --no-interaction
+      - name: Execute tests via Pest
+        run: ./vendor/bin/pest --parallel
+
+  slack:
+    needs:
+      - laravel-tests
+#      - e2e-tests
+    if: failure() && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: 8398a7/action-slack@v2.4.0
+        with:
+          status: failure
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.gitignore

@@ -3,9 +3,10 @@ node_modules
 .idea
 .DS_Store
 .phpunit.result.cache
+.phpunit.cache
 .php-cs-fixer.cache
 /composer.lock
 /public
 /saturn
-/resources/assets/dist/hot
-/.phpunit.cache
+/dist/hot
+/resources/assets/dist

babel.config.js

@@ -1,4 +1,16 @@
+/**
+ * @type {import('@babel/core').TransformOptions}
+ */
 module.exports = {
+    presets: [
+        [
+            '@babel/preset-env',
+            {
+                "useBuiltIns": "usage",
+                "corejs": "3.36"
+            }
+        ],
+    ],
     env: {
         'test': {
             presets: [

components.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://shadcn-vue.com/schema.json",
+  "style": "default",
+  "typescript": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "resources/css/shadcn.css",
+    "baseColor": "slate",
+    "cssVariables": true
+  },
+  "framework": "laravel",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/utils/cn"
+  }
+}

composer.json

@@ -13,24 +13,33 @@
     ],
     "require": {
         "php": "8.2.*|8.3.*|8.4.*",
-        "code16/laravel-content-renderer": "^1.1.0",
+        "ext-dom": "*",
+        "blade-ui-kit/blade-icons": "^1.6",
+        "code16/laravel-content-renderer": "^1.1",
+        "inertiajs/inertia-laravel": "^2.0",
         "intervention/image": "^3.4",
         "intervention/image-laravel": "^1.2",
-        "laravel/framework": "^10.0|^11.0",
+        "laravel/framework": "^11.0",
+        "laravel/prompts": "0.*",
         "league/commonmark": "^2.4",
-        "spatie/image-optimizer": "^1.6"
+        "masterminds/html5": "^2.8",
+        "spatie/image-optimizer": "^1.6",
+        "tightenco/ziggy": "^2.0"
     },
     "require-dev": {
-        "brianium/paratest": "^6.3|^7.4",
-        "dms/phpunit-arraysubset-asserts": "^0.4|^0.5",
+        "brianium/paratest": "^7.0",
         "doctrine/dbal": "^3.5",
         "friendsofphp/php-cs-fixer": "^3.8",
         "laravel/pint": "1.18.3",
         "mockery/mockery": "^1.5.0",
-        "nunomaduro/collision": "^7.0|^8.0",
+        "nunomaduro/collision": "^8.0",
         "orchestra/testbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^9.5|^10.5",
-        "spatie/laravel-ray": "^1.26"
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
+        "phpunit/phpunit": "^11.0",
+        "spatie/laravel-ray": "^1.26",
+        "spatie/laravel-typescript-transformer": "^2.3",
+        "spatie/typescript-transformer": "^2.2"
     },
     "autoload": {
         "files": [
@@ -42,16 +51,18 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Code16\\Sharp\\Tests\\": "tests/"
+            "Code16\\Sharp\\Tests\\": "tests/",
+            "App\\": "vendor/orchestra/testbench-core/laravel/app"
         }
     },
     "scripts": {
-        "test": "vendor/bin/testbench package:test --parallel"
+        "test": "vendor/bin/testbench package:test --parallel",
+        "typescript:generate": "php demo/artisan ziggy:generate --types-only; php demo/artisan typescript:transform"
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Code16\\Sharp\\SharpServiceProvider"
+                "Code16\\Sharp\\SharpInternalServiceProvider"
             ]
         }
     },