feat: Better reset command

SRWieZ · SRWieZ · commit d28ed6b2061f · 2025-03-14T10:25:29.000+01:00
diff --git a/src/Commands/ResetCommand.php b/src/Commands/ResetCommand.php
@@ -3,12 +3,15 @@
 namespace Native\Electron\Commands;
 
 use Illuminate\Console\Command;
+use Native\Electron\Traits\SetsAppName;
 use Symfony\Component\Filesystem\Filesystem;
 
 use function Laravel\Prompts\intro;
 
 class ResetCommand extends Command
 {
+    use SetsAppName;
+
     protected $signature = 'native:reset {--with-app-data : Clear the app data as well}';
 
     protected $description = 'Clear all build and dist files';
@@ -43,18 +46,17 @@ public function handle(): int
 
         if ($this->option('with-app-data')) {
 
-            // Fetch last generated app name
-            $packageJsonPath = __DIR__.'/../../resources/js/package.json';
-            $packageJson = json_decode(file_get_contents($packageJsonPath), true);
-            $appName = $packageJson['name'];
+            foreach ([true, false] as $developmentMode) {
+                $appName = $this->setAppName($developmentMode);
 
-            // Eh, just in case, I don't want to delete all user data by accident.
-            if (! empty($appName)) {
-                $appDataPath = $this->appDataDirectory($appName);
-                $this->line('Clearing: '.$appDataPath);
+                // Eh, just in case, I don't want to delete all user data by accident.
+                if ( ! empty($appName)) {
+                    $appDataPath = $this->appDataDirectory($appName);
+                    $this->line('Clearing: '.$appDataPath);
 
-                if ($filesystem->exists($appDataPath)) {
-                    $filesystem->remove($appDataPath);
+                    if ($filesystem->exists($appDataPath)) {
+                        $filesystem->remove($appDataPath);
+                    }
                 }
             }
         }
diff --git a/src/Traits/SetsAppName.php b/src/Traits/SetsAppName.php
@@ -4,7 +4,7 @@
 
 trait SetsAppName
 {
-    protected function setAppName($developmentMode = false): void
+    protected function setAppName($developmentMode = false): string
     {
         $packageJsonPath = __DIR__.'/../../resources/js/package.json';
         $packageJson = json_decode(file_get_contents($packageJsonPath), true);
@@ -23,5 +23,7 @@ protected function setAppName($developmentMode = false): void
         $packageJson['name'] = $name;
 
         file_put_contents($packageJsonPath, json_encode($packageJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+
+        return $name;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`trait SetsAppName`
`6`	`6`	`{`
`7`		`- protected function setAppName($developmentMode = false): void`
	`7`	`+ protected function setAppName($developmentMode = false): string`
`8`	`8`	`{`
`9`	`9`	`$packageJsonPath = __DIR__.'/../../resources/js/package.json';`
`10`	`10`	`$packageJson = json_decode(file_get_contents($packageJsonPath), true);`
`@@ -23,5 +23,7 @@ protected function setAppName($developmentMode = false): void`
`23`	`23`	`$packageJson['name'] = $name;`
`24`	`24`
`25`	`25`	`file_put_contents($packageJsonPath, json_encode($packageJson, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES));`
	`26`	`+`
	`27`	`+ return $name;`
`26`	`28`	`}`
`27`	`29`	`}`