feat: bundling a base L12 app works 🎉

Author: SRWieZ

resources/js/electron-builder.js

@@ -40,13 +40,7 @@ try {
 }
 
 if (isBuilding) {
-    console.log();
-    console.log('===================================================================');
-    console.log('                    Building for ' + targetOs);
-    console.log('===================================================================');
-    console.log();
-    console.log('Updater config', updaterConfig);
-    console.log();
+    console.log('  • updater config', updaterConfig);
 }
 
 export default {

src/Commands/BuildCommand.php

@@ -7,8 +7,8 @@
 use Illuminate\Support\Str;
 use Native\Electron\Facades\Updater;
 use Native\Electron\Traits\CleansEnvFile;
+use Native\Electron\Traits\CopiesBundleToBuildDirectory;
 use Native\Electron\Traits\CopiesCertificateAuthority;
-use Native\Electron\Traits\CopiesToBuildDirectory;
 use Native\Electron\Traits\HasPreAndPostProcessing;
 use Native\Electron\Traits\InstallsAppIcon;
 use Native\Electron\Traits\LocatesPhpBinary;
@@ -22,8 +22,8 @@
 class BuildCommand extends Command
 {
     use CleansEnvFile;
+    use CopiesBundleToBuildDirectory;
     use CopiesCertificateAuthority;
-    use CopiesToBuildDirectory;
     use HasPreAndPostProcessing;
     use InstallsAppIcon;
     use LocatesPhpBinary;
@@ -79,7 +79,8 @@ public function handle(): void
 
         $this->newLine();
         intro('Copying App to build directory...');
-        $this->copyToBuildDirectory();
+
+        $this->copyBundleToBuildDirectory();
 
         $this->newLine();
         $this->copyCertificateAuthorityCertificate();

src/Commands/BundleCommand.php

@@ -222,10 +222,10 @@ private function addFilesToZip(ZipArchive $zip): void
 
         $finder = (new Finder)->files()
             // ->followLinks()
-            ->ignoreVCSIgnored(true) // TODO: Make our own list of ignored files
+            // ->ignoreVCSIgnored(true) // TODO: Make our own list of ignored files
             ->in($this->buildPath())
             ->exclude([
-                // We add those a few lines below
+                // We add those a few lines below and they are ignored by most .gitignore anyway
                 'vendor',
                 'node_modules',
 

src/Traits/CopiesBundleToBuildDirectory.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Native\Electron\Traits;
+
+use Symfony\Component\Filesystem\Filesystem;
+
+use function Laravel\Prompts\warning;
+
+trait CopiesBundleToBuildDirectory
+{
+    use CopiesToBuildDirectory;
+
+    protected static string $bundlePath = 'build/__nativephp_app_bundle';
+
+    protected function hasBundled(): bool
+    {
+        return (new Filesystem)->exists($this->sourcePath(self::$bundlePath));
+    }
+
+    public function copyBundleToBuildDirectory(): bool
+    {
+        if ($this->hasBundled()) {
+
+            $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))));
+
+            (new Filesystem)->copy(
+                $this->sourcePath(self::$bundlePath),
+                $this->buildPath(self::$bundlePath),
+            );
+
+            return true;
+        }
+
+        $this->warnUnsecureBuild();
+
+        return $this->copyToBuildDirectory();
+    }
+
+    public function warnUnsecureBuild(): void
+    {
+        warning('===================================================================');
+        warning('                    * * * INSECURE BUILD * * *');
+        warning('===================================================================');
+        warning('Secure app bundle not found! Building with exposed source files.');
+        warning('See https://nativephp.com/docs/publishing/building#security');
+        warning('===================================================================');
+    }
+}

src/Traits/CopiesToBuildDirectory.php

@@ -27,6 +27,8 @@ abstract protected function sourcePath(string $path = ''): string;
         // .git and dev directories
         '.git',
         'dist',
+        'build',
+        'temp',
         'docker',
         'packages',
         '**/.github',
@@ -51,13 +53,9 @@ 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()
+    public function copyToBuildDirectory(): bool
     {
         $sourcePath = $this->sourcePath();
         $buildPath = $this->buildPath();
@@ -73,7 +71,10 @@ public function copyToBuildDirectory()
         $filesystem->mkdir($buildPath);
 
         // A filtered iterator that will exclude files matching our skip patterns
-        $directory = new RecursiveDirectoryIterator($sourcePath, RecursiveDirectoryIterator::SKIP_DOTS | RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
+        $directory = new RecursiveDirectoryIterator(
+            $sourcePath,
+            RecursiveDirectoryIterator::SKIP_DOTS | RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+        );
 
         $filter = new RecursiveCallbackFilterIterator($directory, function ($current) use ($patterns) {
             $relativePath = substr($current->getPathname(), strlen($this->sourcePath()) + 1);
@@ -113,6 +114,8 @@ public function copyToBuildDirectory()
         }
 
         $this->keepRequiredDirectories();
+
+        return true;
     }
 
     private function keepRequiredDirectories()