Merge branch 'main' into l12-compatibility

Author: SRWieZ

.github/workflows/run-tests.yml

@@ -23,12 +23,12 @@ jobs:
           - laravel: 10.*
             testbench: ^8.18
             carbon: ^2.67
-            laravel-package-tools: ^1.16
+            laravel-package-tools: ^1.16.4
             collision: 7.*
           - laravel: 11.*
             testbench: 9.*
-            carbon: ^2.67|^3.0
-            laravel-package-tools: ^1.16
+            carbon: "^2.67|^3.0"
+            laravel-package-tools: ^1.16.4
             collision: ^8.1.1
         exclude:
           - laravel: 11.*

composer.json

@@ -34,9 +34,9 @@
         "php": "^8.1",
         "illuminate/contracts": "^10.0|^11.0|^12.0",
         "laravel/prompts": "^0.1.1|^0.2|^0.3",
-        "nativephp/laravel": "^1.0",
+        "nativephp/laravel": "^1.0@beta",
         "nativephp/php-bin": "^0.5.1",
-        "spatie/laravel-package-tools": "^1.14.0"
+        "spatie/laravel-package-tools": "^1.16.4"
     },
     "require-dev": {
         "laravel/pint": "^1.0",

src/Commands/BuildCommand.php

@@ -9,6 +9,7 @@
 use Native\Electron\Facades\Updater;
 use Native\Electron\Traits\InstallsAppIcon;
 use Native\Electron\Traits\OsAndArch;
+use Symfony\Component\Process\Process as SymfonyProcess;
 
 class BuildCommand extends Command
 {
@@ -60,7 +61,7 @@ public function handle(): void
         Process::path(__DIR__.'/../../resources/js/')
             ->env($this->getEnvironmentVariables())
             ->forever()
-            ->tty(PHP_OS_FAMILY != 'Windows' && ! $this->option('no-interaction'))
+            ->tty(SymfonyProcess::isTtySupported() && ! $this->option('no-interaction'))
             ->run("npm run {$buildCommand}:{$os}", function (string $type, string $output) {
                 echo $output;
             });