NativePHP · gwleuverink · Sep 24, 2025 · Sep 24, 2025 · Sep 24, 2025 · Sep 25, 2025
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ testbench.yaml
 vendor
 node_modules
 .DS_Store
+!tests/Build
diff --git a/composer.json b/composer.json
@@ -61,8 +61,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Native\\Desktop\\": "src/Desktop",
-            "Native\\Electron\\": "src/Electron"
+            "Native\\Desktop\\": "src"
         }
     },
     "autoload-dev": {
@@ -92,8 +91,7 @@
     "extra": {
         "laravel": {
             "providers": [
-              "Native\\Desktop\\NativeServiceProvider",
-              "Native\\Electron\\ElectronServiceProvider"
+              "Native\\Desktop\\NativeServiceProvider"
             ],
             "aliases": {
                 "ChildProcess": "Native\\Desktop\\Facades\\ChildProcess",

diff --git a/phpstan.neon b/phpstan.neon
@@ -18,4 +18,4 @@ parameters:
 
 
     excludePaths:
-        - ./src/Desktop/NativeServiceProvider.php
+        - ./src/NativeServiceProvider.php
diff --git a/resources/electron/build/icon.png b/resources/electron/build/icon.png
diff --git a/src/Desktop/Alert.php → src/Alert.php b/src/Desktop/Alert.php → src/Alert.php
diff --git a/src/Desktop/App.php → src/App.php b/src/Desktop/App.php → src/App.php
diff --git a/src/Desktop/AutoUpdater.php → src/AutoUpdater.php b/src/Desktop/AutoUpdater.php → src/AutoUpdater.php
diff --git a/src/Builder/Builder.php b/src/Builder/Builder.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Native\Desktop\Builder;
+
+use Native\Desktop\Builder\Concerns\CleansEnvFile;
+use Native\Desktop\Builder\Concerns\CopiesBundleToBuildDirectory;
+use Native\Desktop\Builder\Concerns\CopiesCertificateAuthority;
+use Native\Desktop\Builder\Concerns\CopiesToBuildDirectory;
+use Native\Desktop\Builder\Concerns\HasPreAndPostProcessing;
+use Native\Desktop\Builder\Concerns\LocatesPhpBinary;
+use Native\Desktop\Builder\Concerns\PrunesVendorDirectory;
+use Symfony\Component\Filesystem\Path;
+
+class Builder
+{
+    use CleansEnvFile;
+    use CopiesBundleToBuildDirectory;
+    use CopiesCertificateAuthority;
+    use CopiesToBuildDirectory;
+    use HasPreAndPostProcessing;
+    use LocatesPhpBinary;
+    use PrunesVendorDirectory;
+
+    public function __construct(
+        private string $buildPath,
+        private ?string $sourcePath = null,
+    ) {
+
+        $this->sourcePath = $sourcePath
+            ? $sourcePath
+            : base_path();
+    }
+
+    public static function make(
+        string $buildPath,
+        ?string $sourcePath = null
+    ) {
+        return new self($buildPath, $sourcePath);
+    }
+
+    public function buildPath(string $path = ''): string
+    {
+        return Path::join($this->buildPath, $path);
+    }
+
+    public function sourcePath(string $path = ''): string
+    {
+        return Path::join($this->sourcePath, $path);
+    }
+}
diff --git a/src/Electron/Traits/CleansEnvFile.php → src/Builder/Concerns/CleansEnvFile.php b/src/Electron/Traits/CleansEnvFile.php → src/Builder/Concerns/CleansEnvFile.php
@@ -3,15 +3,13 @@
 /**
  * This trait is responsible for cleaning any sensitive information from the .env file
  * and also injects some defaults that need to be set as soon as possible.
- *
- * TODO: When more drivers/adapters are added, this should be relocated
  */
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 trait CleansEnvFile
 {
-    abstract protected function buildPath(string $path = ''): string;
+    abstract public function buildPath(string $path = ''): string;
 
     public array $overrideKeys = [
         'LOG_CHANNEL',

diff --git a/...n/Traits/CopiesBundleToBuildDirectory.php → ...Concerns/CopiesBundleToBuildDirectory.php b/...n/Traits/CopiesBundleToBuildDirectory.php → ...Concerns/CopiesBundleToBuildDirectory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -12,7 +12,7 @@ trait CopiesBundleToBuildDirectory
 
     protected static string $bundlePath = 'build/__nativephp_app_bundle';
 
-    protected function hasBundled(): bool
+    public function hasBundled(): bool
     {
         return (new Filesystem)->exists($this->sourcePath(self::$bundlePath));
     }
@@ -21,9 +21,9 @@ public function copyBundleToBuildDirectory(): bool
     {
         $filesystem = new Filesystem;
 
-        $this->line('Copying secure app bundle to build directory...');
-        $this->line('From: '.realpath(dirname($this->sourcePath(self::$bundlePath))));
-        $this->line('To: '.realpath(dirname($this->buildPath(self::$bundlePath))));
+        echo 'Copying secure app bundle to build directory...'.PHP_EOL;
+        echo 'From: '.realpath(dirname($this->sourcePath(self::$bundlePath))).PHP_EOL;
+        echo 'To: '.realpath(dirname($this->buildPath(self::$bundlePath))).PHP_EOL;
 
         // Clean and create build directory
         $filesystem->remove($this->buildPath());
@@ -36,7 +36,7 @@ public function copyBundleToBuildDirectory(): bool
         foreach ($filesToCopy as $file) {
             $filesystem->copy($this->sourcePath($file), $this->buildPath($file), true);
         }
-        // $this->keepRequiredDirectories();
+        $this->keepRequiredDirectories();
 
         return true;
     }

diff --git a/...ron/Traits/CopiesCertificateAuthority.php → ...r/Concerns/CopiesCertificateAuthority.php b/...ron/Traits/CopiesCertificateAuthority.php → ...r/Concerns/CopiesCertificateAuthority.php
@@ -1,22 +1,20 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 use Composer\InstalledVersions;
-use Native\Electron\ElectronServiceProvider;
 use Symfony\Component\Filesystem\Path;
 
 use function Laravel\Prompts\error;
-use function Laravel\Prompts\intro;
 use function Laravel\Prompts\warning;
 
 trait CopiesCertificateAuthority
 {
-    protected function copyCertificateAuthorityCertificate(): void
+    abstract public function buildPath(string $path = ''): string;
+
+    public function copyCertificateAuthority(string $path): void
     {
         try {
-            intro('Copying latest CA Certificate...');
-
             $vendorDirectory = realpath(InstalledVersions::getRootPackage()['install_path'].'/vendor');
             $phpBinaryDirectory = $vendorDirectory.'/nativephp/php-bin/';
 
@@ -31,7 +29,7 @@ protected function copyCertificateAuthorityCertificate(): void
 
             $copied = copy(
                 $certFilePath,
-                Path::join(ElectronServiceProvider::ELECTRON_PATH, 'resources', $certificateFileName)
+                "{$path}/{$certificateFileName}"
             );
 
             if (! $copied) {

diff --git a/...lectron/Traits/CopiesToBuildDirectory.php → ...ilder/Concerns/CopiesToBuildDirectory.php b/...lectron/Traits/CopiesToBuildDirectory.php → ...ilder/Concerns/CopiesToBuildDirectory.php
@@ -3,11 +3,9 @@
 /**
  * This trait is responsible for copying over the app to the build directory.
  * It skips any ignored paths/globs during the copy step
- *
- * TODO: When more drivers/adapters are added, this should be relocated
  */
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 use RecursiveCallbackFilterIterator;
 use RecursiveDirectoryIterator;
@@ -19,9 +17,9 @@
 
 trait CopiesToBuildDirectory
 {
-    abstract protected function buildPath(string $path = ''): string;
+    abstract public function buildPath(string $path = ''): string;
 
-    abstract protected function sourcePath(string $path = ''): string;
+    abstract public function sourcePath(string $path = ''): string;
 
     public function copyToBuildDirectory(): bool
     {

diff --git a/...ectron/Traits/HasPreAndPostProcessing.php → ...lder/Concerns/HasPreAndPostProcessing.php b/...ectron/Traits/HasPreAndPostProcessing.php → ...lder/Concerns/HasPreAndPostProcessing.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Process;

diff --git a/src/Electron/Traits/LocatesPhpBinary.php → src/Builder/Concerns/LocatesPhpBinary.php b/src/Electron/Traits/LocatesPhpBinary.php → src/Builder/Concerns/LocatesPhpBinary.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 trait LocatesPhpBinary
 {
+    abstract public function sourcePath(string $path = ''): string;
+
     /**
      * @return string The path to the binary package directory
      */
@@ -19,6 +21,6 @@ protected function binaryPackageDirectory(): string
      */
     public function phpBinaryPath(): string
     {
-        return $this->binaryPackageDirectory().'bin/';
+        return $this->sourcePath($this->binaryPackageDirectory().'bin/');
     }
 }
diff --git a/...Electron/Traits/PrunesVendorDirectory.php → ...uilder/Concerns/PrunesVendorDirectory.php b/...Electron/Traits/PrunesVendorDirectory.php → ...uilder/Concerns/PrunesVendorDirectory.php
@@ -1,19 +1,15 @@
 <?php
 
-/**
- * TODO: When more drivers/adapters are added, this should be relocated
- */
-
-namespace Native\Electron\Traits;
+namespace Native\Desktop\Builder\Concerns;
 
 use Illuminate\Support\Facades\Process;
 use Symfony\Component\Filesystem\Filesystem;
 
 trait PrunesVendorDirectory
 {
-    abstract protected function buildPath(string $path = ''): string;
+    abstract public function buildPath(string $path = ''): string;
 
-    protected function pruneVendorDirectory()
+    public function pruneVendorDirectory()
     {
         Process::path($this->buildPath())
             ->timeout(300)

diff --git a/src/Desktop/ChildProcess.php → src/ChildProcess.php b/src/Desktop/ChildProcess.php → src/ChildProcess.php
diff --git a/src/Desktop/Client/Client.php → src/Client/Client.php b/src/Desktop/Client/Client.php → src/Client/Client.php
diff --git a/src/Desktop/Clipboard.php → src/Clipboard.php b/src/Desktop/Clipboard.php → src/Clipboard.php
diff --git a/src/Desktop/Commands/DebugCommand.php → src/Commands/DebugCommand.php b/src/Desktop/Commands/DebugCommand.php → src/Commands/DebugCommand.php
diff --git a/src/Desktop/Commands/FreshCommand.php → src/Commands/FreshCommand.php b/src/Desktop/Commands/FreshCommand.php → src/Commands/FreshCommand.php
diff --git a/.../Commands/LoadPHPConfigurationCommand.php → src/Commands/LoadPHPConfigurationCommand.php b/.../Commands/LoadPHPConfigurationCommand.php → src/Commands/LoadPHPConfigurationCommand.php
diff --git a/...mands/LoadStartupConfigurationCommand.php → ...mands/LoadStartupConfigurationCommand.php b/...mands/LoadStartupConfigurationCommand.php → ...mands/LoadStartupConfigurationCommand.php
diff --git a/src/Desktop/Commands/MigrateCommand.php → src/Commands/MigrateCommand.php b/src/Desktop/Commands/MigrateCommand.php → src/Commands/MigrateCommand.php
diff --git a/src/Desktop/Commands/SeedDatabaseCommand.php → src/Commands/SeedDatabaseCommand.php b/src/Desktop/Commands/SeedDatabaseCommand.php → src/Commands/SeedDatabaseCommand.php
diff --git a/src/Desktop/Commands/WipeDatabaseCommand.php → src/Commands/WipeDatabaseCommand.php b/src/Desktop/Commands/WipeDatabaseCommand.php → src/Commands/WipeDatabaseCommand.php
diff --git a/src/Desktop/Concerns/DetectsWindowId.php → src/Concerns/DetectsWindowId.php b/src/Desktop/Concerns/DetectsWindowId.php → src/Concerns/DetectsWindowId.php
diff --git a/src/Desktop/Concerns/HasDimensions.php → src/Concerns/HasDimensions.php b/src/Desktop/Concerns/HasDimensions.php → src/Concerns/HasDimensions.php
diff --git a/src/Desktop/Concerns/HasPositioner.php → src/Concerns/HasPositioner.php b/src/Desktop/Concerns/HasPositioner.php → src/Concerns/HasPositioner.php
diff --git a/src/Desktop/Concerns/HasUrl.php → src/Concerns/HasUrl.php b/src/Desktop/Concerns/HasUrl.php → src/Concerns/HasUrl.php
diff --git a/src/Desktop/Concerns/HasVibrancy.php → src/Concerns/HasVibrancy.php b/src/Desktop/Concerns/HasVibrancy.php → src/Concerns/HasVibrancy.php
diff --git a/src/Desktop/ContextMenu.php → src/ContextMenu.php b/src/Desktop/ContextMenu.php → src/ContextMenu.php
diff --git a/src/Desktop/Contracts/ChildProcess.php → src/Contracts/ChildProcess.php b/src/Desktop/Contracts/ChildProcess.php → src/Contracts/ChildProcess.php
diff --git a/src/Desktop/Contracts/GlobalShortcut.php → src/Contracts/GlobalShortcut.php b/src/Desktop/Contracts/GlobalShortcut.php → src/Contracts/GlobalShortcut.php
diff --git a/src/Desktop/Contracts/MenuItem.php → src/Contracts/MenuItem.php b/src/Desktop/Contracts/MenuItem.php → src/Contracts/MenuItem.php
diff --git a/src/Desktop/Contracts/PowerMonitor.php → src/Contracts/PowerMonitor.php b/src/Desktop/Contracts/PowerMonitor.php → src/Contracts/PowerMonitor.php
diff --git a/src/Desktop/Contracts/ProvidesPhpIni.php → src/Contracts/ProvidesPhpIni.php b/src/Desktop/Contracts/ProvidesPhpIni.php → src/Contracts/ProvidesPhpIni.php
diff --git a/src/Desktop/Contracts/QueueWorker.php → src/Contracts/QueueWorker.php b/src/Desktop/Contracts/QueueWorker.php → src/Contracts/QueueWorker.php
@@ -2,7 +2,7 @@
 
 namespace Native\Desktop\Contracts;
 
-use Native\Desktop\DTOs\QueueConfig;
+use Native\Desktop\DataObjects\QueueConfig;
 
 interface QueueWorker
 {

diff --git a/src/Desktop/Contracts/WindowManager.php → src/Contracts/WindowManager.php b/src/Desktop/Contracts/WindowManager.php → src/Contracts/WindowManager.php
diff --git a/src/Desktop/DataObjects/Printer.php → src/DataObjects/Printer.php b/src/Desktop/DataObjects/Printer.php → src/DataObjects/Printer.php
diff --git a/src/Desktop/DTOs/QueueConfig.php → src/DataObjects/QueueConfig.php b/src/Desktop/DTOs/QueueConfig.php → src/DataObjects/QueueConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Native\Desktop\DTOs;
+namespace Native\Desktop\DataObjects;
 
 class QueueConfig
 {

diff --git a/src/Desktop/Dialog.php → src/Dialog.php b/src/Desktop/Dialog.php → src/Dialog.php
diff --git a/src/Desktop/Dock.php → src/Dock.php b/src/Desktop/Dock.php → src/Dock.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@ parameters:


		excludePaths:
		- ./src/Desktop/NativeServiceProvider.php
		- ./src/NativeServiceProvider.php