Bring Electron inside the Desktop namespace

gwleuverink · gwleuverink · commit e838e1572063 · 2025-09-25T14:15:53.000+02:00
diff --git a/composer.json b/composer.json
@@ -63,7 +63,6 @@
     "autoload": {
         "psr-4": {
             "Native\\Desktop\\": "src/Desktop",
-            "Native\\Electron\\": "src/Electron",
             "Native\\Support\\": "src/Support"
         }
     },
@@ -94,8 +93,7 @@
     "extra": {
         "laravel": {
             "providers": [
-              "Native\\Desktop\\NativeServiceProvider",
-              "Native\\Electron\\ElectronServiceProvider"
+              "Native\\Desktop\\NativeServiceProvider"
             ],
             "aliases": {
                 "ChildProcess": "Native\\Desktop\\Facades\\ChildProcess",
diff --git a/src/Desktop/Drivers/Electron/Commands/BuildCommand.php b/src/Desktop/Drivers/Electron/Commands/BuildCommand.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Str;
-use Native\Electron\ElectronServiceProvider;
-use Native\Electron\Facades\Updater;
-use Native\Electron\Traits\InstallsAppIcon;
-use Native\Electron\Traits\OsAndArch;
-use Native\Electron\Traits\PatchesPackagesJson;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\Facades\Updater;
+use Native\Desktop\Drivers\Electron\Traits\InstallsAppIcon;
+use Native\Desktop\Drivers\Electron\Traits\OsAndArch;
+use Native\Desktop\Drivers\Electron\Traits\PatchesPackagesJson;
 use Native\Support\Bundler;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Process as SymfonyProcess;
diff --git a/src/Desktop/Drivers/Electron/Commands/BundleCommand.php b/src/Desktop/Drivers/Electron/Commands/BundleCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Carbon\CarbonInterface;
 use Illuminate\Console\Command;
@@ -9,9 +9,9 @@
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Number;
 use Illuminate\Support\Str;
-use Native\Electron\Traits\HandlesZephpyr;
-use Native\Electron\Traits\InstallsAppIcon;
-use Native\Electron\Traits\PatchesPackagesJson;
+use Native\Desktop\Drivers\Electron\Traits\HandlesZephpyr;
+use Native\Desktop\Drivers\Electron\Traits\InstallsAppIcon;
+use Native\Desktop\Drivers\Electron\Traits\PatchesPackagesJson;
 use Native\Support\Bundler;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Finder\Finder;
diff --git a/src/Desktop/Drivers/Electron/Commands/DevelopCommand.php b/src/Desktop/Drivers/Electron/Commands/DevelopCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Illuminate\Console\Command;
-use Native\Electron\ElectronServiceProvider;
-use Native\Electron\Traits\Developer;
-use Native\Electron\Traits\Installer;
-use Native\Electron\Traits\InstallsAppIcon;
-use Native\Electron\Traits\PatchesPackagesJson;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\Traits\Developer;
+use Native\Desktop\Drivers\Electron\Traits\Installer;
+use Native\Desktop\Drivers\Electron\Traits\InstallsAppIcon;
+use Native\Desktop\Drivers\Electron\Traits\PatchesPackagesJson;
 use Native\Support\Bundler;
 use Symfony\Component\Console\Attribute\AsCommand;
 
diff --git a/src/Desktop/Drivers/Electron/Commands/InstallCommand.php b/src/Desktop/Drivers/Electron/Commands/InstallCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Illuminate\Console\Command;
-use Native\Electron\Traits\Installer;
+use Native\Desktop\Drivers\Electron\Traits\Installer;
 use Native\Support\Composer;
 use Symfony\Component\Console\Attribute\AsCommand;
 
diff --git a/src/Desktop/Drivers/Electron/Commands/PublishCommand.php b/src/Desktop/Drivers/Electron/Commands/PublishCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
-use Native\Electron\Traits\OsAndArch;
+use Native\Desktop\Drivers\Electron\Traits\OsAndArch;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 #[AsCommand(
diff --git a/src/Desktop/Drivers/Electron/Commands/ResetCommand.php b/src/Desktop/Drivers/Electron/Commands/ResetCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Native\Electron\Commands;
+namespace Native\Desktop\Drivers\Electron\Commands;
 
 use Illuminate\Console\Command;
-use Native\Electron\ElectronServiceProvider;
-use Native\Electron\Traits\PatchesPackagesJson;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\Traits\PatchesPackagesJson;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Filesystem\Filesystem;
 
diff --git a/src/Desktop/Drivers/Electron/ElectronServiceProvider.php b/src/Desktop/Drivers/Electron/ElectronServiceProvider.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Native\Electron;
+namespace Native\Desktop\Drivers\Electron;
 
 use Illuminate\Foundation\Application;
-use Native\Electron\Commands\BuildCommand;
-use Native\Electron\Commands\BundleCommand;
-use Native\Electron\Commands\DevelopCommand;
-use Native\Electron\Commands\InstallCommand;
-use Native\Electron\Commands\PublishCommand;
-use Native\Electron\Commands\ResetCommand;
-use Native\Electron\Updater\UpdaterManager;
+use Native\Desktop\Drivers\Electron\Commands\BuildCommand;
+use Native\Desktop\Drivers\Electron\Commands\BundleCommand;
+use Native\Desktop\Drivers\Electron\Commands\DevelopCommand;
+use Native\Desktop\Drivers\Electron\Commands\InstallCommand;
+use Native\Desktop\Drivers\Electron\Commands\PublishCommand;
+use Native\Desktop\Drivers\Electron\Commands\ResetCommand;
+use Native\Desktop\Drivers\Electron\Updater\UpdaterManager;
 use Native\Support\Bundler;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class ElectronServiceProvider extends PackageServiceProvider
 {
-    const ELECTRON_PATH = __DIR__.'/../../resources/electron';
+    const ELECTRON_PATH = __DIR__.'/../../../../resources/electron';
 
     public function configurePackage(Package $package): void
     {
diff --git a/src/Desktop/Drivers/Electron/Facades/Updater.php b/src/Desktop/Drivers/Electron/Facades/Updater.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Facades;
+namespace Native\Desktop\Drivers\Electron\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
diff --git a/src/Desktop/Drivers/Electron/Traits/Developer.php b/src/Desktop/Drivers/Electron/Traits/Developer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
 use function Laravel\Prompts\note;
 
diff --git a/src/Desktop/Drivers/Electron/Traits/ExecuteCommand.php b/src/Desktop/Drivers/Electron/Traits/ExecuteCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
 use Illuminate\Support\Facades\Process;
-use Native\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 use Native\Support\Bundler;
 
 use function Laravel\Prompts\note;
diff --git a/src/Desktop/Drivers/Electron/Traits/HandlesZephpyr.php b/src/Desktop/Drivers/Electron/Traits/HandlesZephpyr.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/src/Desktop/Drivers/Electron/Traits/Installer.php b/src/Desktop/Drivers/Electron/Traits/Installer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\error;
diff --git a/src/Desktop/Drivers/Electron/Traits/InstallsAppIcon.php b/src/Desktop/Drivers/Electron/Traits/InstallsAppIcon.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
-use Native\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 
 trait InstallsAppIcon
 {
diff --git a/src/Desktop/Drivers/Electron/Traits/OsAndArch.php b/src/Desktop/Drivers/Electron/Traits/OsAndArch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
 use function Laravel\Prompts\select;
 
diff --git a/src/Desktop/Drivers/Electron/Traits/PatchesPackagesJson.php b/src/Desktop/Drivers/Electron/Traits/PatchesPackagesJson.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Drivers\Electron\Traits;
 
-use Native\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 
 trait PatchesPackagesJson
 {
diff --git a/src/Desktop/Drivers/Electron/Updater/Contracts/Updater.php b/src/Desktop/Drivers/Electron/Updater/Contracts/Updater.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Updater\Contracts;
+namespace Native\Desktop\Drivers\Electron\Updater\Contracts;
 
 interface Updater
 {
diff --git a/src/Desktop/Drivers/Electron/Updater/GitHubProvider.php b/src/Desktop/Drivers/Electron/Updater/GitHubProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Native\Electron\Updater;
+namespace Native\Desktop\Drivers\Electron\Updater;
 
-use Native\Electron\Updater\Contracts\Updater;
+use Native\Desktop\Drivers\Electron\Updater\Contracts\Updater;
 
 class GitHubProvider implements Updater
 {
diff --git a/src/Desktop/Drivers/Electron/Updater/S3Provider.php b/src/Desktop/Drivers/Electron/Updater/S3Provider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Native\Electron\Updater;
+namespace Native\Desktop\Drivers\Electron\Updater;
 
-use Native\Electron\Updater\Contracts\Updater;
+use Native\Desktop\Drivers\Electron\Updater\Contracts\Updater;
 
 class S3Provider implements Updater
 {
diff --git a/src/Desktop/Drivers/Electron/Updater/SpacesProvider.php b/src/Desktop/Drivers/Electron/Updater/SpacesProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Native\Electron\Updater;
+namespace Native\Desktop\Drivers\Electron\Updater;
 
-use Native\Electron\Updater\Contracts\Updater;
+use Native\Desktop\Drivers\Electron\Updater\Contracts\Updater;
 
 class SpacesProvider implements Updater
 {
diff --git a/src/Desktop/Drivers/Electron/Updater/UpdaterManager.php b/src/Desktop/Drivers/Electron/Updater/UpdaterManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Updater;
+namespace Native\Desktop\Drivers\Electron\Updater;
 
 use InvalidArgumentException;
 
@@ -35,7 +35,7 @@ public function __construct($app)
      * Get a updater provider instance by name, wrapped in a repository.
      *
      * @param  string|null  $name
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      */
     public function provider($name = null)
     {
@@ -48,7 +48,7 @@ public function provider($name = null)
      * Get a updater provider instance.
      *
      * @param  string|null  $driver
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      */
     public function driver($driver = null)
     {
@@ -59,7 +59,7 @@ public function driver($driver = null)
      * Resolve the given store.
      *
      * @param  string  $name
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      *
      * @throws \InvalidArgumentException
      */
@@ -132,7 +132,7 @@ public function setApplication($app)
     /**
      * Create an instance of the spaces updater driver.
      *
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      */
     protected function createSpacesDriver(array $config)
     {
@@ -142,7 +142,7 @@ protected function createSpacesDriver(array $config)
     /**
      * Create an instance of the spaces updater driver.
      *
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      */
     protected function createS3Driver(array $config)
     {
@@ -152,7 +152,7 @@ protected function createS3Driver(array $config)
     /**
      * Create an instance of the GitHub updater driver.
      *
-     * @return \Native\Electron\Updater\Contracts\Updater
+     * @return \Native\Desktop\Drivers\Electron\Updater\Contracts\Updater
      */
     protected function createGitHubDriver(array $config)
     {
diff --git a/src/Desktop/NativeServiceProvider.php b/src/Desktop/NativeServiceProvider.php
@@ -21,6 +21,7 @@
 use Native\Desktop\Contracts\PowerMonitor as PowerMonitorContract;
 use Native\Desktop\Contracts\QueueWorker as QueueWorkerContract;
 use Native\Desktop\Contracts\WindowManager as WindowManagerContract;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 use Native\Desktop\DTOs\QueueConfig;
 use Native\Desktop\Events\EventWatcher;
 use Native\Desktop\Exceptions\Handler;
@@ -53,6 +54,8 @@ public function configurePackage(Package $package): void
 
     public function packageRegistered()
     {
+        $this->app->register(ElectronServiceProvider::class);
+
         $this->mergeConfigFrom($this->package->basePath('../config/nativephp-internal.php'), 'nativephp-internal');
 
         $this->app->singleton(FreshCommand::class, function ($app) {
diff --git a/tests/Build/CopiesCertificateAuthorityTest.php b/tests/Build/CopiesCertificateAuthorityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Native\Electron\ElectronServiceProvider;
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 use Native\Support\Bundler;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace Native\Desktop\Tests;
 
+use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 use Native\Desktop\NativeServiceProvider;
-use Native\Electron\ElectronServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra
