Merge branch '1.x' into fix/default-weight-unit

Author: alecritson

.github/workflows/fix-code-style.yml

@@ -1,7 +1,7 @@
 name: fix-code-style
 
 on:
-  pull_request:
+  push:
 
 jobs:
   fix-code-style:

composer.json

@@ -9,23 +9,23 @@
         }
     ],
     "require": {
-        "awcodes/filament-badgeable-column": "^2.3.2",
-        "awcodes/shout": "^2.0.4",
+        "awcodes/filament-badgeable-column": "^v3.0.0-beta.1",
+        "awcodes/shout": "^v3.0.0-beta.2",
         "barryvdh/laravel-dompdf": "^3.0",
         "cartalyst/converter": "^9.0|^10",
         "doctrine/dbal": "^3.6|^4.0",
         "dompdf/dompdf": "^3.1",
         "ext-bcmath": "*",
         "ext-exif": "*",
         "ext-intl": "*",
-        "filament/filament": "^3.3.36",
-        "filament/spatie-laravel-media-library-plugin": "^3.3.4",
+        "filament/filament": "^4.1",
+        "filament/spatie-laravel-media-library-plugin": "^4.0",
         "guzzlehttp/guzzle": "^7.3",
         "http-interop/http-factory-guzzle": "^1.2",
         "kalnoy/nestedset": "^v6.0.5",
         "laravel/framework": "^11.0|^12.0",
         "laravel/scout": "^10.13.1",
-        "leandrocfe/filament-apex-charts": "^3.2.0",
+        "leandrocfe/filament-apex-charts": "^5.0",
         "livewire/livewire": "^3.0",
         "lukascivil/treewalker": "0.9.1",
         "lunarphp/lunar": "self.version",
@@ -37,19 +37,20 @@
         "spatie/laravel-medialibrary": "^11.12.7",
         "spatie/laravel-permission": "^6.12",
         "spatie/php-structure-discoverer": "^2.3.1",
-        "stephenjude/filament-two-factor-authentication": "^2.0",
         "stripe/stripe-php": "^16.0",
         "technikermathe/blade-lucide-icons": "^v3.0",
         "typesense/typesense-php": "^4.9"
     },
     "require-dev": {
+        "filament/upgrade": "^4.0",
         "larastan/larastan": "^2.9|^3.0",
         "laravel/pint": "1.17.0",
         "mockery/mockery": "^1.6.9",
         "orchestra/testbench": "^8.0|^9.0|^10.0",
         "pestphp/pest": "^2.0|^3.0",
         "pestphp/pest-plugin-laravel": "^2.0|^3.0",
-        "symplify/monorepo-builder": "^10.0"
+        "phpstan/phpstan": "2.1.17",
+        "symplify/monorepo-builder": "^11.0"
     },
     "autoload": {
         "files": [
@@ -87,6 +88,7 @@
             "Lunar\\Tests\\Search\\": "tests/search"
         }
     },
+    "repositories": [],
     "extra": {
         "lunar": {
             "name": [

packages/admin/composer.json

@@ -13,23 +13,27 @@
         ]
     },
     "minimum-stability": "dev",
+    "repositories": [],
     "require": {
         "lunarphp/core": "self.version",
-        "filament/filament": "^3.3.36",
-        "filament/spatie-laravel-media-library-plugin": "^3.3.4",
+        "filament/filament": "^4.1",
+        "filament/spatie-laravel-media-library-plugin": "^4.0",
         "spatie/laravel-permission": "^6.12",
         "barryvdh/laravel-dompdf": "^3.0",
         "technikermathe/blade-lucide-icons": "^v3.0",
-        "leandrocfe/filament-apex-charts": "^3.2.0",
-        "awcodes/shout": "^2.0.4",
-        "awcodes/filament-badgeable-column": "^2.3.2",
-        "stephenjude/filament-two-factor-authentication": "^2.0"
+        "leandrocfe/filament-apex-charts": "^5.0",
+        "awcodes/shout": "^v3.0.0-beta.2",
+        "awcodes/filament-badgeable-column": "^v3.0.0-beta.1"
     },
     "extra": {
         "laravel": {
             "providers": [
                 "Lunar\\Admin\\LunarPanelProvider"
             ]
         }
+    },
+    "require-dev": {
+        "filament/upgrade": "^4.0",
+        "phpstan/phpstan": "2.1.17"
     }
 }

packages/admin/database/migrations/2025_06_20_100000_rename_two_factor_columns_on_staff_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends \Lunar\Base\Migration
+{
+    public function up(): void
+    {
+        Schema::table($this->prefix.'staff', function (Blueprint $table) {
+            $table->renameColumn('two_factor_secret', 'app_authentication_secret');
+            $table->renameColumn('two_factor_recovery_codes', 'app_authentication_recovery_codes');
+            $table->dropColumn('two_factor_confirmed_at');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table($this->prefix.'staff', function (Blueprint $table) {
+            $table->renameColumn('app_authentication_secret', 'two_factor_secret');
+            $table->renameColumn('app_authentication_recovery_codes', 'two_factor_recovery_codes');
+            $table->timestamp('two_factor_confirmed_at')->nullable();
+        });
+    }
+};

packages/admin/package.json

@@ -2,25 +2,18 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev:styles": "npx tailwindcss -i resources/css/index.css -o resources/dist/lunar-panel.css --postcss --watch",
+        "dev:styles": "npx @tailwindcss/cli -i resources/css/index.css -o resources/dist/lunar-panel.css --watch",
         "dev:scripts": "node bin/build.js --dev",
-        "build:styles": "npx tailwindcss -i resources/css/index.css -o resources/dist/lunar-panel.css --postcss --minify && npm run purge",
+        "build:styles": "npx @tailwindcss/cli -i resources/css/index.css -o resources/dist/lunar-panel.css --minify",
         "build:scripts": "node bin/build.js",
-        "purge": "filament-purge -i resources/dist/lunar-panel.css -o resources/dist/lunar-panel.css -v 3.x",
         "dev": "npm-run-all --parallel dev:*",
         "build": "npm-run-all build:*"
     },
     "devDependencies": {
-        "@awcodes/filament-plugin-purge": "^1.1.1",
-        "@tailwindcss/forms": "^0.5.4",
-        "@tailwindcss/typography": "^0.5.9",
-        "autoprefixer": "^10.4.14",
+        "@tailwindcss/cli": "^4.0.0",
         "esbuild": "^0.19.2",
         "npm-run-all": "^4.1.5",
-        "postcss": "^8.4.26",
-        "postcss-import": "^15.1.0",
         "prettier": "^2.7.1",
-        "prettier-plugin-tailwindcss": "^0.1.13",
-        "tailwindcss": "^3.3.3"
+        "prettier-plugin-tailwindcss": "^0.1.13"
     }
-}
+}

packages/admin/postcss.config.cjs

@@ -1 +1,3 @@
 @import '../../vendor/filament/filament/resources/css/theme.css';
+
+@source '../../resources/views/**/*.blade.php';

packages/admin/resources/css/index.css

@@ -238,6 +238,8 @@
             'notification' => 'Bestellstatus aktualisiert',
         ],
         'update_status' => [
+            'label' => 'Update Status',
+            'notification' => 'Order status updated',
             'new_status' => [
                 'label' => 'Neuer Status',
             ],

packages/admin/resources/dist/lunar-panel.css

@@ -115,6 +115,7 @@
         ],
         'collections' => [
             'label' => 'Sammlungen',
+            'select_collection' => 'Select a collection',
         ],
         'associations' => [
             'label' => 'Produktverknüpfungen',