🐛 Fix Acorn registration when using Navi as a plugin (#71)

Co-authored-by: Brandon <[email protected]>
Log1x · Mar 18, 2024 · 83580d1 · 83580d1
1 parent fe38c4c
commit 83580d1
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 27 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/plugin.php b/plugin.php
@@ -9,20 +9,20 @@
  * Author URI:  https://github.com/log1x
  */
 
+if (! file_exists($composer = __DIR__ . '/vendor/autoload.php')) {
+    return;
+}
+
+require_once $composer;
+
 add_filter('after_setup_theme', function () {
-    if (file_exists($composer = __DIR__ . '/vendor/autoload.php')) {
-        require_once $composer;
+    if (! function_exists('Roots\bootloader')) {
+        return;
     }
 
-    if (function_exists('Roots\bootloader')) {
-        Roots\bootloader(function (Roots\Acorn\Application $app) {
-            $app->register(
-                Log1x\Navi\Providers\NaviServiceProvider::class
-            );
+    $app = Roots\bootloader()->getApplication();
 
-            Roots\Acorn\AliasLoader::getInstance([
-                'navi' => Log1x\Navi\Facades\Navi::class
-            ])->register();
-        });
-    }
+    $app->register(Log1x\Navi\Providers\NaviServiceProvider::class);
+
+    $app->alias('navi', Log1x\Navi\Facades\Navi::class);
 }, 20);