refactor: per Simon's review

NativePHP · simonhamp · Mar 19, 2025 · Mar 4, 2025 · Mar 4, 2025 · Mar 4, 2025
commit 22122a5095b2a471630af8a5d9a45cf466deacf2
diff --git a/resources/js/electron-plugin/src/server/api/childProcess.ts b/resources/js/electron-plugin/src/server/api/childProcess.ts
@@ -79,6 +79,7 @@ function startProcess(settings) {
 
         // Experimental feature on Electron,
         // I keep this here to remember and retry when we upgrade
+        // https://www.electronjs.org/docs/latest/api/utility-process#event-error-experimental
         // proc.on('error', (error) => {
         //     clearTimeout(startTimeout);
         //     console.error(`Process [${alias}] error: ${error.message}`);
@@ -168,11 +169,6 @@ function startPhpProcess(settings) {
         return ['-d', `${key}=${iniSettings[key]}`];
     }).flat();
 
-
-    // if (args[0] === 'artisan' && runningSecureBuild()) {
-    //     args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
-    // }
-
     if (settings.cmd[0] === 'artisan' && runningSecureBuild()) {
         settings.cmd.unshift(join(getAppPath(), 'build', '__nativephp_app_bundle'));
     }

diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts
@@ -308,6 +308,11 @@ function serveApp(secret, apiPort, phpIniSettings): Promise<ProcessResult> {
         // Make sure the storage path is linked - as people can move the app around, we
         // need to run this every time the app starts
         if (!runningSecureBuild()) {
+            /*
+              * Simon: Note for later that we should strip out using storage:link
+              * all of the necessary files for the app to function should be a part of the bundle
+              * (whether it's a secured bundle or not), so symlinking feels redundant
+             */
             console.log('Linking storage path...');
             callPhpSync(['artisan', 'storage:link', '--force'], phpOptions, phpIniSettings)
         }

diff --git a/resources/js/package.json b/resources/js/package.json
@@ -76,7 +76,7 @@
         "@typescript-eslint/parser": "^8.18.1",
         "@vue/eslint-config-prettier": "^10.1.0",
         "cross-env": "^7.0.3",
-        "electron": "^32.2.6",
+        "electron": "^32.2.7",
         "electron-builder": "^25.1.8",
         "electron-chromedriver": "^32.2.6",
         "electron-vite": "^3.0.0",

diff --git a/src/Commands/BundleCommand.php b/src/Commands/BundleCommand.php
@@ -11,7 +11,7 @@
 use Illuminate\Support\Str;
 use Native\Electron\Traits\CleansEnvFile;
 use Native\Electron\Traits\CopiesToBuildDirectory;
-use Native\Electron\Traits\HandleApiRequests;
+use Native\Electron\Traits\HandlesZephpyr;
 use Native\Electron\Traits\HasPreAndPostProcessing;
 use Native\Electron\Traits\InstallsAppIcon;
 use Native\Electron\Traits\PrunesVendorDirectory;
@@ -25,7 +25,7 @@ class BundleCommand extends Command
 {
     use CleansEnvFile;
     use CopiesToBuildDirectory;
-    use HandleApiRequests;
+    use HandlesZephpyr;
     use HasPreAndPostProcessing;
     use InstallsAppIcon;
     use PrunesVendorDirectory;

diff --git a/src/Traits/HandleApiRequests.php → src/Traits/HandlesZephpyr.php b/src/Traits/HandleApiRequests.php → src/Traits/HandlesZephpyr.php
@@ -6,7 +6,7 @@
 
 use function Laravel\Prompts\intro;
 
-trait HandleApiRequests
+trait HandlesZephpyr
 {
     private function baseUrl(): string
     {
@@ -49,7 +49,7 @@ private function checkForZephpyrToken()
             $this->line('');
             $this->warn('No ZEPHPYR_TOKEN found. Cannot bundle!');
             $this->line('');
-            $this->line('Add your api ZEPHPYR_TOKEN to its .env file:');
+            $this->line('Add your Zephpyr API token to your .env file (ZEPHPYR_TOKEN):');
             $this->line(base_path('.env'));
             $this->line('');
             $this->info('Not set up with Zephpyr yet? Secure your NativePHP app builds and more!');