From bcfef44331f4e0bdd94e22aaad924bc5b1a89c9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:57:01 +0100 Subject: [PATCH 1/3] build(deps): bump actions/setup-node from 4 to 5 (#254) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-plugin.yml | 2 +- .github/workflows/run-plugin-tests.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 4a18eb77..7c31863c 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -24,7 +24,7 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Use Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.x diff --git a/.github/workflows/run-plugin-tests.yml b/.github/workflows/run-plugin-tests.yml index 6365f6c1..fe11529c 100644 --- a/.github/workflows/run-plugin-tests.yml +++ b/.github/workflows/run-plugin-tests.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Use Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.x - name: Install dependencies diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6f27272c..0ed4cc82 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v5 - name: Use Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.x From a133a2f30de9e5f46130efd03bf231bcc994c5b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 15:50:45 +0200 Subject: [PATCH 2/3] build(deps): bump aglipanci/laravel-pint-action from 2.5 to 2.6 (#237) Bumps [aglipanci/laravel-pint-action](https://github.com/aglipanci/laravel-pint-action) from 2.5 to 2.6. - [Release notes](https://github.com/aglipanci/laravel-pint-action/releases) - [Commits](https://github.com/aglipanci/laravel-pint-action/compare/2.5...2.6) --- updated-dependencies: - dependency-name: aglipanci/laravel-pint-action dependency-version: '2.6' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/fix-php-code-style-issues.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index 8e5f32be..da2c6ef4 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -26,14 +26,14 @@ jobs: - name: Check PHP code style issues if: github.event_name == 'push' - uses: aglipanci/laravel-pint-action@2.5 + uses: aglipanci/laravel-pint-action@2.6 with: verboseMode: true testMode: true - name: Fix PHP code style issues if: github.event_name == 'pull_request' - uses: aglipanci/laravel-pint-action@2.5 + uses: aglipanci/laravel-pint-action@2.6 - name: Commit changes if: github.event_name == 'pull_request' From 4649eeaecf494da44165c2dfc8b4d0fd7ae3a060 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Thu, 11 Sep 2025 10:01:34 +0100 Subject: [PATCH 3/3] Extra files (#230) * Support for shipping extra files * Add extras path to PHP environment * Fix path * Formatting * Change path * Change path * fix `npm install` error during plugin build * specify head ref in auto-commit-action * revert: specify head ref in auto-commit-action * revert auto-commit-action to v5 * Build plugin * explicitly pass builder config * fix paths * Build plugin * don't include 'extras' in asar archive * use auto-commit v6 --------- Co-authored-by: Peter Bishop <9081809+PeteBishwhip@users.noreply.github.com> Co-authored-by: gwleuverink Co-authored-by: gwleuverink <17123491+gwleuverink@users.noreply.github.com> --- .github/workflows/build-plugin.yml | 1 - ...lectron-builder.js => electron-builder.mjs} | 11 ++++++++++- .../js/electron-plugin/dist/server/php.js | 3 +++ resources/js/electron-plugin/src/server/php.ts | 4 ++++ resources/js/package.json | 18 +++++++++--------- src/Traits/CopiesToBuildDirectory.php | 1 + 6 files changed, 27 insertions(+), 11 deletions(-) rename resources/js/{electron-builder.js => electron-builder.mjs} (95%) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 7c31863c..607ea720 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -36,7 +36,6 @@ 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 diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.mjs similarity index 95% rename from resources/js/electron-builder.js rename to resources/js/electron-builder.mjs index da1daaba..2236a2da 100644 --- a/resources/js/electron-builder.js +++ b/resources/js/electron-builder.mjs @@ -74,7 +74,7 @@ export default { 3: 'arm64' }[context.arch]; - if(arch === undefined) { + if (arch === undefined) { console.error('Cannot build PHP for unsupported architecture'); process.exit(1); } @@ -136,6 +136,15 @@ export default { version: appVersion, author: appAuthor, }, + extraFiles: [ + { + from: join(process.env.APP_PATH, 'extras'), + to: 'extras', + filter: [ + '**/*' + ] + } + ], ...updaterEnabled ? { publish: updaterConfig } : {} diff --git a/resources/js/electron-plugin/dist/server/php.js b/resources/js/electron-plugin/dist/server/php.js index b0f5585e..50123a67 100644 --- a/resources/js/electron-plugin/dist/server/php.js +++ b/resources/js/electron-plugin/dist/server/php.js @@ -195,6 +195,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(process.resourcesPath, '..', 'extras') + : join(process.env.APP_PATH, 'extras'), }; if (secret && apiPort) { variables.NATIVEPHP_API_URL = `http://localhost:${apiPort}/api/`; diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts index 562b258d..e66ef857 100644 --- a/resources/js/electron-plugin/src/server/php.ts +++ b/resources/js/electron-plugin/src/server/php.ts @@ -265,6 +265,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; @@ -293,6 +294,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(process.resourcesPath, '..', 'extras') + : join(process.env.APP_PATH, 'extras'), }; // Only if the server has already started diff --git a/resources/js/package.json b/resources/js/package.json index 30d691ee..d029adb3 100644 --- a/resources/js/package.json +++ b/resources/js/package.json @@ -16,22 +16,22 @@ "dev": "cross-env node php.js && electron-vite dev --watch", "build": "electron-vite build", "postinstall": "node ./node_modules/electron-builder/cli.js install-app-deps", - "publish:all": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --win --mac --linux --config --x64 --arm64 -p always", + "publish:all": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --win --mac --linux --config electron-builder.mjs --x64 --arm64 -p always", "publish:win": "cross-env npm run publish:win-x64", - "publish:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --win --config --x64", + "publish:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --win --config electron-builder.mjs --x64", "publish:mac": "cross-env npm run publish:mac-arm64 -- --x64", - "publish:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config --arm64 -p always", - "publish:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config --x64 -p always", + "publish:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config electron-builder.mjs --arm64 -p always", + "publish:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config electron-builder.mjs --x64 -p always", "publish:linux": "cross-env npm run publish:linux-x64", - "publish:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --linux --config --x64 -p always", + "publish:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --linux --config electron-builder.mjs --x64 -p always", "build:all": "cross-env npm run build:mac && cross-env npm run build:win && cross-env npm run build:linux", "build:win": "cross-env npm run build:win-x64", - "build:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --win --config --x64", + "build:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --win --config electron-builder.mjs --x64", "build:mac": "cross-env npm run build:mac-arm64 -- --x64", - "build:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --arm64", - "build:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --x64", + "build:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config electron-builder.mjs --arm64", + "build:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config electron-builder.mjs --x64", "build:linux": "cross-env npm run build:linux-x64", - "build:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --linux --config --x64", + "build:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --linux --config electron-builder.mjs --x64", "plugin:build": "rimraf electron-plugin/dist/ && node node_modules/typescript/bin/tsc --project electron-plugin", "plugin:build:watch": "npm run plugin:build -- -W", "plugin:test": "vitest run --root electron-plugin --coverage.all", diff --git a/src/Traits/CopiesToBuildDirectory.php b/src/Traits/CopiesToBuildDirectory.php index d6a36881..26cd3f3a 100644 --- a/src/Traits/CopiesToBuildDirectory.php +++ b/src/Traits/CopiesToBuildDirectory.php @@ -29,6 +29,7 @@ abstract protected function sourcePath(string $path = ''): string; 'dist', 'build', 'temp', + 'extras', 'docker', 'packages', '**/.github',