From 9bd4b29ab7be6a9292d45a4cf2ac6b2cf19322f9 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 10:40:45 +0100 Subject: [PATCH 01/11] Support for shipping extra files --- resources/js/electron-builder.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.js index 8a8a9a2f..50beaa30 100644 --- a/resources/js/electron-builder.js +++ b/resources/js/electron-builder.js @@ -67,7 +67,7 @@ export default { 3: 'arm64' }[context.arch]; - if(arch === undefined) { + if (arch === undefined) { console.error('Cannot build PHP for unsupported architecture'); process.exit(1); } @@ -121,5 +121,14 @@ export default { homepage: appUrl, version: appVersion, author: appAuthor, - } + }, + extraFiles: [ + { + "from": join(process.env.APP_PATH, "public/extras"), + "to": "extras", + "filter": [ + "**/*" + ] + } + ] }; From 92930ba6fa71e1e480170c1c8c9197ebdab9df0a Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 10:55:12 +0100 Subject: [PATCH 02/11] Add extras path to PHP environment --- resources/js/electron-plugin/src/server/php.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts index e6301ad9..55a1682a 100644 --- a/resources/js/electron-plugin/src/server/php.ts +++ b/resources/js/electron-plugin/src/server/php.ts @@ -233,6 +233,7 @@ interface EnvironmentVariables { NATIVEPHP_PICTURES_PATH: string; NATIVEPHP_VIDEOS_PATH: string; NATIVEPHP_RECENT_PATH: string; + NATIVEPHP_EXTRAS_PATH: string; // Cache variables APP_SERVICES_CACHE?: string; APP_PACKAGES_CACHE?: string; @@ -261,6 +262,9 @@ function getDefaultEnvironmentVariables(secret?: string, apiPort?: number): Envi NATIVEPHP_PICTURES_PATH: getPath('pictures'), NATIVEPHP_VIDEOS_PATH: getPath('videos'), NATIVEPHP_RECENT_PATH: getPath('recent'), + NATIVEPHP_EXTRAS_PATH: app.isPackaged + ? join(app.getAppPath(), 'public', 'extras') + : join(app.getAppPath(), '..', '..', 'extras'), }; // Only if the server has already started From 075308a5a82ded1937fe49900a43cba2be6a75d1 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 11:01:59 +0100 Subject: [PATCH 03/11] Fix path --- resources/js/electron-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.js index 50beaa30..9ffed0dc 100644 --- a/resources/js/electron-builder.js +++ b/resources/js/electron-builder.js @@ -124,7 +124,7 @@ export default { }, extraFiles: [ { - "from": join(process.env.APP_PATH, "public/extras"), + "from": join(process.env.APP_PATH, 'public', 'extras'), "to": "extras", "filter": [ "**/*" From 993ad139a541a1d7f4d98a7a6c66a7cf070adfb6 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 11:20:14 +0100 Subject: [PATCH 04/11] Formatting --- resources/js/electron-builder.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.js index 9ffed0dc..633b5ad1 100644 --- a/resources/js/electron-builder.js +++ b/resources/js/electron-builder.js @@ -124,10 +124,10 @@ export default { }, extraFiles: [ { - "from": join(process.env.APP_PATH, 'public', 'extras'), - "to": "extras", - "filter": [ - "**/*" + from: join(process.env.APP_PATH, 'public', 'extras'), + to: 'extras', + filter: [ + '**/*' ] } ] From 20a5c16bfa3cb8045a5b2422f7328b9d10554417 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 18:52:30 +0100 Subject: [PATCH 05/11] Change path --- resources/js/electron-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.js index 633b5ad1..574583c5 100644 --- a/resources/js/electron-builder.js +++ b/resources/js/electron-builder.js @@ -124,7 +124,7 @@ export default { }, extraFiles: [ { - from: join(process.env.APP_PATH, 'public', 'extras'), + from: join(process.env.APP_PATH, 'nativephp', 'extras'), to: 'extras', filter: [ '**/*' From a825ba2d462cf012b0840aa8bf5d9826620d7418 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Wed, 25 Jun 2025 18:53:46 +0100 Subject: [PATCH 06/11] Change path --- resources/js/electron-plugin/src/server/php.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts index 55a1682a..f4e4ad85 100644 --- a/resources/js/electron-plugin/src/server/php.ts +++ b/resources/js/electron-plugin/src/server/php.ts @@ -263,7 +263,7 @@ function getDefaultEnvironmentVariables(secret?: string, apiPort?: number): Envi NATIVEPHP_VIDEOS_PATH: getPath('videos'), NATIVEPHP_RECENT_PATH: getPath('recent'), NATIVEPHP_EXTRAS_PATH: app.isPackaged - ? join(app.getAppPath(), 'public', 'extras') + ? join(app.getAppPath(), 'nativephp', 'extras') : join(app.getAppPath(), '..', '..', 'extras'), }; From 4f6fb0ebf8f5f36c0b43572b421e1147fc426f4d Mon Sep 17 00:00:00 2001 From: gwleuverink Date: Tue, 15 Jul 2025 21:23:22 +0200 Subject: [PATCH 07/11] fix `npm install` error during plugin build --- resources/js/{electron-builder.js => electron-builder.mjs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/js/{electron-builder.js => electron-builder.mjs} (100%) diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.mjs similarity index 100% rename from resources/js/electron-builder.js rename to resources/js/electron-builder.mjs From 210bcece42e8f771e1cfe643e869ef0c67585ba8 Mon Sep 17 00:00:00 2001 From: gwleuverink Date: Tue, 15 Jul 2025 21:53:03 +0200 Subject: [PATCH 08/11] specify head ref in auto-commit-action --- .github/workflows/build-plugin.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 7d00c675..2da9b123 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -5,9 +5,9 @@ name: plugin-build on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] workflow_dispatch: jobs: @@ -33,19 +33,20 @@ jobs: working-directory: ./resources/js/ run: npm run plugin:build - - name: Commit changes if: github.event_name == 'pull_request' uses: stefanzweifel/git-auto-commit-action@v6 with: commit_message: Build plugin + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Create Pull Request if: github.event_name != 'pull_request' uses: peter-evans/create-pull-request@v7 with: commit-message: Build plugin - title: 'Auto: Build plugin assets' + title: "Auto: Build plugin assets" body: | This PR contains the latest built plugin assets. From 183d6bf743710cb0396ae894b1c73395e3ffda46 Mon Sep 17 00:00:00 2001 From: gwleuverink Date: Tue, 15 Jul 2025 21:55:34 +0200 Subject: [PATCH 09/11] revert: specify head ref in auto-commit-action --- .github/workflows/build-plugin.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 2da9b123..78376825 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -38,8 +38,6 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v6 with: commit_message: Build plugin - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Create Pull Request if: github.event_name != 'pull_request' From 35e04590a7e8060588742eebfbf8653c869586ab Mon Sep 17 00:00:00 2001 From: gwleuverink Date: Tue, 15 Jul 2025 21:57:57 +0200 Subject: [PATCH 10/11] revert auto-commit-action to v5 --- .github/workflows/build-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 78376825..c68e7096 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -35,7 +35,7 @@ jobs: - name: Commit changes if: github.event_name == 'pull_request' - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Build plugin From 9869cda9ed9ba1683a83f13cddaae6e7ae8b89a1 Mon Sep 17 00:00:00 2001 From: gwleuverink <17123491+gwleuverink@users.noreply.github.com> Date: Tue, 15 Jul 2025 19:58:41 +0000 Subject: [PATCH 11/11] Build plugin --- resources/js/electron-plugin/dist/server/php.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/js/electron-plugin/dist/server/php.js b/resources/js/electron-plugin/dist/server/php.js index 0d65dc55..5858de80 100644 --- a/resources/js/electron-plugin/dist/server/php.js +++ b/resources/js/electron-plugin/dist/server/php.js @@ -173,6 +173,9 @@ function getDefaultEnvironmentVariables(secret, apiPort) { NATIVEPHP_PICTURES_PATH: getPath('pictures'), NATIVEPHP_VIDEOS_PATH: getPath('videos'), NATIVEPHP_RECENT_PATH: getPath('recent'), + NATIVEPHP_EXTRAS_PATH: app.isPackaged + ? join(app.getAppPath(), 'nativephp', 'extras') + : join(app.getAppPath(), '..', '..', 'extras'), }; if (secret && apiPort) { variables.NATIVEPHP_API_URL = `http://localhost:${apiPort}/api/`;