Merge branch '4.0-dev' into project-checklist-ui-fix-2171

.gitignore

@@ -15,9 +15,7 @@ release/*
 logs/*
 target/*
 backupdb/*
-public/js/*.min.js
-public/js/*.map
-public/css/*.css
+public/dist/*
 
 # PHPStorm specific git ignore to be able to share inspection configs and run tools
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@@ -128,4 +126,9 @@ config/.env
 caddy
 frankenphp
 frankenphp-worker.php
+storage/event_cache.json
+config/_configuration.php
+.idea/codebuddy.xml
+.codebuddy/summary.md
 
+herd.yml

app/Core/Events/EventDispatcher.php

@@ -64,6 +64,13 @@ public function addEventListener(
             'isWild' => $isWild];
     }
 
+    public function add_event_listener(  $eventName,
+        string|callable|object $handler,
+        int $priority = 10
+    ): void {
+        $this->addEventListener($eventName, $handler, $priority);
+    }
+
     //Support laravel event listeners
     public function listen($events, $listener = null)
     {
@@ -199,6 +206,13 @@ public function addFilterListener(
         $this->filterRegistry[$filtername][] = ['handler' => $handler, 'priority' => $priority];
     }
 
+    public function add_filter_listener(  string $filtername,
+        string|callable|object $handler,
+        int $priority = 10
+    ): void {
+        $this->addFilterListener($filtername, $handler, $priority);
+    }
+
     /**
      * Gets all registered listeners
      */

app/Core/Providers/ViewServiceProvider.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Core\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Blade;
+use Leantime\Core\Support\AssetHelper;
+
+class ViewServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        Blade::directive('mix', function ($expression) {
+            return "<?php echo \Leantime\Core\Support\AssetHelper::mix($expression); ?>";
+        });
+    }
+}

app/Core/Providers/Views.php

@@ -299,7 +299,12 @@ private function discoverComposerPaths()
         return $composerList;
     }
 
-    public function boot() {}
+    public function boot(BladeCompiler $blade)
+    {
+        $blade->directive('mix', function ($expression) {
+            return "<?php echo \Leantime\Core\Support\AssetHelper::mix($expression); ?>";
+        });
+    }
 
     public function getViewPaths()
     {

app/Core/Support/AssetHelper.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Leantime\Core\Support;
+
+use Illuminate\Support\Facades\File;
+
+class AssetHelper
+{
+    protected static $manifestPath = '/public/dist/mix-manifest.json';
+    protected static $manifest = null;
+
+    public static function mix($path)
+    {
+        if (static::$manifest === null) {
+            if (File::exists(base_path().static::$manifestPath)) {
+                static::$manifest = json_decode(File::get(base_path().static::$manifestPath), true);
+            } else {
+                static::$manifest = [];
+            }
+        }
+
+        if (!str_starts_with($path, '/')) {
+            $path = "/{$path}";
+        }
+
+        if (isset(static::$manifest[$path])) {
+            return '/dist/' . ltrim(static::$manifest[$path], '/');
+        }
+
+        return '/dist/' . ltrim($path, '/');
+    }
+}

app/Core/Support/Mix.php

@@ -58,9 +58,15 @@ public function __construct()
 
     public function __invoke(string $path, string $manifestDirectory = ''): string
     {
+
+        //Remove trailing slash
+
+
         $manifestDirectory = Str::start('/', $manifestDirectory ?: APP_ROOT.'/public/dist');
         $path = Str::start($path, '/');
 
+        $manifestDirectory = rtrim($manifestDirectory, '/');
+
         if (! isset($this->manifest[$manifestDirectory])) {
             throw new \Exception("Unable to locate Manifest in: {$manifestDirectory}.");
         }