feat(desktop): ship stock Electron for Windows and Linux
Drop the custom EAC-3 Chromium build and macOS packaging. Windows NSIS installers and Flatpaks for x64 and ARM64 now build in one Linux container image. Packaged installers previously lost the bundled Next.js dependencies: electron-builder drops the pnpm store and NSIS cannot carry symlinks. The bundle now replaces pnpm links with nested real copies. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4578d466a3
commit
2a77c92332
18 files changed
+285
-458
No files matched your search
@@ -8,43 +8,26 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
# Host runners, not the Docker-image runner. Each runner cross-compiles
|
||||
# both architectures for its OS. See the desktop README.
|
||||
# Both targets build in electronuserland/builder:wine. Wine lets
|
||||
# electron-builder stamp the Windows executable; the Flatpak job adds
|
||||
# flatpak-builder and needs a privileged container for its sandbox.
|
||||
# See apps/desktop/README.md for the runner setup.
|
||||
name: Desktop ${{ matrix.target }}
|
||||
runs-on: ${{ matrix.runner }}
|
||||
timeout-minutes: 720
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 90
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- target: windows-x64
|
||||
runner: desktop-windows
|
||||
arch: x64
|
||||
source: ${{ vars.DESKTOP_ELECTRON_SOURCE_WINDOWS }}
|
||||
- target: windows-arm64
|
||||
runner: desktop-windows
|
||||
arch: arm64
|
||||
source: ${{ vars.DESKTOP_ELECTRON_SOURCE_WINDOWS }}
|
||||
- target: linux-x64
|
||||
runner: desktop-linux
|
||||
arch: x64
|
||||
source: ${{ vars.DESKTOP_ELECTRON_SOURCE_LINUX }}
|
||||
- target: linux-arm64
|
||||
runner: desktop-linux
|
||||
arch: arm64
|
||||
source: ${{ vars.DESKTOP_ELECTRON_SOURCE_LINUX }}
|
||||
- target: macos-universal
|
||||
runner: desktop-macos
|
||||
arch: universal
|
||||
source: ${{ vars.DESKTOP_ELECTRON_SOURCE_MACOS }}
|
||||
- target: windows
|
||||
options: ""
|
||||
- target: linux
|
||||
options: --privileged
|
||||
container:
|
||||
image: electronuserland/builder:wine
|
||||
options: ${{ matrix.options }}
|
||||
env:
|
||||
OTUNES_DESKTOP_ARCH: ${{ matrix.arch }}
|
||||
OTUNES_ELECTRON_SOURCE: ${{ matrix.source }}
|
||||
OTUNES_DESKTOP_REF: ${{ gitea.ref }}
|
||||
DEPOT_TOOLS_WIN_TOOLCHAIN: "0"
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
@@ -60,17 +43,24 @@ jobs:
|
||||
with:
|
||||
node-version: "24"
|
||||
|
||||
- name: Install Flatpak tools
|
||||
if: matrix.target == 'linux'
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y flatpak flatpak-builder
|
||||
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
|
||||
- name: Install desktop and web dependencies
|
||||
run: pnpm --filter @otunes/desktop --filter @otunes/web... install --frozen-lockfile
|
||||
|
||||
- name: Check desktop scripts
|
||||
run: pnpm --filter @otunes/desktop typecheck
|
||||
|
||||
- name: Test runtime validation and shared UI packaging
|
||||
- name: Test UI bundling
|
||||
run: pnpm --filter @otunes/desktop test
|
||||
|
||||
- name: Build custom Electron and desktop installers
|
||||
run: pnpm --filter @otunes/desktop build:ci
|
||||
- name: Build x64 and ARM64 installers
|
||||
run: pnpm --filter @otunes/desktop build:${{ matrix.target }}
|
||||
|
||||
# Gitea's artifact service uses the v3 protocol, not GitHub's v4 service.
|
||||
- name: Upload installers
|
||||
@@ -80,6 +70,4 @@ jobs:
|
||||
path: |
|
||||
apps/desktop/dist/*.exe
|
||||
apps/desktop/dist/*.flatpak
|
||||
apps/desktop/dist/*.dmg
|
||||
apps/desktop/dist/*.blockmap
|
||||
if-no-files-found: error
|
||||
@@ -51,6 +51,5 @@ docker-compose.yml
|
||||
# Electron desktop build artifacts
|
||||
apps/desktop/.package/
|
||||
apps/desktop/dist/
|
||||
apps/desktop/runtime/
|
||||
apps/web/.next-desktop/
|
||||
apps/desktop/web/
|
||||
@@ -9,7 +9,7 @@ This project uses [pnpm workspaces](https://pnpm.io/workspaces):
|
||||
| Package | Path | Description |
|
||||
| --- | --- | --- |
|
||||
| `@otunes/web` | `apps/web` | Next.js web app |
|
||||
| `@otunes/desktop` | `apps/desktop` | Electron client with a custom EAC-3 runtime |
|
||||
| `@otunes/desktop` | `apps/desktop` | Electron client for Windows and Linux |
|
||||
| `@otunes/mobile` | `apps/mobile` | Expo React Native mobile app |
|
||||
| `@otunes/convex` | `packages/convex` | Shared Convex backend and client types |
|
||||
|
||||
@@ -98,4 +98,4 @@ Check the releases tab for the latest downloads for apps: [Releases](https://git
|
||||
|
||||
## Desktop builds
|
||||
|
||||
See [the desktop build guide](apps/desktop/README.md) to compile Electron with EAC-3 support and package the web player for macOS, Windows or Linux. The UI is bundled locally, and users choose their oTunes server before signing in. Platform decoding and spatial Atmos output require separate validation.
|
||||
See [the desktop build guide](apps/desktop/README.md) to package the web player for Windows or Linux. The UI is bundled locally, and users choose their oTunes server before signing in.
|
||||
+20
-81
@@ -1,103 +1,42 @@
|
||||
# oTunes desktop
|
||||
|
||||
The desktop app bundles the web UI and runs its standalone Next.js server on loopback using Electron's Node utility process. It never loads the UI hosted on your music server. On first launch, enter the oTunes server domain, then sign in. The address is saved in the app's user data directory, not compiled into the package.
|
||||
The Windows and Linux desktop app. It runs stock Electron, bundles the web UI and runs its standalone Next.js server on loopback using Electron's Node utility process. It never loads the UI hosted on your music server. On first launch, enter the oTunes server domain, then sign in. The address is saved in the app's user data directory, not compiled into the package.
|
||||
|
||||
For `music.example.com`, Convex connects to `https://convex.music.example.com`. Local hosts follow the mobile convention and use port 3210. The selected oTunes server provides streaming audio and cover art through the desktop's local gateway. Authentication routes stay local and connect to the selected Convex backend. The desktop app does not bundle Convex, FFmpeg or a music library.
|
||||
For `music.example.com`, Convex connects to `https://convex.music.example.com`. Local hosts follow the mobile convention and use port 3210. The selected oTunes server provides streaming audio, cover art and avatars through the desktop's local gateway. Authentication routes stay local and connect to the selected Convex backend. The desktop app does not bundle Convex, FFmpeg or a music library.
|
||||
|
||||
The server-entry view uses the web app's controls, colors and logos, with the system theme by default. Use **Server > Change server** to select another server. Switching servers clears the local login session and cached data.
|
||||
|
||||
## Build the custom runtime
|
||||
|
||||
Stock Electron does not meet this build's requirements. `runtime.gn` enables Chromium's `enable_platform_ac3_eac3_audio` with proprietary codecs and Chrome FFmpeg branding. This is a compile-time setting, not an Electron command-line switch. Electron and its embedded Chromium must be rebuilt together.
|
||||
|
||||
Install the platform prerequisites and `depot_tools` described in [Electron's source build instructions](https://www.electronjs.org/docs/latest/development/build-instructions-gn). Use a dedicated build machine with enough disk space for Chromium and its dependencies. From a separate, empty source checkout directory:
|
||||
|
||||
```sh
|
||||
gclient config --name "src/electron" --unmanaged https://github.com/electron/electron
|
||||
gclient sync --with_branch_heads --with_tags
|
||||
cd src/electron
|
||||
git checkout v45.3.0
|
||||
gclient sync -f --with_branch_heads --with_tags
|
||||
```
|
||||
|
||||
Back in the oTunes repository:
|
||||
|
||||
```sh
|
||||
pnpm install
|
||||
export OTUNES_ELECTRON_SOURCE=/absolute/path/to/checkout/src
|
||||
pnpm build:desktop:runtime
|
||||
```
|
||||
|
||||
This generates `src/out/otunes-<arch>/args.gn`, runs GN and Ninja, and extracts `dist.zip` into `apps/desktop/runtime/45.3.0-<platform>-<arch>`. It writes a runtime marker recording the version, platform, architecture and codec build setting. Packaging requires that marker and never downloads stock Electron as a fallback. The marker records build provenance, not a successful decoding test. Keep it with the extracted runtime.
|
||||
|
||||
`OTUNES_ELECTRON_ARCH=x64` or `arm64` selects the target CPU, so one machine per OS can build both architectures. See the cross-compiling notes under Gitea builds. The scripts pin Electron 45.3.0. Update `electronVersion` in `scripts/config.mjs` and the checkout tag together when upgrading. The runtime output directory must not already exist. Move or remove a previous output before rebuilding.
|
||||
Stock Chromium cannot decode EAC-3, so the player's codec check reports no Dolby Atmos support and the server streams the regular track instead.
|
||||
|
||||
## Run and package
|
||||
|
||||
```sh
|
||||
export OTUNES_ELECTRON_DIST=/absolute/path/to/otunes/apps/desktop/runtime/45.3.0-darwin-arm64
|
||||
pnpm install
|
||||
pnpm dev:desktop
|
||||
# Or create an installer:
|
||||
# Or create installers for this OS, x64 and ARM64:
|
||||
pnpm build:desktop
|
||||
# Or a specific target from a Linux host:
|
||||
pnpm --filter @otunes/desktop build:windows
|
||||
pnpm --filter @otunes/desktop build:linux
|
||||
```
|
||||
|
||||
Both commands first build and bundle the local web UI. `pnpm --filter @otunes/desktop build:web` builds that bundle alone without needing an Electron runtime. Desktop builds use `apps/web/.next-desktop` and copy the standalone output, static assets and public assets into `apps/desktop/web`. Relative pnpm symlinks are preserved so the bundled Next.js dependencies remain resolvable. The web app's normal `.next` output is separate. On Windows, enable Developer Mode or symlink permissions before building. The build rejects absolute junctions or links outside the standalone directory because they cannot be relocated into an installer.
|
||||
All of these first build and bundle the local web UI. `pnpm --filter @otunes/desktop build:web` builds that bundle alone. Desktop builds use `apps/web/.next-desktop` and copy the standalone output, static assets and public assets into `apps/desktop/web`. Installers cannot carry symlinks, so pnpm's links are replaced with real copies, with each package's dependencies nested under it. The web app's normal `.next` output is separate. On Windows, enable Developer Mode or symlink permissions before building. The build rejects absolute junctions or links outside the standalone directory because they cannot be relocated into an installer.
|
||||
|
||||
The desktop gateway binds only to `127.0.0.1:47836`. A single instance owns that port. The bundled Next.js process uses a separate OS-assigned loopback port and restarts when the server selection changes. No external Node.js installation is required by the installed app. `dev:desktop` uses the packaged production UI; it does not start or connect to a web preview channel.
|
||||
Desktop images bypass Next's optimizer, so the bundle drops Sharp's native libraries. Any other native library fails the build, because it would match the build host rather than the target.
|
||||
|
||||
`build:desktop` creates a native package in `apps/desktop/dist`: DMG on macOS, NSIS on Windows, Flatpak on Linux. The same installer can connect to different servers. Signing and macOS notarization use electron-builder's standard environment configuration and require your own credentials. The build does not publish artifacts.
|
||||
The desktop gateway binds only to `127.0.0.1:47836`. A single instance owns that port. The bundled Next.js process uses a separate OS-assigned loopback port and restarts when the server selection changes. No external Node.js installation is required by the installed app.
|
||||
|
||||
Packaging writes to `apps/desktop/dist`: an NSIS installer per architecture for Windows, a Flatpak per architecture for Linux. To pick one architecture, pass it after the target: `node scripts/package.mjs linux x64`. Building Windows installers on Linux needs Wine. Flatpaks need flatpak-builder with Flathub added, and ARM64 Flatpaks on an x64 host need `qemu-user-static` registered with binfmt. Installers are unsigned unless you configure electron-builder's signing environment.
|
||||
|
||||
Flatpaks pin `org.freedesktop.Platform`, its SDK and `org.electronjs.Electron2.BaseApp` to `25.08`. Network, audio, graphics and display access are enabled. Home-directory access is not needed.
|
||||
|
||||
## Gitea builds
|
||||
|
||||
`.gitea/workflows/desktop-build.yml` runs manually through `workflow_dispatch` and on `v*` tags, matching the Docker workflow. It builds the custom Electron runtime before each installer and uploads installers to the Actions run with `actions/upload-artifact@v3`. It does not create releases or publish to Flathub. Tags set the installer version, so use semantic version tags such as `v1.2.3`. Manual runs use the desktop package version.
|
||||
`.gitea/workflows/desktop-build.yml` runs manually and on `v*` tags, matching the Docker workflow. Both jobs run on the `ubuntu-latest` Docker runner and upload installers with `actions/upload-artifact@v3`. Tags set the installer version, so use semantic version tags such as `v1.2.3`. Manual runs use the desktop package version. Nothing is published.
|
||||
|
||||
Register these **host** Gitea runner labels with `:host` execution, not Docker execution. Each Windows and Linux runner cross-compiles both x64 and ARM64, so three machines cover all five targets:
|
||||
Both jobs use the `electronuserland/builder:wine` container: `windows` builds x64 and ARM64 NSIS installers, and `linux` installs flatpak-builder from apt and builds x64 and ARM64 Flatpaks.
|
||||
|
||||
| Runner label | Host CPU | Repository Actions variable for the Electron `src` path | Output |
|
||||
| --- | --- | --- | --- |
|
||||
| `desktop-windows` | x64 | `DESKTOP_ELECTRON_SOURCE_WINDOWS` | x64 and ARM64 NSIS installers |
|
||||
| `desktop-linux` | x64 | `DESKTOP_ELECTRON_SOURCE_LINUX` | x86-64 and AArch64 Flatpaks |
|
||||
| `desktop-macos` | x64 or arm64 | `DESKTOP_ELECTRON_SOURCE_MACOS` | Universal DMG |
|
||||
The Linux job needs two things from the runner host:
|
||||
|
||||
Here x86 means x86-64, not 32-bit IA-32. The workflow installs Node.js 24 and pnpm 10.1.0. Each runner needs Git, Bash, Electron's platform build prerequisites, `depot_tools` on PATH, and a synced Electron v45.3.0 checkout prepared as described above. The source path is an absolute path outside the disposable Actions checkout. Both architectures share one checkout with separate `out/otunes-<arch>` directories, so set runner capacity to 1. GN/Ninja outputs remain in that source tree for incremental rebuilds. The workflow does not update that shared checkout or run `gclient sync` automatically.
|
||||
|
||||
Cross-compiling needs extra setup when syncing the checkout:
|
||||
|
||||
- Windows: set `ELECTRON_BUILDING_WOA=1` before `gclient sync` so the ARM64 toolchain is fetched. Electron lists x64 to ARM64 as experimental.
|
||||
- Linux: install the ARM64 sysroot with `build/linux/sysroot_scripts/install-sysroot.py --arch=arm64` from `src`. Building the AArch64 Flatpak on an x64 host also needs `qemu-user-static` with binfmt support.
|
||||
|
||||
Windows runners need Visual Studio's Electron/Chromium build components and SDK, plus Developer Mode or symlink permissions. Install the ARM64 build tools too. Mac runners need Xcode, its command-line tools, and both macOS SDK architectures. Linux runners need a native Chromium build environment, Flatpak >= 1.12.4, flatpak-builder >= 1.2.2, and a working user session with unprivileged sandbox support. Add Flathub for the runner user before the first build:
|
||||
|
||||
```sh
|
||||
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
```
|
||||
|
||||
Flatpaks pin `org.freedesktop.Platform`, its SDK and `org.electronjs.Electron2.BaseApp` to `25.08`. Network, audio, graphics and display access are enabled. Home-directory access is not needed. Builds can install the matching runtime/SDK/BaseApp from Flathub for their architecture.
|
||||
|
||||
The Universal job compiles separate x64 and ARM64 Electron distributions, validates each marker, and gives electron-builder the corresponding runtime for each slice before merging the app. The bundled UI is shared between slices. Since desktop images bypass Next's optimizer, the bundle excludes unused Sharp native libraries. Any other native library makes the build fail so a host-specific dependency cannot silently enter the Universal app.
|
||||
|
||||
To reproduce the CI build on a prepared runner:
|
||||
|
||||
```sh
|
||||
export OTUNES_ELECTRON_SOURCE=/absolute/path/to/electron/src
|
||||
export OTUNES_DESKTOP_ARCH=universal # macOS; x64 or arm64 elsewhere
|
||||
pnpm --filter @otunes/desktop build:ci
|
||||
```
|
||||
|
||||
Signing/notarization credentials are not configured by this workflow. Configure electron-builder's signing environment on trusted runners if signed installers are required. Without credentials the resulting installers are unsigned, and macOS may require approval to open them.
|
||||
|
||||
## EAC-3 and Atmos limits
|
||||
|
||||
The build flag enables EAC-3 media handling. A platform decoder is still required. Chromium's [decoder support checks](https://chromium.googlesource.com/chromium/src/+/main/media/base/supported_types.cc) consult platform codec support on macOS and Windows. Linux does not gain a software EAC-3 decoder just by enabling this flag. Linux packaging is available, but EAC-3 playback is not promised there.
|
||||
|
||||
EAC-3 decoding and spatial Dolby Atmos rendering are separate capabilities. Decoding may produce channel-based PCM without preserving Atmos object metadata. The flag does not add Dolby licensing, guarantee HDMI passthrough, or guarantee spatial output on any OS or audio device. Review codec distribution requirements before distributing a custom runtime.
|
||||
|
||||
Validate on each target OS and output device before releasing:
|
||||
|
||||
1. Open the desktop client against a test server with a known EAC-3 track.
|
||||
2. Confirm the existing playback settings allow the Atmos preference, enable it, and play the track. The app uses browser codec detection, with no desktop override that forces support to true.
|
||||
3. Confirm the stream contains EAC-3 and playback advances with audible output. MIME support alone is not a decode test.
|
||||
4. Verify spatial output separately using the OS or receiver's output diagnostics. A track badge does not prove Atmos rendering.
|
||||
5. Check normal AAC/lossless playback and seeking too.
|
||||
|
||||
The source build is intentionally separate from app packaging because rebuilding Chromium is expensive. No custom runtime binary is checked into this repository.
|
||||
- Privileged job containers, since flatpak-builder sandboxes its build. Set `container.privileged: true` in the runner's config.
|
||||
- An ARM64 binfmt handler. Register it once with `apt install qemu-user-static` on Debian/Ubuntu, which persists across reboots.
|
||||
@@ -2,20 +2,20 @@
|
||||
"name": "@otunes/desktop",
|
||||
"version": "0.0.1",
|
||||
"private": true,
|
||||
"description": "oTunes desktop client with a custom EAC-3 Electron runtime",
|
||||
"description": "oTunes desktop client for Windows and Linux",
|
||||
"author": "oTunes contributors",
|
||||
"main": "main.cjs",
|
||||
"scripts": {
|
||||
"start": "pnpm build:web && node scripts/start.mjs",
|
||||
"start": "pnpm build:web && electron .",
|
||||
"build": "pnpm build:web && node scripts/package.mjs",
|
||||
"build:runtime": "node scripts/build-runtime.mjs",
|
||||
"typecheck": "node --check main.cjs && node --check scripts/config.mjs && node --check scripts/start.mjs && node --check scripts/package.mjs && node --check scripts/build-runtime.mjs && node --check server-config.cjs && node --check scripts/build-web.mjs && node --check scripts/ci-build.mjs && node --check scripts/prune-native-images.mjs",
|
||||
"build:windows": "pnpm build:web && node scripts/package.mjs windows",
|
||||
"build:linux": "pnpm build:web && node scripts/package.mjs linux",
|
||||
"build:web": "node scripts/build-web.mjs",
|
||||
"build:ci": "node scripts/ci-build.mjs",
|
||||
"typecheck": "node --check main.cjs && node --check server-config.cjs && node --check scripts/build-web.mjs && node --check scripts/package.mjs && node --check scripts/prune-native-images.mjs && node --check scripts/materialize-links.mjs",
|
||||
"test": "node --test scripts/build.test.mjs"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron-builder": "26.18.0",
|
||||
"extract-zip": "2.0.1"
|
||||
"electron": "45.3.4",
|
||||
"electron-builder": "26.18.0"
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
import("//electron/build/args/release.gn")
|
||||
|
||||
proprietary_codecs = true
|
||||
ffmpeg_branding = "Chrome"
|
||||
enable_platform_ac3_eac3_audio = true
|
||||
@@ -1,66 +0,0 @@
|
||||
import { execFileSync } from "node:child_process"
|
||||
import { mkdir, readFile, writeFile, access } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import extract from "extract-zip"
|
||||
import { desktopRoot, electronVersion } from "./config.mjs"
|
||||
|
||||
if (!process.env.OTUNES_ELECTRON_SOURCE) {
|
||||
throw new Error(
|
||||
"Set OTUNES_ELECTRON_SOURCE to a synced Electron src directory. See apps/desktop/README.md."
|
||||
)
|
||||
}
|
||||
const source = path.resolve(process.env.OTUNES_ELECTRON_SOURCE)
|
||||
const tag = execFileSync(
|
||||
"git",
|
||||
["describe", "--tags", "--exact-match", "HEAD"],
|
||||
{
|
||||
cwd: path.join(source, "electron"),
|
||||
encoding: "utf8",
|
||||
}
|
||||
).trim()
|
||||
if (tag !== `v${electronVersion}`)
|
||||
throw new Error(`Check out and sync Electron v${electronVersion} first`)
|
||||
await access(path.join(source, "media", "media_options.gni"))
|
||||
const arch = process.env.OTUNES_ELECTRON_ARCH ?? process.arch
|
||||
if (!["x64", "arm64"].includes(arch))
|
||||
throw new Error("Electron target must be x64 or arm64")
|
||||
const outputName = `out/otunes-${arch}`
|
||||
const output = path.join(source, outputName)
|
||||
await mkdir(output, { recursive: true })
|
||||
await writeFile(
|
||||
path.join(output, "args.gn"),
|
||||
`${await readFile(path.join(desktopRoot, "runtime.gn"), "utf8")}\ntarget_cpu = "${arch}"\n`
|
||||
)
|
||||
for (const [command, args] of [
|
||||
["gn", ["gen", outputName, "--fail-on-unused-args"]],
|
||||
["ninja", ["-C", outputName, "electron:electron_dist_zip"]],
|
||||
]) {
|
||||
execFileSync(command, args, {
|
||||
cwd: source,
|
||||
stdio: "inherit",
|
||||
shell: process.platform === "win32",
|
||||
})
|
||||
}
|
||||
// Use a fresh directory so stale files cannot enter a packaged runtime.
|
||||
const distribution = path.join(
|
||||
desktopRoot,
|
||||
"runtime",
|
||||
`${electronVersion}-${process.platform}-${arch}`
|
||||
)
|
||||
await mkdir(path.dirname(distribution), { recursive: true })
|
||||
await mkdir(distribution)
|
||||
await extract(path.join(output, "dist.zip"), { dir: distribution })
|
||||
await writeFile(
|
||||
path.join(distribution, "otunes-runtime.json"),
|
||||
JSON.stringify(
|
||||
{
|
||||
version: electronVersion,
|
||||
platform: process.platform,
|
||||
arch,
|
||||
enable_platform_ac3_eac3_audio: true,
|
||||
},
|
||||
null,
|
||||
2
|
||||
)
|
||||
)
|
||||
console.log(`Custom runtime ready. Set OTUNES_ELECTRON_DIST=${distribution}`)
|
||||
@@ -2,9 +2,11 @@ import { execFileSync } from "node:child_process"
|
||||
import { createRequire } from "node:module"
|
||||
import { cp, mkdir, rm, readdir, readlink, realpath } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import { materializeLinks } from "./materialize-links.mjs"
|
||||
import { pruneNativeImages } from "./prune-native-images.mjs"
|
||||
import { desktopRoot } from "./config.mjs"
|
||||
import { fileURLToPath } from "node:url"
|
||||
|
||||
const desktopRoot = fileURLToPath(new URL("../", import.meta.url))
|
||||
const web = path.resolve(desktopRoot, "../web")
|
||||
const webRequire = createRequire(path.join(web, "package.json"))
|
||||
execFileSync(
|
||||
@@ -65,4 +67,5 @@ await cp(path.join(web, "public"), path.join(app, "public"), {
|
||||
recursive: true,
|
||||
})
|
||||
|
||||
await materializeLinks(destination)
|
||||
await pruneNativeImages(destination)
|
||||
@@ -7,11 +7,13 @@ import {
|
||||
readFile,
|
||||
rm,
|
||||
access,
|
||||
symlink,
|
||||
lstat,
|
||||
} from "node:fs/promises"
|
||||
import os from "node:os"
|
||||
import path from "node:path"
|
||||
import { customRuntime, electronVersion } from "./config.mjs"
|
||||
import { pruneNativeImages } from "./prune-native-images.mjs"
|
||||
import { materializeLinks } from "./materialize-links.mjs"
|
||||
|
||||
async function fixture(run) {
|
||||
const directory = await mkdtemp(path.join(os.tmpdir(), "otunes-build-"))
|
||||
@@ -22,60 +24,26 @@ async function fixture(run) {
|
||||
}
|
||||
}
|
||||
|
||||
test("runtime validation uses the target architecture and requires the EAC-3 build marker", async () => {
|
||||
await fixture(async (directory) => {
|
||||
const arch = process.arch === "x64" ? "arm64" : "x64"
|
||||
const executable =
|
||||
process.platform === "darwin"
|
||||
? "Electron.app/Contents/MacOS/Electron"
|
||||
: process.platform === "win32"
|
||||
? "electron.exe"
|
||||
: "electron"
|
||||
await mkdir(path.dirname(path.join(directory, executable)), {
|
||||
recursive: true,
|
||||
})
|
||||
await writeFile(path.join(directory, executable), "fixture")
|
||||
const manifest = {
|
||||
version: electronVersion,
|
||||
platform: process.platform,
|
||||
arch,
|
||||
enable_platform_ac3_eac3_audio: true,
|
||||
}
|
||||
const marker = path.join(directory, "otunes-runtime.json")
|
||||
await writeFile(marker, JSON.stringify(manifest))
|
||||
assert.equal((await customRuntime(arch, directory)).directory, directory)
|
||||
await assert.rejects(
|
||||
customRuntime(process.arch, directory),
|
||||
/with EAC-3 enabled/
|
||||
)
|
||||
await writeFile(
|
||||
marker,
|
||||
JSON.stringify({ ...manifest, enable_platform_ac3_eac3_audio: false })
|
||||
)
|
||||
await assert.rejects(customRuntime(arch, directory), /with EAC-3 enabled/)
|
||||
})
|
||||
})
|
||||
|
||||
test("the shared UI drops unused Sharp binaries but keeps JavaScript and package metadata", async () => {
|
||||
test("the UI bundle drops unused Sharp binaries but keeps JavaScript and package metadata", async () => {
|
||||
await fixture(async (directory) => {
|
||||
const lib = path.join(
|
||||
directory,
|
||||
"node_modules",
|
||||
"@img",
|
||||
"sharp-darwin-arm64",
|
||||
"sharp-linux-x64",
|
||||
"lib"
|
||||
)
|
||||
await mkdir(lib, { recursive: true })
|
||||
for (const file of [
|
||||
"sharp.node",
|
||||
"libvips.dylib",
|
||||
"libvips-cpp.so.8.17.3",
|
||||
"index.js",
|
||||
"debug.node.js",
|
||||
"package.json",
|
||||
])
|
||||
await writeFile(path.join(lib, file), file)
|
||||
await pruneNativeImages(directory)
|
||||
for (const file of ["sharp.node", "libvips.dylib"])
|
||||
for (const file of ["sharp.node", "libvips-cpp.so.8.17.3"])
|
||||
await assert.rejects(access(path.join(lib, file)))
|
||||
assert.equal(await readFile(path.join(lib, "index.js"), "utf8"), "index.js")
|
||||
await access(path.join(lib, "debug.node.js"))
|
||||
@@ -83,7 +51,7 @@ test("the shared UI drops unused Sharp binaries but keeps JavaScript and package
|
||||
})
|
||||
})
|
||||
|
||||
test("new native dependencies fail the shared UI build instead of shipping a host-only binary", async () => {
|
||||
test("new native dependencies fail the UI build instead of shipping a build-host binary", async () => {
|
||||
await fixture(async (directory) => {
|
||||
await writeFile(path.join(directory, "new-dependency.node"), "fixture")
|
||||
await assert.rejects(
|
||||
@@ -93,3 +61,44 @@ test("new native dependencies fail the shared UI build instead of shipping a hos
|
||||
await access(path.join(directory, "new-dependency.node"))
|
||||
})
|
||||
})
|
||||
|
||||
test("pnpm links become real copies that keep each package's dependency versions", async () => {
|
||||
await fixture(async (directory) => {
|
||||
const store = path.join(directory, "node_modules", ".pnpm")
|
||||
async function storePackage(id, name, version, dependencies = {}) {
|
||||
const root = path.join(store, id, "node_modules")
|
||||
await mkdir(path.join(root, name), { recursive: true })
|
||||
await writeFile(path.join(root, name, "package.json"), version)
|
||||
for (const [dependency, target] of Object.entries(dependencies))
|
||||
await symlink(
|
||||
path.relative(
|
||||
root,
|
||||
path.join(store, target, "node_modules", dependency)
|
||||
),
|
||||
path.join(root, dependency)
|
||||
)
|
||||
}
|
||||
await storePackage("react@1", "react", "1")
|
||||
await storePackage("react@2", "react", "2")
|
||||
await storePackage("next@1", "next", "next", { react: "react@1" })
|
||||
await storePackage("convex@1", "convex", "convex", { react: "react@2" })
|
||||
const app = path.join(directory, "apps", "web", "node_modules")
|
||||
await mkdir(app, { recursive: true })
|
||||
await symlink(
|
||||
"../../../node_modules/.pnpm/next@1/node_modules/next",
|
||||
path.join(app, "next")
|
||||
)
|
||||
await symlink(
|
||||
"../../../node_modules/.pnpm/convex@1/node_modules/convex",
|
||||
path.join(app, "convex")
|
||||
)
|
||||
|
||||
await materializeLinks(directory)
|
||||
|
||||
const read = (file) => readFile(path.join(app, file), "utf8")
|
||||
assert.equal(await read("next/node_modules/react/package.json"), "1")
|
||||
assert.equal(await read("convex/node_modules/react/package.json"), "2")
|
||||
assert.equal((await lstat(path.join(app, "next"))).isSymbolicLink(), false)
|
||||
await assert.rejects(access(store))
|
||||
})
|
||||
})
|
||||
@@ -1,41 +0,0 @@
|
||||
import { execFileSync } from "node:child_process"
|
||||
import path from "node:path"
|
||||
import { desktopRoot, electronVersion } from "./config.mjs"
|
||||
|
||||
const target = process.env.OTUNES_DESKTOP_ARCH
|
||||
// x64 and arm64 cross-compile from either host CPU. Universal needs a Mac.
|
||||
if (
|
||||
!["x64", "arm64"].includes(target) &&
|
||||
!(process.platform === "darwin" && target === "universal")
|
||||
) {
|
||||
throw new Error("Targets are x64 or arm64, or universal on macOS")
|
||||
}
|
||||
if (!process.env.OTUNES_ELECTRON_SOURCE)
|
||||
throw new Error(
|
||||
"Configure the runner's Electron source path. See apps/desktop/README.md."
|
||||
)
|
||||
function run(script, env = {}) {
|
||||
execFileSync(process.execPath, [path.join(desktopRoot, "scripts", script)], {
|
||||
stdio: "inherit",
|
||||
env: { ...process.env, ...env },
|
||||
})
|
||||
}
|
||||
const architectures = target === "universal" ? ["x64", "arm64"] : [target]
|
||||
for (const arch of architectures)
|
||||
run("build-runtime.mjs", { OTUNES_ELECTRON_ARCH: arch })
|
||||
run("build-web.mjs")
|
||||
const distribution = (arch) =>
|
||||
path.join(
|
||||
desktopRoot,
|
||||
"runtime",
|
||||
`${electronVersion}-${process.platform}-${arch}`
|
||||
)
|
||||
run(
|
||||
"package.mjs",
|
||||
target === "universal"
|
||||
? {
|
||||
OTUNES_ELECTRON_DIST_X64: distribution("x64"),
|
||||
OTUNES_ELECTRON_DIST_ARM64: distribution("arm64"),
|
||||
}
|
||||
: { OTUNES_ELECTRON_DIST: distribution(target) }
|
||||
)
|
||||
@@ -1,42 +0,0 @@
|
||||
import { readFile, access } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
import { fileURLToPath } from "node:url"
|
||||
|
||||
export const desktopRoot = fileURLToPath(new URL("../", import.meta.url))
|
||||
export const electronVersion = "45.3.0"
|
||||
|
||||
// The build recipe writes this marker only after the custom runtime compiles.
|
||||
export async function customRuntime(
|
||||
arch = process.arch,
|
||||
location = process.env.OTUNES_ELECTRON_DIST
|
||||
) {
|
||||
if (!location) {
|
||||
throw new Error(
|
||||
"Set OTUNES_ELECTRON_DIST to the extracted custom Electron distribution. Stock Electron is not supported."
|
||||
)
|
||||
}
|
||||
const directory = path.resolve(location)
|
||||
const manifest = JSON.parse(
|
||||
await readFile(path.join(directory, "otunes-runtime.json"), "utf8")
|
||||
)
|
||||
if (
|
||||
manifest.version !== electronVersion ||
|
||||
manifest.platform !== process.platform ||
|
||||
manifest.arch !== arch ||
|
||||
manifest.enable_platform_ac3_eac3_audio !== true
|
||||
) {
|
||||
throw new Error(
|
||||
`Custom runtime must be Electron ${electronVersion} with EAC-3 enabled for ${process.platform}/${arch}`
|
||||
)
|
||||
}
|
||||
const executable = path.join(
|
||||
directory,
|
||||
process.platform === "darwin"
|
||||
? "Electron.app/Contents/MacOS/Electron"
|
||||
: process.platform === "win32"
|
||||
? "electron.exe"
|
||||
: "electron"
|
||||
)
|
||||
await access(executable)
|
||||
return { directory, executable }
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import { cp, readdir, realpath, rm } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
|
||||
// Installers cannot carry pnpm's symlinks: NSIS extracts them as broken files
|
||||
// and electron-builder drops the `.pnpm` store. Replace every link outside the
|
||||
// store with a real copy, nesting each package's dependencies under it (npm v2
|
||||
// layout) so Node resolves the same versions pnpm chose. Then drop the store.
|
||||
export async function materializeLinks(directory) {
|
||||
const store = path.join(directory, "node_modules", ".pnpm")
|
||||
for (const link of await findLinks(directory, store)) {
|
||||
const real = await realpath(link)
|
||||
await rm(link)
|
||||
await copyPackage(real, link, new Set())
|
||||
}
|
||||
await rm(store, { recursive: true, force: true })
|
||||
}
|
||||
|
||||
async function findLinks(directory, store) {
|
||||
const links = []
|
||||
for (const entry of await readdir(directory, { withFileTypes: true })) {
|
||||
const file = path.join(directory, entry.name)
|
||||
if (file === store) continue
|
||||
if (entry.isSymbolicLink()) links.push(file)
|
||||
else if (entry.isDirectory()) links.push(...(await findLinks(file, store)))
|
||||
}
|
||||
return links
|
||||
}
|
||||
|
||||
// `real` is <store>/<id>/node_modules/<name>; its siblings are its dependencies.
|
||||
async function copyPackage(real, destination, ancestors) {
|
||||
const match = /^(.*[\\/]\.pnpm[\\/][^\\/]+[\\/]node_modules)[\\/](.+)$/.exec(
|
||||
real
|
||||
)
|
||||
if (!match) throw new Error(`Link outside the pnpm store: ${real}`)
|
||||
const [, root, name] = match
|
||||
await cp(real, destination, { recursive: true })
|
||||
const chain = new Set(ancestors).add(real)
|
||||
for (const dependency of await packageNames(root)) {
|
||||
if (dependency === name.split(path.sep).join("/")) continue
|
||||
const source = await realpath(path.join(root, dependency))
|
||||
// A package that depends on an ancestor resolves it by walking up.
|
||||
if (chain.has(source)) continue
|
||||
await copyPackage(
|
||||
source,
|
||||
path.join(destination, "node_modules", dependency),
|
||||
chain
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Package names in a node_modules directory, including @scope/name.
|
||||
async function packageNames(directory) {
|
||||
const names = []
|
||||
for (const entry of await readdir(directory)) {
|
||||
if (entry.startsWith(".")) continue
|
||||
if (!entry.startsWith("@")) {
|
||||
names.push(entry)
|
||||
continue
|
||||
}
|
||||
for (const scoped of await readdir(path.join(directory, entry)))
|
||||
names.push(`${entry}/${scoped}`)
|
||||
}
|
||||
return names
|
||||
}
|
||||
@@ -1,38 +1,27 @@
|
||||
import { build, Platform, Arch } from "electron-builder"
|
||||
import { mkdir, copyFile, writeFile, rm, readFile } from "node:fs/promises"
|
||||
import { createRequire } from "node:module"
|
||||
import path from "node:path"
|
||||
import { customRuntime, desktopRoot, electronVersion } from "./config.mjs"
|
||||
import { fileURLToPath } from "node:url"
|
||||
|
||||
// Packages stock Electron with the bundled UI from build-web.mjs.
|
||||
// Usage: node scripts/package.mjs [windows|linux] [x64|arm64]
|
||||
// Defaults to the host OS and both architectures. Linux hosts can build both
|
||||
// targets: Windows needs Wine, ARM64 Flatpaks need qemu-user binfmt.
|
||||
const desktopRoot = fileURLToPath(new URL("../", import.meta.url))
|
||||
const hostTarget = { win32: "windows", linux: "linux" }[process.platform]
|
||||
const [target = hostTarget, onlyArch] = process.argv.slice(2)
|
||||
const platform = { windows: Platform.WINDOWS, linux: Platform.LINUX }[target]
|
||||
if (!platform) throw new Error("Targets are windows or linux")
|
||||
const architectures = onlyArch ? [onlyArch] : ["x64", "arm64"]
|
||||
if (!architectures.every((arch) => arch === "x64" || arch === "arm64"))
|
||||
throw new Error("Architectures are x64 or arm64")
|
||||
|
||||
const arch = process.env.OTUNES_DESKTOP_ARCH ?? process.arch
|
||||
if (
|
||||
!["x64", "arm64", "universal"].includes(arch) ||
|
||||
(arch === "universal" && process.platform !== "darwin")
|
||||
) {
|
||||
throw new Error("Supported targets are x64, arm64 and macOS universal")
|
||||
}
|
||||
const runtimes =
|
||||
arch === "universal"
|
||||
? {
|
||||
x64: await customRuntime("x64", process.env.OTUNES_ELECTRON_DIST_X64),
|
||||
arm64: await customRuntime(
|
||||
"arm64",
|
||||
process.env.OTUNES_ELECTRON_DIST_ARM64
|
||||
),
|
||||
}
|
||||
: { [arch]: await customRuntime(arch) }
|
||||
const platform =
|
||||
process.platform === "darwin"
|
||||
? Platform.MAC
|
||||
: process.platform === "win32"
|
||||
? Platform.WINDOWS
|
||||
: Platform.LINUX
|
||||
const staging = path.join(desktopRoot, ".package")
|
||||
await rm(staging, { recursive: true, force: true })
|
||||
await mkdir(staging, { recursive: true })
|
||||
await copyFile(
|
||||
path.join(desktopRoot, "main.cjs"),
|
||||
path.join(staging, "main.cjs")
|
||||
)
|
||||
for (const file of ["main.cjs", "server-config.cjs"])
|
||||
await copyFile(path.join(desktopRoot, file), path.join(staging, file))
|
||||
const pkg = JSON.parse(
|
||||
await readFile(path.join(desktopRoot, "package.json"), "utf8")
|
||||
)
|
||||
@@ -45,49 +34,42 @@ await writeFile(
|
||||
path.join(staging, "package.json"),
|
||||
JSON.stringify(pkg, null, 2)
|
||||
)
|
||||
await copyFile(
|
||||
path.join(desktopRoot, "server-config.cjs"),
|
||||
path.join(staging, "server-config.cjs")
|
||||
)
|
||||
|
||||
await build({
|
||||
targets: platform.createTarget(undefined, Arch[arch]),
|
||||
config: {
|
||||
appId: "com.otunes.desktop",
|
||||
productName: "oTunes",
|
||||
electronVersion,
|
||||
// Return a missing path for unexpected architectures so builder fails closed.
|
||||
// Throwing inside this hook lets electron-builder fall back to stock Electron.
|
||||
electronDist: ({ arch: runtimeArch }) =>
|
||||
runtimes[runtimeArch]?.directory ??
|
||||
path.join(desktopRoot, "runtime", `unsupported-${runtimeArch}`),
|
||||
artifactName: "oTunes-${version}-${os}-${arch}.${ext}",
|
||||
directories: { app: staging, output: path.join(desktopRoot, "dist") },
|
||||
files: ["main.cjs", "server-config.cjs", "package.json"],
|
||||
extraResources: [
|
||||
{ from: path.join(desktopRoot, "web"), to: "web", filter: ["**/*"] },
|
||||
],
|
||||
npmRebuild: false,
|
||||
mac: { category: "public.app-category.music", target: ["dmg"] },
|
||||
win: { target: ["nsis"] },
|
||||
linux: {
|
||||
category: "AudioVideo",
|
||||
target: ["flatpak"],
|
||||
const { version: electronVersion } = createRequire(import.meta.url)(
|
||||
"electron/package.json"
|
||||
)
|
||||
// One build per architecture: a multi-arch NSIS build merges both into one installer.
|
||||
for (const arch of architectures) {
|
||||
await build({
|
||||
targets: platform.createTarget(undefined, Arch[arch]),
|
||||
config: {
|
||||
appId: "com.otunes.desktop",
|
||||
productName: "oTunes",
|
||||
electronVersion,
|
||||
artifactName: "oTunes-${version}-${os}-${arch}.${ext}",
|
||||
icon: path.resolve(desktopRoot, "../web/public/logo.png"),
|
||||
},
|
||||
flatpak: {
|
||||
runtimeVersion: "25.08",
|
||||
baseVersion: "25.08",
|
||||
finishArgs: [
|
||||
"--socket=wayland",
|
||||
"--socket=fallback-x11",
|
||||
"--share=ipc",
|
||||
"--device=dri",
|
||||
"--socket=pulseaudio",
|
||||
"--share=network",
|
||||
directories: { app: staging, output: path.join(desktopRoot, "dist") },
|
||||
files: ["main.cjs", "server-config.cjs", "package.json"],
|
||||
extraResources: [
|
||||
{ from: path.join(desktopRoot, "web"), to: "web", filter: ["**/*"] },
|
||||
],
|
||||
npmRebuild: false,
|
||||
win: { target: ["nsis"] },
|
||||
linux: { category: "AudioVideo", target: ["flatpak"] },
|
||||
flatpak: {
|
||||
runtimeVersion: "25.08",
|
||||
baseVersion: "25.08",
|
||||
finishArgs: [
|
||||
"--socket=wayland",
|
||||
"--socket=fallback-x11",
|
||||
"--share=ipc",
|
||||
"--device=dri",
|
||||
"--socket=pulseaudio",
|
||||
"--share=network",
|
||||
],
|
||||
},
|
||||
publish: null,
|
||||
},
|
||||
publish: null,
|
||||
},
|
||||
publish: "never",
|
||||
})
|
||||
publish: "never",
|
||||
})
|
||||
}
|
||||
@@ -2,12 +2,15 @@ import { readdir, rm } from "node:fs/promises"
|
||||
import path from "node:path"
|
||||
|
||||
// Desktop images bypass Next's optimizer. Its traced Sharp binaries are unused
|
||||
// and would otherwise make the shared web bundle specific to the build host.
|
||||
// and match the build host, not the target (Windows installers build on Linux).
|
||||
export async function pruneNativeImages(directory) {
|
||||
for (const entry of await readdir(directory, { withFileTypes: true })) {
|
||||
const file = path.join(directory, entry.name)
|
||||
if (entry.isDirectory()) await pruneNativeImages(file)
|
||||
else if (entry.isFile() && /\.(node|dylib|dll)$|\.so(?:\.\d+)*$/.test(entry.name)) {
|
||||
else if (
|
||||
entry.isFile() &&
|
||||
/\.(node|dylib|dll)$|\.so(?:\.\d+)*$/.test(entry.name)
|
||||
) {
|
||||
if (!file.includes(`${path.sep}@img${path.sep}sharp-`)) {
|
||||
throw new Error(
|
||||
`Unexpected native dependency in the desktop web bundle: ${file}`
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
import { spawn } from "node:child_process"
|
||||
import { customRuntime, desktopRoot } from "./config.mjs"
|
||||
|
||||
const runtime = await customRuntime()
|
||||
const child = spawn(runtime.executable, [desktopRoot], {
|
||||
stdio: "inherit",
|
||||
env: process.env,
|
||||
})
|
||||
child.on("error", (error) => {
|
||||
throw error
|
||||
})
|
||||
child.on("exit", (code) => process.exit(code ?? 1))
|
||||
+1
-2
@@ -14,8 +14,7 @@
|
||||
"format": "prettier --write \"**/*.{ts,tsx}\"",
|
||||
"typecheck": "pnpm -r typecheck",
|
||||
"dev:desktop": "pnpm --filter @otunes/desktop start",
|
||||
"build:desktop": "pnpm --filter @otunes/desktop build",
|
||||
"build:desktop:runtime": "pnpm --filter @otunes/desktop build:runtime"
|
||||
"build:desktop": "pnpm --filter @otunes/desktop build"
|
||||
},
|
||||
"devDependencies": {
|
||||
"prettier": "^3.8.3",
|
||||
|
||||
Generated
+57
-51
@@ -255,12 +255,12 @@ importers:
|
||||
|
||||
apps/desktop:
|
||||
devDependencies:
|
||||
electron:
|
||||
specifier: 45.3.4
|
||||
version: 45.3.4(supports-color@8.1.1)
|
||||
electron-builder:
|
||||
specifier: 26.18.0
|
||||
version: 26.18.0(electron-builder-squirrel-windows@26.18.0)(supports-color@8.1.1)
|
||||
extract-zip:
|
||||
specifier: 2.0.1
|
||||
version: 2.0.1(supports-color@8.1.1)
|
||||
|
||||
apps/mobile:
|
||||
dependencies:
|
||||
@@ -1023,6 +1023,10 @@ packages:
|
||||
'@dotenvx/primitives@0.8.0':
|
||||
resolution: {integrity: sha512-VYJy0uhFm9zTJ1TxBaW/pA8bjbOM/OttaNMwZ1RHG4JKyRG7DhSdiqD1ipQoAyoD22olUtxbP78W9xY3Wd11bg==}
|
||||
|
||||
'@electron-internal/extract-zip@1.0.8':
|
||||
resolution: {integrity: sha512-8iajeLFbzNwM0m3AsQZSZgYREWglAImyGvvFSWU34FgMW8sHlzdwj9QKvv9dgN7jMP591EFUF/sLOC3Jl9YIjQ==}
|
||||
engines: {node: '>=22.12.0'}
|
||||
|
||||
'@electron/asar@3.4.1':
|
||||
resolution: {integrity: sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==}
|
||||
engines: {node: '>=10.12.0'}
|
||||
@@ -1036,6 +1040,10 @@ packages:
|
||||
resolution: {integrity: sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==}
|
||||
engines: {node: '>=14'}
|
||||
|
||||
'@electron/get@5.1.0':
|
||||
resolution: {integrity: sha512-3kSBtG8ObcTVfXanm5vVJ6UnBLEVmVsRk1M+vGqCuMBV+XLCbJYuWQful+yIy0GQDsSlK0kHEriEHn7SPk4EnA==}
|
||||
engines: {node: '>=22.12.0'}
|
||||
|
||||
'@electron/notarize@2.5.0':
|
||||
resolution: {integrity: sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==}
|
||||
engines: {node: '>= 10.0.0'}
|
||||
@@ -2974,6 +2982,9 @@ packages:
|
||||
'@types/node@20.19.43':
|
||||
resolution: {integrity: sha512-6oYBAi5ikg4Pl+kGsoYtawUMBT2zZMCvPNF7pVLnHZfd1zf38DRiWn/gT01RYCdUqkv7Fhr+C9ot4/tb+2sVvA==}
|
||||
|
||||
'@types/node@24.19.2':
|
||||
resolution: {integrity: sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==}
|
||||
|
||||
'@types/react-dom@19.3.0':
|
||||
resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==}
|
||||
peerDependencies:
|
||||
@@ -3000,9 +3011,6 @@ packages:
|
||||
'@types/yargs@17.0.35':
|
||||
resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==}
|
||||
|
||||
'@types/yauzl@2.10.3':
|
||||
resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
|
||||
|
||||
'@typescript-eslint/eslint-plugin@8.63.0':
|
||||
resolution: {integrity: sha512-rvwSgqT+DHpWdzfSzPatRLm02a0GlESt++9iy3hLCDY4BgkaLcl8LBi9Yh7XGFBpwcBE/K3024QuXWTpbz4FfQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
@@ -3584,9 +3592,6 @@ packages:
|
||||
bser@2.1.1:
|
||||
resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
|
||||
|
||||
buffer-crc32@0.2.13:
|
||||
resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
|
||||
|
||||
buffer-from@1.1.2:
|
||||
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
|
||||
|
||||
@@ -4129,6 +4134,11 @@ packages:
|
||||
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
|
||||
engines: {node: '>=8.0.0'}
|
||||
|
||||
electron@45.3.4:
|
||||
resolution: {integrity: sha512-cqU5u6arfGd9KJvCODjj32ckxkDQbweTL3v8J51tAsKGmDWYKcAqszvie0NDKBIGl6Ze19QTL74yIAUHrqNDig==}
|
||||
engines: {node: '>= 22.12.0'}
|
||||
hasBin: true
|
||||
|
||||
embla-carousel-react@8.6.0:
|
||||
resolution: {integrity: sha512-0/PjqU7geVmo6F734pmPqpyHqiM99olvyecY7zdweCw+6tKEXnrE90pBiBbMMU8s5tICemzpQ3hi5EpxzGW+JA==}
|
||||
peerDependencies:
|
||||
@@ -4178,6 +4188,10 @@ packages:
|
||||
resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
env-paths@3.0.0:
|
||||
resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==}
|
||||
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
|
||||
|
||||
err-code@2.0.3:
|
||||
resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
|
||||
|
||||
@@ -4695,11 +4709,6 @@ packages:
|
||||
resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
|
||||
engines: {node: '>= 18'}
|
||||
|
||||
extract-zip@2.0.1:
|
||||
resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
|
||||
engines: {node: '>= 10.17.0'}
|
||||
hasBin: true
|
||||
|
||||
fast-deep-equal@3.1.3:
|
||||
resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
|
||||
|
||||
@@ -4731,9 +4740,6 @@ packages:
|
||||
fb-watchman@2.0.2:
|
||||
resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
|
||||
|
||||
fd-slicer@1.1.0:
|
||||
resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
|
||||
|
||||
fdir@6.5.0:
|
||||
resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
|
||||
engines: {node: '>=12.0.0'}
|
||||
@@ -6108,9 +6114,6 @@ packages:
|
||||
resolution: {integrity: sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==}
|
||||
engines: {node: '>=12', npm: '>=6'}
|
||||
|
||||
pend@1.2.0:
|
||||
resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
|
||||
|
||||
picocolors@1.1.1:
|
||||
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
||||
|
||||
@@ -7177,6 +7180,9 @@ packages:
|
||||
undici-types@6.21.0:
|
||||
resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
|
||||
|
||||
undici-types@7.24.6:
|
||||
resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==}
|
||||
|
||||
undici@6.29.1:
|
||||
resolution: {integrity: sha512-EvRlUt/QqAEvXdQeRMYUfwOQsfzpDztykrG2owGEE/rBOBoYv9uF39ZzsNDh4lTFHhTr2XOZjKkYgueD12ZmGA==}
|
||||
engines: {node: '>=18.17'}
|
||||
@@ -7439,9 +7445,6 @@ packages:
|
||||
resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
yauzl@2.10.0:
|
||||
resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
|
||||
|
||||
yocto-queue@0.1.0:
|
||||
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
|
||||
engines: {node: '>=10'}
|
||||
@@ -8062,6 +8065,8 @@ snapshots:
|
||||
|
||||
'@dotenvx/primitives@0.8.0': {}
|
||||
|
||||
'@electron-internal/extract-zip@1.0.8': {}
|
||||
|
||||
'@electron/asar@3.4.1':
|
||||
dependencies:
|
||||
commander: 5.1.0
|
||||
@@ -8088,6 +8093,19 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@electron/get@5.1.0(supports-color@8.1.1)':
|
||||
dependencies:
|
||||
debug: 4.4.3(supports-color@8.1.1)
|
||||
env-paths: 3.0.0
|
||||
graceful-fs: 4.2.11
|
||||
progress: 2.0.3
|
||||
semver: 7.8.5
|
||||
sumchecker: 3.0.1(supports-color@8.1.1)
|
||||
optionalDependencies:
|
||||
undici: 7.30.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@electron/notarize@2.5.0(supports-color@8.1.1)':
|
||||
dependencies:
|
||||
debug: 4.4.3(supports-color@8.1.1)
|
||||
@@ -10339,6 +10357,10 @@ snapshots:
|
||||
dependencies:
|
||||
undici-types: 6.21.0
|
||||
|
||||
'@types/node@24.19.2':
|
||||
dependencies:
|
||||
undici-types: 7.24.6
|
||||
|
||||
'@types/react-dom@19.3.0(@types/react@19.3.0)':
|
||||
dependencies:
|
||||
'@types/react': 19.3.0
|
||||
@@ -10365,11 +10387,6 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/yargs-parser': 21.0.3
|
||||
|
||||
'@types/yauzl@2.10.3':
|
||||
dependencies:
|
||||
'@types/node': 20.19.43
|
||||
optional: true
|
||||
|
||||
'@typescript-eslint/eslint-plugin@8.63.0(@typescript-eslint/parser@8.63.0(eslint@9.39.4(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3))(eslint@9.39.4(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)':
|
||||
dependencies:
|
||||
'@eslint-community/regexpp': 4.12.2
|
||||
@@ -11093,8 +11110,6 @@ snapshots:
|
||||
dependencies:
|
||||
node-int64: 0.4.0
|
||||
|
||||
buffer-crc32@0.2.13: {}
|
||||
|
||||
buffer-from@1.1.2: {}
|
||||
|
||||
buffer@5.7.1:
|
||||
@@ -11666,6 +11681,14 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
electron@45.3.4(supports-color@8.1.1):
|
||||
dependencies:
|
||||
'@electron-internal/extract-zip': 1.0.8
|
||||
'@electron/get': 5.1.0(supports-color@8.1.1)
|
||||
'@types/node': 24.19.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
embla-carousel-react@8.6.0(react@19.3.1):
|
||||
dependencies:
|
||||
embla-carousel: 8.6.0
|
||||
@@ -11706,6 +11729,8 @@ snapshots:
|
||||
|
||||
env-paths@2.2.1: {}
|
||||
|
||||
env-paths@3.0.0: {}
|
||||
|
||||
err-code@2.0.3: {}
|
||||
|
||||
error-ex@1.3.4:
|
||||
@@ -12477,16 +12502,6 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
extract-zip@2.0.1(supports-color@8.1.1):
|
||||
dependencies:
|
||||
debug: 4.4.3(supports-color@8.1.1)
|
||||
get-stream: 5.2.0
|
||||
yauzl: 2.10.0
|
||||
optionalDependencies:
|
||||
'@types/yauzl': 2.10.3
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
fast-deep-equal@3.1.3: {}
|
||||
|
||||
fast-glob@3.3.1:
|
||||
@@ -12521,10 +12536,6 @@ snapshots:
|
||||
dependencies:
|
||||
bser: 2.1.1
|
||||
|
||||
fd-slicer@1.1.0:
|
||||
dependencies:
|
||||
pend: 1.2.0
|
||||
|
||||
fdir@6.5.0(picomatch@4.0.5):
|
||||
optionalDependencies:
|
||||
picomatch: 4.0.5
|
||||
@@ -13964,8 +13975,6 @@ snapshots:
|
||||
|
||||
pe-library@0.4.1: {}
|
||||
|
||||
pend@1.2.0: {}
|
||||
|
||||
picocolors@1.1.1: {}
|
||||
|
||||
picomatch@2.3.2: {}
|
||||
@@ -15209,6 +15218,8 @@ snapshots:
|
||||
|
||||
undici-types@6.21.0: {}
|
||||
|
||||
undici-types@7.24.6: {}
|
||||
|
||||
undici@6.29.1: {}
|
||||
|
||||
undici@7.30.2: {}
|
||||
@@ -15484,11 +15495,6 @@ snapshots:
|
||||
y18n: 5.0.8
|
||||
yargs-parser: 21.1.1
|
||||
|
||||
yauzl@2.10.0:
|
||||
dependencies:
|
||||
buffer-crc32: 0.2.13
|
||||
fd-slicer: 1.1.0
|
||||
|
||||
yocto-queue@0.1.0: {}
|
||||
|
||||
yocto-spinner@1.2.1:
|
||||
|
||||
@@ -10,6 +10,7 @@ patchedDependencies:
|
||||
'@react-native-community/slider@5.2.1': patches/@react-native-community__slider@5.2.1.patch
|
||||
'expo-router@58.0.25': patches/expo-router@58.0.25.patch
|
||||
allowBuilds:
|
||||
electron: true
|
||||
esbuild: true
|
||||
unrs-resolver: true
|
||||
overrides:
|
||||
|
||||
Reference in new issue
Block a user