Merge branch 'main' into dependabot/github_actions/actions/checkout-6

Author: simonhamp

.github/workflows/fix-php-code-style-issues.yml

@@ -23,6 +23,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: ${{ github.head_ref || github.sha }}
+          fetch-depth: 0
 
       - name: Check PHP code style issues
         if: github.event_name == 'push'

.github/workflows/phpstan.yml

@@ -30,7 +30,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}

config/nativephp-internal.php

@@ -89,6 +89,7 @@
         'storage/hot',
 
         // Only needed for local testing
+        'vendor/nativephp/desktop/.git',
         'vendor/nativephp/desktop/resources',
         'vendor/nativephp/desktop/vendor',
         'vendor/nativephp/php-bin',

config/nativephp.php

@@ -102,6 +102,7 @@
         /**
          * The updater provider to use.
          * Supported: "github", "s3", "spaces"
+         * Note: The "s3" provider is compatible with S3-compatible services like Cloudflare R2.
          */
         'default' => env('NATIVEPHP_UPDATER_PROVIDER', 'spaces'),
 
@@ -113,6 +114,7 @@
                 'token' => env('GITHUB_TOKEN'),
                 'vPrefixedTagName' => env('GITHUB_V_PREFIXED_TAG_NAME', true),
                 'private' => env('GITHUB_PRIVATE', false),
+                'autoupdate_token' => env('GITHUB_AUTOUPDATE_TOKEN'), // Read-only token used by the updater for private repos
                 'channel' => env('GITHUB_CHANNEL', 'latest'),
                 'releaseType' => env('GITHUB_RELEASE_TYPE', 'draft'),
             ],
@@ -125,6 +127,13 @@
                 'bucket' => env('AWS_BUCKET'),
                 'endpoint' => env('AWS_ENDPOINT'),
                 'path' => env('NATIVEPHP_UPDATER_PATH', null),
+                /**
+                 * Optional public URL for serving updates (e.g., CDN or custom domain).
+                 * When set, updates will be downloaded from this URL instead of the S3 endpoint.
+                 * Useful for S3 with CloudFront or Cloudflare R2 with public access
+                 * Example: 'https://updates.yourdomain.com'
+                 */
+                'public_url' => env('AWS_PUBLIC_URL'),
             ],
 
             'spaces' => [

package-lock.json

@@ -13,7 +13,6 @@ const deepLinkProtocol = process.env.NATIVEPHP_DEEPLINK_SCHEME;
 const updaterEnabled = process.env.NATIVEPHP_UPDATER_ENABLED === 'true';
 
 // Azure signing configuration
-const azurePublisherName = process.env.NATIVEPHP_AZURE_PUBLISHER_NAME;
 const azureEndpoint = process.env.NATIVEPHP_AZURE_ENDPOINT;
 const azureCertificateProfileName = process.env.NATIVEPHP_AZURE_CERTIFICATE_PROFILE_NAME;
 const azureCodeSigningAccountName = process.env.NATIVEPHP_AZURE_CODE_SIGNING_ACCOUNT_NAME;
@@ -83,9 +82,8 @@ export default {
     afterSign: 'build/notarize.js',
     win: {
         executableName: fileName,
-        ...(azurePublisherName && azureEndpoint && azureCertificateProfileName && azureCodeSigningAccountName ? {
+        ...(azureEndpoint && azureCertificateProfileName && azureCodeSigningAccountName ? {
             azureSignOptions: {
-                publisherName: azurePublisherName,
                 endpoint: azureEndpoint,
                 certificateProfileName: azureCertificateProfileName,
                 codeSigningAccountName: azureCodeSigningAccountName

resources/electron/electron-builder.mjs

@@ -95,6 +95,9 @@ class NativePHP {
                 details.requestHeaders['X-NativePHP-Secret'] = state.randomSecret;
                 callback({ requestHeaders: details.requestHeaders });
             });
+            if (process.env.NATIVEPHP_NO_FOCUS) {
+                state.noFocusOnRestart = true;
+            }
             yield notifyLaravel("booted");
         });
     }
@@ -158,8 +161,16 @@ class NativePHP {
         }
     }
     startAutoUpdater(config) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         if (((_a = config === null || config === void 0 ? void 0 : config.updater) === null || _a === void 0 ? void 0 : _a.enabled) === true) {
+            const defaultProvider = (_b = config === null || config === void 0 ? void 0 : config.updater) === null || _b === void 0 ? void 0 : _b.default;
+            const publicUrl = (_e = (_d = (_c = config === null || config === void 0 ? void 0 : config.updater) === null || _c === void 0 ? void 0 : _c.providers) === null || _d === void 0 ? void 0 : _d[defaultProvider]) === null || _e === void 0 ? void 0 : _e.public_url;
+            if (publicUrl) {
+                autoUpdater.setFeedURL({
+                    provider: 'generic',
+                    url: publicUrl
+                });
+            }
             autoUpdater.checkForUpdatesAndNotify();
         }
     }

resources/electron/electron-plugin/dist/index.js

@@ -74,6 +74,10 @@ class Positioner {
                 x: Math.floor(screenSize.x + (screenSize.width / 2 - windowSize[0] / 2)),
                 y: Math.floor((screenSize.height + screenSize.y) / 2 - windowSize[1] / 2),
             },
+            upperCenter: {
+                x: Math.floor(screenSize.x + (screenSize.width / 2 - windowSize[0] / 2)),
+                y: Math.floor(screenSize.y + (screenSize.height - windowSize[1]) / 3),
+            },
         };
         if (position.substr(0, 4) === "tray") {
             if (positions[position].x + windowSize[0] >