Remove NPM install option (required for backup system)

Muetze42 · Jun 19, 2022 · 95f526a · 95f526a
1 parent 16f2420
commit 95f526a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -41,12 +41,6 @@ php artisan nova:custom-assets
 composer reinstall laravel/nova
 ```
 
-If you want to skip NPM install use this command:
-
-```
-php artisan nova:custom-assets --without-npm-install
-```
-
 ## Notice
 
 After a Nova update, you need to check your resource files to see if they are still compatible.

diff --git a/src/Console/Commands/CustomAssetsCommand.php b/src/Console/Commands/CustomAssetsCommand.php
@@ -8,13 +8,15 @@ class CustomAssetsCommand extends Command
 {
     protected string $novaPath = 'vendor/laravel/nova';
     protected Process $process;
+    protected string $composerCommand = 'composer';
+    protected string $npmCommand = 'npm';
 
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'nova:custom-assets {--without-npm-install}';
+    protected $signature = 'nova:custom-assets';
 
     /**
      * The console command description.
@@ -30,16 +32,13 @@ class CustomAssetsCommand extends Command
      */
     public function handle(): int
     {
-        $npmInstall = !$this->option('without-npm-install');
         $this->process = new Process;
         $this->novaPath = base_path($this->novaPath);
 
         $this->reinstallNova();
         $this->replaceComponents();
         $this->webpack();
-        if ($npmInstall) {
-            $this->npmInstall();
-        }
+        $this->npmInstall();
         $this->npmProduction();
         $this->publishNovaAssets();
 
@@ -58,7 +57,7 @@ protected function publishNovaAssets()
     protected function npmProduction()
     {
         $this->info('Run NPM production');
-        $command = 'cd '.$this->novaPath.' && npm run production';
+        $command = 'cd '.$this->novaPath.' && '.$this->npmCommand.' run production';
         $this->process->runCommand($command);
         foreach ($this->process->getOutput() as $output) {
             $this->line($output);
@@ -68,7 +67,7 @@ protected function npmProduction()
     protected function reinstallNova()
     {
         $this->info('Reinstall laravel/nova');
-        $this->process->runCommand('composer reinstall laravel/nova');
+        $this->process->runCommand($this->composerCommand.' reinstall laravel/nova');
         foreach ($this->process->getOutput() as $output) {
             $this->line($output);
         }
@@ -110,7 +109,7 @@ protected function replaceComponents($path = 'Nova')
     protected function npmInstall()
     {
         $this->info('Run NPM install');
-        $this->process->runCommand('cd '.$this->novaPath.' && npm i');
+        $this->process->runCommand('cd '.$this->novaPath.' && '.$this->npmCommand.' i');
         foreach ($this->process->getOutput() as $output) {
             $this->line($output);
         }