Fix Mix webpack config not being cleaned (#1175)

wintercms · Jul 30, 2024 · f0eeee8 · f0eeee8
1 parent 5198a5c
commit f0eeee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/system/console/asset/mix/MixCompile.php b/modules/system/console/asset/mix/MixCompile.php
@@ -95,9 +95,9 @@ protected function beforeExecution(string $configPath): void
      */
     protected function afterExecution(string $configPath): void
     {
-        $webpackJsPath = $this->getPackagePath($configPath);
-        if (File::exists($webpackJsPath)) {
-            File::delete($webpackJsPath);
+        $webpackConfigPath = $this->getJsConfigPath($configPath);
+        if (File::exists($webpackConfigPath) && File::isFile($webpackConfigPath)) {
+            File::delete($webpackConfigPath);
         }
     }
 }
diff --git a/modules/system/console/asset/mix/MixWatch.php b/modules/system/console/asset/mix/MixWatch.php
@@ -60,7 +60,7 @@ protected function createCommand(string $configPath): array
     public function handleCleanup(): void
     {
         $this->newLine();
-        $this->info('Cleaning up: ' . $this->getPackagePath(base_path($this->watchingFilePath)));
+        $this->info('Cleaning up: ' . $this->getPackagePath($this->watchingFilePath));
         $this->afterExecution(base_path($this->watchingFilePath));
     }
 }