diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meshbay-client/package-lock.json | 8 | ||||
| -rw-r--r-- | packages/meshbay-client/package.json | 26 | ||||
| -rw-r--r-- | packages/meshbay-hub/tests/test_desktop_shell.py | 44 |
3 files changed, 52 insertions, 26 deletions
diff --git a/packages/meshbay-client/package-lock.json b/packages/meshbay-client/package-lock.json index 2cf4f09..e86a523 100644 --- a/packages/meshbay-client/package-lock.json +++ b/packages/meshbay-client/package-lock.json @@ -13,7 +13,7 @@ "castv2-client": "^1.2.0" }, "devDependencies": { - "electron": "^42.11.1", + "electron": "^44.1.1", "electron-builder": "^26.15.3" } }, @@ -1568,9 +1568,9 @@ } }, "node_modules/electron": { - "version": "42.11.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-42.11.1.tgz", - "integrity": "sha512-mRYYjGDRWCyU+h4FU/0ruqxL/rXc+h2VCLhTb19KHu18HCUFWQAeFS/mFwnEKT/7GQCwlIHOhHie5ICLPXW6aw==", + "version": "44.1.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-44.1.1.tgz", + "integrity": "sha512-N2WCq2sbOkqQgvXJYx2lS6UiO8bF+Yr67trDnS6JKa2WxTCRQsAjGl57SUtdW9h6r5PlduBFjIhxhgd3dzv1hg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/packages/meshbay-client/package.json b/packages/meshbay-client/package.json index 7d88f5b..42af9c5 100644 --- a/packages/meshbay-client/package.json +++ b/packages/meshbay-client/package.json @@ -10,10 +10,10 @@ "scripts": { "start": "electron .", "sync-ui": "node scripts/sync-ui.js", - "dist": "npm run sync-ui && electron-builder --linux deb rpm" + "dist": "bash ../../packaging/build/build-client.sh" }, "devDependencies": { - "electron": "^42.11.1", + "electron": "^44.1.1", "electron-builder": "^26.15.3" }, "build": { @@ -22,25 +22,7 @@ "files": [ "src/**", "ui/**" - ], - "linux": { - "target": [ - "deb", - "rpm" - ], - "category": "Network", - "synopsis": "Peer-to-peer file sharing, streaming and group chat" - }, - "deb": { - "depends": [ - "python3-meshbay-common" - ] - }, - "rpm": { - "depends": [ - "python3-meshbay-common" - ] - } + ] }, "dependencies": { "bonjour-service": "^1.4.4", @@ -50,6 +32,6 @@ "protobufjs": "^7.6.5" }, "allowScripts": { - "electron@42.11.1": true + "electron@44.1.1": true } } diff --git a/packages/meshbay-hub/tests/test_desktop_shell.py b/packages/meshbay-hub/tests/test_desktop_shell.py index b82804e..f1dd399 100644 --- a/packages/meshbay-hub/tests/test_desktop_shell.py +++ b/packages/meshbay-hub/tests/test_desktop_shell.py @@ -13,6 +13,7 @@ Every assertion here corresponds to a sentence in `docs/desktop-client-v1.md` person with an installed client is what confirms the rest. """ +import json import re from pathlib import Path @@ -332,3 +333,46 @@ def test_a_chosen_folder_that_has_gone_is_not_silently_replaced(): assert "config.downloadDir && !chosen" in begin, ( "a chosen-but-missing folder falls through to the default instead of asking") assert "showSaveDialog" in begin + + +# ── one definition of the package, not two ─────────────────────────────────── + +def test_package_json_does_not_define_a_second_linux_package(): + """ + `packaging/build/` builds the client's `.deb` and `.rpm`: `build-client.sh` + runs electron-builder for `--dir` only, then the tree is assembled by hand + and `dpkg-deb`/`rpmbuild` package it from `packaging/deb/meshbay-client/ + DEBIAN/control` and `packaging/rpm/meshbay-client.spec`. + + `package.json` used to *also* declare `linux.target: [deb, rpm]` with its + own `deb.depends`/`rpm.depends`, so `npm run dist` produced a second + package under the same name — and the two had already drifted. The + electron-builder one installed to `/opt/MeshBay/meshbay-client` (against + `/opt/meshbay-client/meshbay`), and declared `Depends: + python3-meshbay-common` while naming none of the Electron runtime + libraries the real control file lists — so it would have installed + cleanly and then refused to start. + + Nothing referenced `npm run dist`, which is why nobody noticed. It now + delegates to `build-client.sh`, and this keeps the second definition from + growing back. + """ + pkg = json.loads((CLIENT / "package.json").read_text(encoding="utf-8")) + build = pkg.get("build", {}) + + for key in ("deb", "rpm", "appImage", "snap", "pacman"): + assert key not in build, ( + f"package.json's build.{key} defines packaging that " + "packaging/build/ already owns — two definitions of one package " + "drift, and the last pair already had") + + targets = build.get("linux", {}).get("target") + assert not targets, ( + f"build.linux.target is {targets!r}: electron-builder is used for " + "--dir only. A target list here makes `electron-builder` emit a " + "package that competes with the one packaging/build/ ships") + + dist = pkg.get("scripts", {}).get("dist", "") + assert "electron-builder" not in dist, ( + "the dist script builds packages with electron-builder again; it " + "should delegate to packaging/build/build-client.sh") |