TTP -> MTP, A lot of other stuff #21

Merged
alois merged 81 commits from dev into main 2026-07-21 11:57:33 +03:00
3 changed files with 4 additions and 6 deletions
Showing only changes of commit 10da530e9e - Show all commits

Revert "(fix): now run builds in nix shell"
Some checks failed
/ build-desktop (linux) (push) Has been cancelled
/ release (push) Has been cancelled
/ build-web (push) Has been cancelled
/ build-mobile (push) Has been cancelled

This reverts commit f81235c68d.
Alois 2026-06-28 19:09:50 +02:00

View file

@ -9,15 +9,13 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"format": "bunx prettier --write .", "format": "bunx prettier --write .",
"lint": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop .#electron --command bun run lint:raw; else bun run lint:raw; fi", "lint": "bun scripts/lint-packages.ts",
"lint:raw": "bun scripts/lint-packages.ts",
"check": "fallow && bun run lint", "check": "fallow && bun run lint",
"copy-licenses": "bun scripts/copy-licenses.ts", "copy-licenses": "bun scripts/copy-licenses.ts",
"copy-releases": "bun scripts/copy-releases.ts", "copy-releases": "bun scripts/copy-releases.ts",
"pre-build": "bun run lint && bun run build:packages", "pre-build": "bun run lint && bun run build:packages",
"build:apps": "bun run copy-licenses && bun run pre-build && bun run build:mobile && bun run build:desktop && bun --bun run copy-releases", "build:apps": "bun run copy-licenses && bun run pre-build && bun run build:mobile && bun run build:desktop && bun --bun run copy-releases",
"build:packages": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop .#electron --command bun run build:packages:raw; else bun run build:packages:raw; fi", "build:packages": "bun scripts/build-packages.ts",
"build:packages:raw": "bun scripts/build-packages.ts",
"update:packages": "bun scripts/update-packages.ts", "update:packages": "bun scripts/update-packages.ts",
"dev:web": "cd apps/web && bun dev", "dev:web": "cd apps/web && bun dev",
"build:web": "cd apps/web && bun run build", "build:web": "cd apps/web && bun run build",

View file

@ -34,7 +34,7 @@ for (const fullPath of packageDirs) {
const entry = fullPath.replace(packagesDir + "/", ""); const entry = fullPath.replace(packagesDir + "/", "");
console.log(`Building ${entry}...`); console.log(`Building ${entry}...`);
try { try {
execSync("bun run build", { cwd: fullPath, stdio: "inherit" }); execSync("bun --bun run build", { cwd: fullPath, stdio: "inherit" });
console.log(`${entry} built successfully.`); console.log(`${entry} built successfully.`);
} catch { } catch {
console.error(`Failed to build ${entry}.`); console.error(`Failed to build ${entry}.`);

View file

@ -36,7 +36,7 @@ for (const targetDir of targetDirs) {
const entry = relative(rootDir, fullPath); const entry = relative(rootDir, fullPath);
console.log(`Linting ${entry}...`); console.log(`Linting ${entry}...`);
try { try {
execSync("bun run lint", { cwd: fullPath, stdio: "inherit" }); execSync("bun --bun run lint", { cwd: fullPath, stdio: "inherit" });
console.log(`${entry} linted successfully.`); console.log(`${entry} linted successfully.`);
} catch { } catch {
console.error(`Failed to lint ${entry}.`); console.error(`Failed to lint ${entry}.`);