wip - split the asar contents dir from the electron project

gwleuverink · gwleuverink · commit 06e93e280b98 · 2025-09-26T12:17:37.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,11 @@
 .idea
 .phpunit.cache
-build
 composer.lock
 coverage
 docs
 phpunit.xml
 testbench.yaml
 vendor
 node_modules
+/build
 .DS_Store
-!tests/Build
diff --git a/resources/build/.gitignore b/resources/build/.gitignore
diff --git a/resources/build/IconTemplate.png b/resources/build/IconTemplate.png
diff --git a/resources/build/IconTemplate@2x.png b/resources/build/IconTemplate@2x.png
diff --git a/resources/build/icon.png b/resources/build/icon.png
diff --git a/src/Drivers/Electron/Commands/BuildCommand.php b/src/Drivers/Electron/Commands/BuildCommand.php
@@ -80,7 +80,7 @@ private function buildBundle(): void
 
         $this->newLine();
         intro('Copying latest CA Certificate...');
-        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::ELECTRON_PATH.'/resources');
+        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::electronPath().'/resources');
 
         $this->newLine();
         intro('Copying app icons...');
@@ -105,7 +105,7 @@ private function buildUnsecure(): void
 
         $this->newLine();
         intro('Copying latest CA Certificate...');
-        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::ELECTRON_PATH.'/resources');
+        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::buildPath());
 
         $this->newLine();
         intro('Cleaning .env file...');
