fix clear assets

enjin · Sep 23, 2024 · a891e43 · a891e43
1 parent d38a800
commit a891e43
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/src/Console/InstallPlatformUi.php b/src/Console/InstallPlatformUi.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\File;
 
 class InstallPlatformUi extends Command
 {
@@ -15,6 +16,7 @@ class InstallPlatformUi extends Command
     public function handle()
     {
         $this->resetJSON();
+        $this->clearPlatformUIAssets();
 
         $this->askForInput('Do you want to enable multi-tenancy? (yes/no)', 'MULTI_TENANCY_VALUE', 'false', 'tenant');
         $route = $this->askForInput('Please enter the default route path? (optional)', 'ROUTE_VALUE', '', 'route');
@@ -109,4 +111,13 @@ private function updateRoute($value)
             )
         );
     }
+
+    public function clearPlatformUIAssets()
+    {
+        $path = public_path('vendor/platform-ui');
+
+        if (File::exists($path)) {
+            File::deleteDirectory($path);
+        }
+    }
 }
diff --git a/src/Console/RebuildPlatformUi.php b/src/Console/RebuildPlatformUi.php
@@ -3,7 +3,7 @@
 namespace Enjin\PlatformUi\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\File;
 
 class RebuildPlatformUi extends Command
 {
@@ -14,6 +14,8 @@ class RebuildPlatformUi extends Command
 
     public function handle()
     {
+        $this->clearPlatformUIAssets();
+
         $this->comment('Installing Platform UI dependencies...');
         exec('npm install --prefix ' . $this->BASE_DIR . ' 2> /dev/null');
 
@@ -25,4 +27,13 @@ public function handle()
 
         $this->info('Platform UI package Installed successfully.');
     }
+
+    public function clearPlatformUIAssets()
+    {
+        $path = public_path('vendor/platform-ui');
+
+        if (File::exists($path)) {
+            File::deleteDirectory($path);
+        }
+    }
 }
diff --git a/src/PlatformUiServiceProvider.php b/src/PlatformUiServiceProvider.php
@@ -6,7 +6,6 @@
 use Enjin\PlatformUi\Console\RebuildPlatformUi;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Illuminate\Support\Facades\File;
 
 class PlatformUiServiceProvider extends PackageServiceProvider
 {
@@ -37,20 +36,9 @@ public function boot()
 
     public function defineAssetPublishing()
     {
-        $this->clearPlatformUIAssets();
-
         $this->publishes([
             __DIR__ . '/../public' => public_path('vendor/platform-ui'),
             __DIR__ . '/../public/images' => public_path('images'),
         ], ['platform-ui-assets']);
     }
-
-    public function clearPlatformUIAssets()
-    {
-        $path = public_path('vendor/platform-ui');
-
-        if (File::exists($path)) {
-            File::deleteDirectory($path);
-        }
-    }
 }