fix: bundling

Author: SRWieZ

resources/js/electron-plugin/src/server/php.ts

@@ -252,7 +252,10 @@ function serveApp(secret, apiPort, phpIniSettings): Promise<ProcessResult> {
 
         phpServer.stdout.on('data', (data) => {
             // [Tue Jan 14 19:51:00 2025] 127.0.0.1:52779 [POST] URI: /_native/api/events
-            console.log('D:', data.toString());
+
+            if (parseInt(process.env.SHELL_VERBOSITY) > 0) {
+                console.log(data.toString());
+            }
         })
 
 

src/Commands/BundleCommand.php

@@ -221,8 +221,8 @@ private function addFilesToZip(ZipArchive $zip): void
         intro('Creating zip archive…');
 
         $finder = (new Finder)->files()
-            ->followLinks()
-            // ->ignoreVCSIgnored(true) // TODO: Make our own list of ignored files
+            // ->followLinks()
+            ->ignoreVCSIgnored(true) // TODO: Make our own list of ignored files
             ->in($this->buildPath())
             ->exclude([
                 // We add those a few lines below
@@ -239,6 +239,12 @@ private function addFilesToZip(ZipArchive $zip): void
 
         $this->finderToZip($finder, $zip);
 
+        // Why do I have to force this? please someone explain.
+        $this->finderToZip(
+            (new Finder)->files()
+                ->followLinks()
+                ->in($this->buildPath('public/build')), $zip, 'public/build');
+
         // Add .env file manually because Finder ignores VCS and dot files
         $zip->addFile($this->buildPath('.env'), '.env');
 
@@ -306,9 +312,18 @@ private function fetchLatestBundle(): bool
             if ($response->status() === 404) {
                 $this->error('Project or bundle not found.');
             } elseif ($response->status() === 500) {
-                $this->error('Build failed. Please try again later.');
+                $url = $response->json('url');
+
+                if ($url) {
+                    $this->error('Build failed. Inspect the build here: '.$url);
+                } else {
+                    $this->error('Build failed. Please try again later.');
+                }
             } elseif ($response->status() === 503) {
-                $this->warn('Bundle not ready. Please try again in '.now()->addSeconds(intval($response->header('Retry-After')))->diffForHumans(syntax: CarbonInterface::DIFF_ABSOLUTE).'.');
+                $retryAfter = intval($response->header('Retry-After'));
+                $diff = now()->addSeconds($retryAfter);
+                $diffMessage = $retryAfter <= 60 ? 'a minute' : $diff->diffForHumans(syntax: CarbonInterface::DIFF_ABSOLUTE);
+                $this->warn('Bundle not ready. Please try again in '.$diffMessage.'.');
             } else {
                 $this->handleApiErrors($response);
             }
@@ -371,12 +386,12 @@ protected function cleanUp(): void
 
     protected function buildPath(string $path = ''): string
     {
-        return base_path('temp/build/'.$path);
+        return base_path('build/app/'.$path);
     }
 
     protected function zipPath(string $path = ''): string
     {
-        return base_path('temp/zip/'.$path);
+        return base_path('build/zip/'.$path);
     }
 
     protected function sourcePath(string $path = ''): string

src/Traits/CopiesToBuildDirectory.php

@@ -51,6 +51,10 @@ abstract protected function sourcePath(string $path = ''): string;
 
         // Also deleted in PrunesVendorDirectory after fresh composer install
         'vendor/bin',
+
+        // Exlude build & temp directory
+        'build',
+        'temp',
     ];
 
     public function copyToBuildDirectory()