@@ -162,7 +162,7 @@ private function updateElectronDependencies(): void
     {
         $this->newLine();
         intro('Updating Electron dependencies...');
-        Process::path(ElectronServiceProvider::ELECTRON_PATH)
+        Process::path(ElectronServiceProvider::electronPath())
             ->env($this->getEnvironmentVariables())
             ->forever()
             ->run('npm ci', function (string $type, string $output) {
@@ -174,7 +174,7 @@ private function buildOrPublish(): void
     {
         $this->newLine();
         intro((($this->buildCommand == 'publish') ? 'Publishing' : 'Building')." for {$this->buildOS}");
-        Process::path(ElectronServiceProvider::ELECTRON_PATH)
+        Process::path(ElectronServiceProvider::electronPath())
             ->env($this->getEnvironmentVariables())
             ->forever()
             ->tty(SymfonyProcess::isTtySupported() && ! $this->option('no-interaction'))
diff --git a/src/Drivers/Electron/Commands/DevelopCommand.php b/src/Drivers/Electron/Commands/DevelopCommand.php
@@ -57,7 +57,7 @@ public function handle(): void
 
         $this->installIcon();
 
-        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::ELECTRON_PATH.'/resources');
+        $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::buildPath());
 
         $this->runDeveloper(
             installer: $this->option('installer'),
@@ -72,7 +72,7 @@ public function handle(): void
      */
     protected function patchPlist(): void
     {
-        $pList = file_get_contents(ElectronServiceProvider::ELECTRON_PATH.'/node_modules/electron/dist/Electron.app/Contents/Info.plist');
+        $pList = file_get_contents(ElectronServiceProvider::electronPath('node_modules/electron/dist/Electron.app/Contents/Info.plist'));
 
         // Change the CFBundleName to the correct app name
         $pattern = '/(<key>CFBundleName<\/key>\s+<string>)(.*?)(<\/string>)/m';
@@ -81,6 +81,6 @@ protected function patchPlist(): void
         $pattern = '/(<key>CFBundleDisplayName<\/key>\s+<string>)(.*?)(<\/string>)/m';
         $pList = preg_replace($pattern, '$1'.config('app.name').'$3', $pList);
 
-        file_put_contents(ElectronServiceProvider::ELECTRON_PATH.'/node_modules/electron/dist/Electron.app/Contents/Info.plist', $pList);
+        file_put_contents(ElectronServiceProvider::electronPath('node_modules/electron/dist/Electron.app/Contents/Info.plist'), $pList);
     }
 }
diff --git a/src/Drivers/Electron/Commands/ResetCommand.php b/src/Drivers/Electron/Commands/ResetCommand.php
@@ -27,7 +27,7 @@ public function handle(): int
         $filesystem = new Filesystem;
 
         // Removing and recreating the native serve resource path
-        $nativeServeResourcePath = realpath(ElectronServiceProvider::ELECTRON_PATH.'/resources/app/');
+        $nativeServeResourcePath = realpath(ElectronServiceProvider::buildPath('app'));
         if ($filesystem->exists($nativeServeResourcePath)) {
             $this->line('Clearing: '.$nativeServeResourcePath);
             $filesystem->remove($nativeServeResourcePath);
diff --git a/src/Drivers/Electron/Traits/ExecuteCommand.php b/src/Drivers/Electron/Traits/ExecuteCommand.php
@@ -35,7 +35,7 @@ protected function executeCommand(
 
         note('Fetching latest dependencies…');
 
-        Process::path(ElectronServiceProvider::ELECTRON_PATH)
+        Process::path(ElectronServiceProvider::electronPath())
             ->env($envs[$type])
             ->forever()
             ->tty(! $withoutInteraction && PHP_OS_FAMILY != 'Windows')
diff --git a/src/Drivers/Electron/Traits/InstallsAppIcon.php b/src/Drivers/Electron/Traits/InstallsAppIcon.php
@@ -8,13 +8,17 @@ trait InstallsAppIcon
 {
     public function installIcon()
     {
-        @copy(public_path('icon.png'), ElectronServiceProvider::ELECTRON_PATH.'/build/icon.png');
-        @copy(public_path('icon.png'), ElectronServiceProvider::ELECTRON_PATH.'/resources/icon.png');
-        @copy(public_path('icon.ico'), ElectronServiceProvider::ELECTRON_PATH.'/build/icon.ico');
-        @copy(public_path('icon.ico'), ElectronServiceProvider::ELECTRON_PATH.'/resources/icon.ico');
-        @copy(public_path('icon.icns'), ElectronServiceProvider::ELECTRON_PATH.'/build/icon.icns');
-        @copy(public_path('icon.icns'), ElectronServiceProvider::ELECTRON_PATH.'/resources/icon.icns');
-        @copy(public_path('IconTemplate.png'), ElectronServiceProvider::ELECTRON_PATH.'/resources/IconTemplate.png');
-        @copy(public_path('IconTemplate@2x.png'), ElectronServiceProvider::ELECTRON_PATH.'/resources/IconTemplate@2x.png');
+        // Copy to Electron project
+        @copy(public_path('icon.png'), ElectronServiceProvider::electronPath('build/icon.png'));
+        @copy(public_path('icon.ico'), ElectronServiceProvider::electronPath('build/icon.ico'));
+        @copy(public_path('icon.icns'), ElectronServiceProvider::electronPath('build/icon.icns'));
+
+        // Copy to asar archive
+        @copy(public_path('icon.png'), ElectronServiceProvider::buildPath('icon.png'));
+        @copy(public_path('icon.ico'), ElectronServiceProvider::buildPath('icon.ico'));
+        @copy(public_path('icon.icns'), ElectronServiceProvider::buildPath('icon.icns'));
+
+        @copy(public_path('IconTemplate.png'), ElectronServiceProvider::buildPath('IconTemplate.png'));
+        @copy(public_path('IconTemplate@2x.png'), ElectronServiceProvider::buildPath('IconTemplate@2x.png'));
     }
 }
diff --git a/src/Drivers/Electron/Traits/PatchesPackagesJson.php b/src/Drivers/Electron/Traits/PatchesPackagesJson.php
@@ -8,7 +8,7 @@ trait PatchesPackagesJson
 {
     protected function setAppNameAndVersion($developmentMode = false): string
     {
-        $packageJsonPath = ElectronServiceProvider::ELECTRON_PATH.'/package.json';
+        $packageJsonPath = ElectronServiceProvider::electronPath('package.json');
         $packageJson = json_decode(file_get_contents($packageJsonPath), true);
 
         $name = str(config('app.name'))->slug();
diff --git a/tests/Build/CopiesCertificateAuthorityTest.php b/tests/Build/CopiesCertificateAuthorityTest.php
@@ -3,16 +3,15 @@
 use Native\Desktop\Builder\Builder;
 use Native\Desktop\Drivers\Electron\ElectronServiceProvider;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Filesystem\Path;
 
 it('can copy the default CA certificate from php-bin', function () {
 
-    $certificatePath = Path::join(ElectronServiceProvider::ELECTRON_PATH, 'resources', 'cacert.pem');
+    $certificatePath = ElectronServiceProvider::buildPath('cacert.pem');
     (new Filesystem)->remove($certificatePath);
 
     expect($certificatePath)->not->toBeFile();
 
-    resolve(Builder::class)->copyCertificateAuthority(path: ElectronServiceProvider::ELECTRON_PATH.'/resources');
+    resolve(Builder::class)->copyCertificateAuthority(path: ElectronServiceProvider::buildPath());
 
     expect($certificatePath)->toBeFile();
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function handle(): void`
`57`	`57`
`58`	`58`	`$this->installIcon();`
`59`	`59`
`60`		`- $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::ELECTRON_PATH.'/resources');`
	`60`	`+ $this->builder->copyCertificateAuthority(path: ElectronServiceProvider::buildPath());`
`61`	`61`
`62`	`62`	`$this->runDeveloper(`
`63`	`63`	`installer: $this->option('installer'),`
`@@ -72,7 +72,7 @@ public function handle(): void`
`72`	`72`	`*/`
`73`	`73`	`protected function patchPlist(): void`
`74`	`74`	`{`
`75`		`- $pList = file_get_contents(ElectronServiceProvider::ELECTRON_PATH.'/node_modules/electron/dist/Electron.app/Contents/Info.plist');`
	`75`	`+ $pList = file_get_contents(ElectronServiceProvider::electronPath('node_modules/electron/dist/Electron.app/Contents/Info.plist'));`
`76`	`76`
`77`	`77`	`// Change the CFBundleName to the correct app name`
`78`	`78`	`$pattern = '/(<key>CFBundleName<\/key>\s+<string>)(.*?)(<\/string>)/m';`
`@@ -81,6 +81,6 @@ protected function patchPlist(): void`
`81`	`81`	`$pattern = '/(<key>CFBundleDisplayName<\/key>\s+<string>)(.*?)(<\/string>)/m';`
`82`	`82`	`$pList = preg_replace($pattern, '$1'.config('app.name').'$3', $pList);`
`83`	`83`
`84`		`- file_put_contents(ElectronServiceProvider::ELECTRON_PATH.'/node_modules/electron/dist/Electron.app/Contents/Info.plist', $pList);`
	`84`	`+ file_put_contents(ElectronServiceProvider::electronPath('node_modules/electron/dist/Electron.app/Contents/Info.plist'), $pList);`
`85`	`85`	`}`
`86`	`86`	`}`