From 095fbb701534893e15a5f6bf263747a3cf5648b3 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 16:12:27 +0300 Subject: [PATCH 1/7] fix(release): appdmg not found --- package-lock.json | 227 +++++++++++++++++++++++----------------------- package.json | 16 ++-- 2 files changed, 121 insertions(+), 122 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b262b0e4..a792813b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.92.4", + "version": "0.92.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.92.4", + "version": "0.92.5", "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "7.1.1", @@ -97,14 +97,14 @@ "trilium": "src/main.js" }, "devDependencies": { - "@electron-forge/cli": "7.8.0", - "@electron-forge/maker-deb": "7.8.0", - "@electron-forge/maker-dmg": "7.8.0", - "@electron-forge/maker-flatpak": "7.8.0", - "@electron-forge/maker-rpm": "7.8.0", - "@electron-forge/maker-squirrel": "7.8.0", - "@electron-forge/maker-zip": "7.8.0", - "@electron-forge/plugin-auto-unpack-natives": "7.8.0", + "@electron-forge/cli": "7.7.0", + "@electron-forge/maker-deb": "7.7.0", + "@electron-forge/maker-dmg": "7.7.0", + "@electron-forge/maker-flatpak": "7.7.0", + "@electron-forge/maker-rpm": "7.7.0", + "@electron-forge/maker-squirrel": "7.7.0", + "@electron-forge/maker-zip": "7.7.0", + "@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.23.0", "@excalidraw/excalidraw": "0.18.0", @@ -698,9 +698,9 @@ ] }, "node_modules/@electron-forge/cli": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.8.0.tgz", - "integrity": "sha512-XZ+Hg7pxeE9pgrahqcpMlND+VH0l0UTZLyO5wkI+YfanNyBQksB2mw24XeEtCA6x8F2IaEYdIGgijmPF6qpjzA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz", + "integrity": "sha512-QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw==", "dev": true, "funding": [ { @@ -714,16 +714,15 @@ ], "license": "MIT", "dependencies": { - "@electron-forge/core": "7.8.0", - "@electron-forge/core-utils": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/core": "7.7.0", + "@electron-forge/core-utils": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "@electron/get": "^3.0.0", "chalk": "^4.0.0", "commander": "^11.1.0", "debug": "^4.3.1", "fs-extra": "^10.0.0", "listr2": "^7.0.2", - "log-symbols": "^4.0.0", "semver": "^7.2.1" }, "bin": { @@ -764,9 +763,9 @@ } }, "node_modules/@electron-forge/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.8.0.tgz", - "integrity": "sha512-7byf660ECZND+irOhGxvpmRXjk1bMrsTWh5J2AZMEvaXI8tub9OrZY9VSbi5fcDt0lpHPKmgVk7NRf/ZjJ+beQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz", + "integrity": "sha512-BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ==", "dev": true, "funding": [ { @@ -780,17 +779,17 @@ ], "license": "MIT", "dependencies": { - "@electron-forge/core-utils": "7.8.0", - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/plugin-base": "7.8.0", - "@electron-forge/publisher-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0", - "@electron-forge/template-base": "7.8.0", - "@electron-forge/template-vite": "7.8.0", - "@electron-forge/template-vite-typescript": "7.8.0", - "@electron-forge/template-webpack": "7.8.0", - "@electron-forge/template-webpack-typescript": "7.8.0", - "@electron-forge/tracer": "7.8.0", + "@electron-forge/core-utils": "7.7.0", + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/plugin-base": "7.7.0", + "@electron-forge/publisher-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0", + "@electron-forge/template-base": "7.7.0", + "@electron-forge/template-vite": "7.7.0", + "@electron-forge/template-vite-typescript": "7.7.0", + "@electron-forge/template-webpack": "7.7.0", + "@electron-forge/template-webpack-typescript": "7.7.0", + "@electron-forge/tracer": "7.7.0", "@electron/get": "^3.0.0", "@electron/packager": "^18.3.5", "@electron/rebuild": "^3.7.0", @@ -819,13 +818,13 @@ } }, "node_modules/@electron-forge/core-utils": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.8.0.tgz", - "integrity": "sha512-ZioRzqkXVOGuwkfvXN/FPZxcssJ9AkOZx6RvxomQn90F77G2KfEbw4ZwAxVTQ+jWNUzydTic5qavWle++Y5IeA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz", + "integrity": "sha512-kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/shared-types": "7.7.0", "@electron/rebuild": "^3.7.0", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", @@ -896,13 +895,13 @@ } }, "node_modules/@electron-forge/maker-base": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.8.0.tgz", - "integrity": "sha512-yGRvz70w+NnKO7PhzNFRgYM+x6kxYFgpbChJIQBs3WChd9bGjL+MZLrwYqmxOFLpWNwRAJ6PEi4E/8U5GgV6AQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz", + "integrity": "sha512-9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/shared-types": "7.7.0", "fs-extra": "^10.0.0", "which": "^2.0.2" }, @@ -939,14 +938,14 @@ } }, "node_modules/@electron-forge/maker-deb": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.8.0.tgz", - "integrity": "sha512-9jjhLm/1IBIo0UuRdELgvBhUkNjK3tHNlUsrqeb8EJwWJZShbPwHYZJj+VbgjQfJFFzhHwBBDJViBXJ/4ePv+g==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.7.0.tgz", + "integrity": "sha512-yMT0TWpCwXaC9+AYpSr9PBIhcZR297wdJUk5PnEnIROsvOW2y1sh7ny7YdHXTxkvhWdbqY8sLQruL3BE+CyE8w==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0" + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0" }, "engines": { "node": ">= 16.4.0" @@ -956,14 +955,14 @@ } }, "node_modules/@electron-forge/maker-dmg": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.8.0.tgz", - "integrity": "sha512-ml6GpHvUyhOapIF1ALEM4zCqXiAf2+t+3FqKnjNtiVbH5fnV2CW//SWWozrvAGTrYGi/6V4s9TL/rIek0BHOPA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.7.0.tgz", + "integrity": "sha512-Hq4nsY6eOdtigN4RLc9i2SbLEr46J6FfbdU+r39R/EVIJ82WRk7JPrCqbckEM7KY1TjhmrnhPWeviWoGAjbXhA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1002,14 +1001,14 @@ } }, "node_modules/@electron-forge/maker-flatpak": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.8.0.tgz", - "integrity": "sha512-tnOWQLVvNZVO9xWmhUHK4OsQgYUpEIn0DX1M8FkgQCYSDXcPg/CZaZ66zqj/gu1KzGAOWg1m5KlTbITRY5Jmcg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.7.0.tgz", + "integrity": "sha512-WDNmGTulgPe4FEgxq128TI58EtVyS2Fq3loXhfirNuzoXpBtvt0LHK447cmtKHAvZZ+R802uriTcj28L+Iub3A==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1048,14 +1047,14 @@ } }, "node_modules/@electron-forge/maker-rpm": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.8.0.tgz", - "integrity": "sha512-oTH951NE39LOX2wYMg+C06vBZDWUP/0dsK01PlXEl5e5YfQM5Cifsk3E7BzE6BpZdWRJL3k/ETqpyYeIGNb1jw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.7.0.tgz", + "integrity": "sha512-M9cFO6bCnOuA6BwBUUw35FrnWciWeFyLuByO0KOn3zEYeBDqG2fbBgXXS6OKcRHrpnJVTwiLY5S7eviyO1DJzQ==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0" + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0" }, "engines": { "node": ">= 16.4.0" @@ -1065,14 +1064,14 @@ } }, "node_modules/@electron-forge/maker-squirrel": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.8.0.tgz", - "integrity": "sha512-On8WIyjNtNlWf8NJRRVToighGCCU+wcxytFM0F8Zx/pLszgc01bt7wIarOiAIzuIT9Z8vshAYA0iG1U099jfeA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.7.0.tgz", + "integrity": "sha512-9Gcq8e6+1MuXGeE7bEpk7VTd86c0riXTsDFKW8OqwVozeBYhoCd6GU59RmI3b7mcAIKOY1cBY97B+/5bnZ8ZYg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1111,14 +1110,14 @@ } }, "node_modules/@electron-forge/maker-zip": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.8.0.tgz", - "integrity": "sha512-7MLD7GkZdlGecC9GvgBu0sWYt48p3smYvr+YCwlpdH1CTeLmWhvCqeH33a2AB0XI5CY8U8jnkG2jgdTkzr/EQw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.7.0.tgz", + "integrity": "sha512-/rRFiPcojk0hcn+NOfHv2SlMNvghBk1RN0nuLHbbe8r+C0vG4LJV9ee/Y0HhVKkcpapJOQ+MasXJ86fzAp5uAg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/maker-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "cross-zip": "^4.0.0", "fs-extra": "^10.0.0", "got": "^11.8.5" @@ -1156,53 +1155,53 @@ } }, "node_modules/@electron-forge/plugin-auto-unpack-natives": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.8.0.tgz", - "integrity": "sha512-JGal5ltZmbTQ5rNq67OgGC4MJ2zjjFW0fqykHy8X9J8cgaH7SRdKkT4yYZ8jH01IAF1J57FD2zIob1MvcBqjcg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.7.0.tgz", + "integrity": "sha512-cYeD4x2oQXUyK4+DtIR6wMxcIHvyPgsJq1diEuBoQ+MFTh+s6DXZl6JvwtI3scD0XieCkzcmUmf8ygzqs124+w==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/plugin-base": "7.8.0", - "@electron-forge/shared-types": "7.8.0" + "@electron-forge/plugin-base": "7.7.0", + "@electron-forge/shared-types": "7.7.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/plugin-base": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.8.0.tgz", - "integrity": "sha512-rDeeChRWIp5rQVo3Uc1q0ncUvA+kWWURW7tMuQjPvy2qVSgX+jIf5krk+T1Dp06+D4YZzEIrkibRaamAaIcR1w==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz", + "integrity": "sha512-6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0" + "@electron-forge/shared-types": "7.7.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/publisher-base": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.8.0.tgz", - "integrity": "sha512-wrZyptJ0Uqvlh2wYzDZfIu2HgCQ+kdGiBlcucmLY4W+GUqf043O8cbYso3D9NXQxOow55QC/1saCQkgLphprPA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz", + "integrity": "sha512-jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0" + "@electron-forge/shared-types": "7.7.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/shared-types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.8.0.tgz", - "integrity": "sha512-Ul+7HPvAZiAirqpZm0vc9YvlkAE+2bcrI10p3t50mEtuxn5VO/mB72NXiEKfWzHm8F31JySIe9bUV6s1MHQcCw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz", + "integrity": "sha512-1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/tracer": "7.8.0", + "@electron-forge/tracer": "7.7.0", "@electron/packager": "^18.3.5", "@electron/rebuild": "^3.7.0", "listr2": "^7.0.2" @@ -1212,14 +1211,14 @@ } }, "node_modules/@electron-forge/template-base": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.8.0.tgz", - "integrity": "sha512-hc8NwoDqEEmZFH/p0p3MK/7xygMmI+cm8Gavoj2Mr2xS7VUUu4r3b5PwIGKvkLfPG34uwsiVwtid2t1rWGF4UA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz", + "integrity": "sha512-jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/core-utils": "7.8.0", - "@electron-forge/shared-types": "7.8.0", + "@electron-forge/core-utils": "7.7.0", + "@electron-forge/shared-types": "7.7.0", "@malept/cross-spawn-promise": "^2.0.0", "debug": "^4.3.1", "fs-extra": "^10.0.0", @@ -1258,14 +1257,14 @@ } }, "node_modules/@electron-forge/template-vite": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.8.0.tgz", - "integrity": "sha512-bf/jd8WzD0gU7Jet+WSi0Lm0SQmseb08WY27ZfJYEs2EVNMiwDfPicgQnOaqP++2yTrXhj1OY/rolZCP9CUyVw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz", + "integrity": "sha512-6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", - "@electron-forge/template-base": "7.8.0", + "@electron-forge/shared-types": "7.7.0", + "@electron-forge/template-base": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1273,14 +1272,14 @@ } }, "node_modules/@electron-forge/template-vite-typescript": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.8.0.tgz", - "integrity": "sha512-kW3CaVxKHUYuVfY+rT3iepeZ69frBRGh3YZOngLY2buCvGIqNEx+VCgrFBRDDbOKGmwQtwO1E9wp2rtC8q6Ztg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz", + "integrity": "sha512-32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", - "@electron-forge/template-base": "7.8.0", + "@electron-forge/shared-types": "7.7.0", + "@electron-forge/template-base": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1344,14 +1343,14 @@ } }, "node_modules/@electron-forge/template-webpack": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.8.0.tgz", - "integrity": "sha512-AdLGC6NVgrd7Q0SaaeiwJKmSBjN6C2EHxZgLMy1yxNSpazU9m3DtYQilDjXqmCWfxkeNzdke0NaeDvLgdJSw5A==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz", + "integrity": "sha512-7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", - "@electron-forge/template-base": "7.8.0", + "@electron-forge/shared-types": "7.7.0", + "@electron-forge/template-base": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1359,14 +1358,14 @@ } }, "node_modules/@electron-forge/template-webpack-typescript": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.8.0.tgz", - "integrity": "sha512-Pl8l+gv3HzqCfFIMLxlEsoAkNd0VEWeZZ675SYyqs0/kBQUifn0bKNhVE4gUZwKGgQCcG1Gvb23KdVGD3H3XmA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz", + "integrity": "sha512-w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.8.0", - "@electron-forge/template-base": "7.8.0", + "@electron-forge/shared-types": "7.7.0", + "@electron-forge/template-base": "7.7.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1430,9 +1429,9 @@ } }, "node_modules/@electron-forge/tracer": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.8.0.tgz", - "integrity": "sha512-t4fIATZEX6/7PJNfyh6tLzKEsNMpO01Nz/rgHWBxeRvjCw5UNul9OOxoM7b43vfFAO9Jv++34oI3VJ09LeVQ2Q==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz", + "integrity": "sha512-R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index b7d521cfc..bff6ddb3f 100644 --- a/package.json +++ b/package.json @@ -153,14 +153,14 @@ "yauzl": "3.2.0" }, "devDependencies": { - "@electron-forge/cli": "7.8.0", - "@electron-forge/maker-deb": "7.8.0", - "@electron-forge/maker-dmg": "7.8.0", - "@electron-forge/maker-flatpak": "7.8.0", - "@electron-forge/maker-rpm": "7.8.0", - "@electron-forge/maker-squirrel": "7.8.0", - "@electron-forge/maker-zip": "7.8.0", - "@electron-forge/plugin-auto-unpack-natives": "7.8.0", + "@electron-forge/cli": "7.7.0", + "@electron-forge/maker-deb": "7.7.0", + "@electron-forge/maker-dmg": "7.7.0", + "@electron-forge/maker-flatpak": "7.7.0", + "@electron-forge/maker-rpm": "7.7.0", + "@electron-forge/maker-squirrel": "7.7.0", + "@electron-forge/maker-zip": "7.7.0", + "@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.23.0", "@excalidraw/excalidraw": "0.18.0", From fb800eb96bd41d695a47015b59aeb71e8e9683fb Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 16:44:46 +0300 Subject: [PATCH 2/7] fix(forge): slashes in ref name breaking copying --- forge.config.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge.config.cjs b/forge.config.cjs index 8d5b5d22e..e04419450 100644 --- a/forge.config.cjs +++ b/forge.config.cjs @@ -169,7 +169,7 @@ module.exports = { // Override the extension for the CI. const { TRILIUM_ARTIFACT_NAME_HINT } = process.env; if (TRILIUM_ARTIFACT_NAME_HINT) { - fileName = TRILIUM_ARTIFACT_NAME_HINT + extension; + fileName = TRILIUM_ARTIFACT_NAME_HINT.replaceAll("/", "-") + extension; } const outputPath = path.join(outputDir, fileName); From a9c3c98fa5159e511c06afa594cb838a892da680 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 16:52:24 +0300 Subject: [PATCH 3/7] chore(nighly): trigger on forge config change --- .github/workflows/nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 526d8901f..6c14f83bd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,6 +11,7 @@ on: pull_request: paths: - .github/actions/build-electron/* + - forge.config.cjs env: GITHUB_UPLOAD_URL: https://uploads.github.com/repos/TriliumNext/Notes/releases/179589950/assets{?name,label} GITHUB_RELEASE_ID: 179589950 From 85000a2b7ff2224acaff3ab1d0911058ade72c1d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 17:04:29 +0300 Subject: [PATCH 4/7] Revert "fix(release): appdmg not found" This reverts commit 095fbb701534893e15a5f6bf263747a3cf5648b3. --- package-lock.json | 227 +++++++++++++++++++++++----------------------- package.json | 16 ++-- 2 files changed, 122 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index a792813b4..5b262b0e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.92.5", + "version": "0.92.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.92.5", + "version": "0.92.4", "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "7.1.1", @@ -97,14 +97,14 @@ "trilium": "src/main.js" }, "devDependencies": { - "@electron-forge/cli": "7.7.0", - "@electron-forge/maker-deb": "7.7.0", - "@electron-forge/maker-dmg": "7.7.0", - "@electron-forge/maker-flatpak": "7.7.0", - "@electron-forge/maker-rpm": "7.7.0", - "@electron-forge/maker-squirrel": "7.7.0", - "@electron-forge/maker-zip": "7.7.0", - "@electron-forge/plugin-auto-unpack-natives": "7.7.0", + "@electron-forge/cli": "7.8.0", + "@electron-forge/maker-deb": "7.8.0", + "@electron-forge/maker-dmg": "7.8.0", + "@electron-forge/maker-flatpak": "7.8.0", + "@electron-forge/maker-rpm": "7.8.0", + "@electron-forge/maker-squirrel": "7.8.0", + "@electron-forge/maker-zip": "7.8.0", + "@electron-forge/plugin-auto-unpack-natives": "7.8.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.23.0", "@excalidraw/excalidraw": "0.18.0", @@ -698,9 +698,9 @@ ] }, "node_modules/@electron-forge/cli": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz", - "integrity": "sha512-QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.8.0.tgz", + "integrity": "sha512-XZ+Hg7pxeE9pgrahqcpMlND+VH0l0UTZLyO5wkI+YfanNyBQksB2mw24XeEtCA6x8F2IaEYdIGgijmPF6qpjzA==", "dev": true, "funding": [ { @@ -714,15 +714,16 @@ ], "license": "MIT", "dependencies": { - "@electron-forge/core": "7.7.0", - "@electron-forge/core-utils": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/core": "7.8.0", + "@electron-forge/core-utils": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "@electron/get": "^3.0.0", "chalk": "^4.0.0", "commander": "^11.1.0", "debug": "^4.3.1", "fs-extra": "^10.0.0", "listr2": "^7.0.2", + "log-symbols": "^4.0.0", "semver": "^7.2.1" }, "bin": { @@ -763,9 +764,9 @@ } }, "node_modules/@electron-forge/core": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz", - "integrity": "sha512-BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.8.0.tgz", + "integrity": "sha512-7byf660ECZND+irOhGxvpmRXjk1bMrsTWh5J2AZMEvaXI8tub9OrZY9VSbi5fcDt0lpHPKmgVk7NRf/ZjJ+beQ==", "dev": true, "funding": [ { @@ -779,17 +780,17 @@ ], "license": "MIT", "dependencies": { - "@electron-forge/core-utils": "7.7.0", - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/plugin-base": "7.7.0", - "@electron-forge/publisher-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0", - "@electron-forge/template-base": "7.7.0", - "@electron-forge/template-vite": "7.7.0", - "@electron-forge/template-vite-typescript": "7.7.0", - "@electron-forge/template-webpack": "7.7.0", - "@electron-forge/template-webpack-typescript": "7.7.0", - "@electron-forge/tracer": "7.7.0", + "@electron-forge/core-utils": "7.8.0", + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/plugin-base": "7.8.0", + "@electron-forge/publisher-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0", + "@electron-forge/template-base": "7.8.0", + "@electron-forge/template-vite": "7.8.0", + "@electron-forge/template-vite-typescript": "7.8.0", + "@electron-forge/template-webpack": "7.8.0", + "@electron-forge/template-webpack-typescript": "7.8.0", + "@electron-forge/tracer": "7.8.0", "@electron/get": "^3.0.0", "@electron/packager": "^18.3.5", "@electron/rebuild": "^3.7.0", @@ -818,13 +819,13 @@ } }, "node_modules/@electron-forge/core-utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz", - "integrity": "sha512-kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.8.0.tgz", + "integrity": "sha512-ZioRzqkXVOGuwkfvXN/FPZxcssJ9AkOZx6RvxomQn90F77G2KfEbw4ZwAxVTQ+jWNUzydTic5qavWle++Y5IeA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/shared-types": "7.8.0", "@electron/rebuild": "^3.7.0", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", @@ -895,13 +896,13 @@ } }, "node_modules/@electron-forge/maker-base": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz", - "integrity": "sha512-9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.8.0.tgz", + "integrity": "sha512-yGRvz70w+NnKO7PhzNFRgYM+x6kxYFgpbChJIQBs3WChd9bGjL+MZLrwYqmxOFLpWNwRAJ6PEi4E/8U5GgV6AQ==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/shared-types": "7.8.0", "fs-extra": "^10.0.0", "which": "^2.0.2" }, @@ -938,14 +939,14 @@ } }, "node_modules/@electron-forge/maker-deb": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.7.0.tgz", - "integrity": "sha512-yMT0TWpCwXaC9+AYpSr9PBIhcZR297wdJUk5PnEnIROsvOW2y1sh7ny7YdHXTxkvhWdbqY8sLQruL3BE+CyE8w==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.8.0.tgz", + "integrity": "sha512-9jjhLm/1IBIo0UuRdELgvBhUkNjK3tHNlUsrqeb8EJwWJZShbPwHYZJj+VbgjQfJFFzhHwBBDJViBXJ/4ePv+g==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0" + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0" }, "engines": { "node": ">= 16.4.0" @@ -955,14 +956,14 @@ } }, "node_modules/@electron-forge/maker-dmg": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.7.0.tgz", - "integrity": "sha512-Hq4nsY6eOdtigN4RLc9i2SbLEr46J6FfbdU+r39R/EVIJ82WRk7JPrCqbckEM7KY1TjhmrnhPWeviWoGAjbXhA==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.8.0.tgz", + "integrity": "sha512-ml6GpHvUyhOapIF1ALEM4zCqXiAf2+t+3FqKnjNtiVbH5fnV2CW//SWWozrvAGTrYGi/6V4s9TL/rIek0BHOPA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1001,14 +1002,14 @@ } }, "node_modules/@electron-forge/maker-flatpak": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.7.0.tgz", - "integrity": "sha512-WDNmGTulgPe4FEgxq128TI58EtVyS2Fq3loXhfirNuzoXpBtvt0LHK447cmtKHAvZZ+R802uriTcj28L+Iub3A==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.8.0.tgz", + "integrity": "sha512-tnOWQLVvNZVO9xWmhUHK4OsQgYUpEIn0DX1M8FkgQCYSDXcPg/CZaZ66zqj/gu1KzGAOWg1m5KlTbITRY5Jmcg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1047,14 +1048,14 @@ } }, "node_modules/@electron-forge/maker-rpm": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.7.0.tgz", - "integrity": "sha512-M9cFO6bCnOuA6BwBUUw35FrnWciWeFyLuByO0KOn3zEYeBDqG2fbBgXXS6OKcRHrpnJVTwiLY5S7eviyO1DJzQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.8.0.tgz", + "integrity": "sha512-oTH951NE39LOX2wYMg+C06vBZDWUP/0dsK01PlXEl5e5YfQM5Cifsk3E7BzE6BpZdWRJL3k/ETqpyYeIGNb1jw==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0" + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0" }, "engines": { "node": ">= 16.4.0" @@ -1064,14 +1065,14 @@ } }, "node_modules/@electron-forge/maker-squirrel": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.7.0.tgz", - "integrity": "sha512-9Gcq8e6+1MuXGeE7bEpk7VTd86c0riXTsDFKW8OqwVozeBYhoCd6GU59RmI3b7mcAIKOY1cBY97B+/5bnZ8ZYg==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.8.0.tgz", + "integrity": "sha512-On8WIyjNtNlWf8NJRRVToighGCCU+wcxytFM0F8Zx/pLszgc01bt7wIarOiAIzuIT9Z8vshAYA0iG1U099jfeA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1110,14 +1111,14 @@ } }, "node_modules/@electron-forge/maker-zip": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.7.0.tgz", - "integrity": "sha512-/rRFiPcojk0hcn+NOfHv2SlMNvghBk1RN0nuLHbbe8r+C0vG4LJV9ee/Y0HhVKkcpapJOQ+MasXJ86fzAp5uAg==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.8.0.tgz", + "integrity": "sha512-7MLD7GkZdlGecC9GvgBu0sWYt48p3smYvr+YCwlpdH1CTeLmWhvCqeH33a2AB0XI5CY8U8jnkG2jgdTkzr/EQw==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/maker-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "cross-zip": "^4.0.0", "fs-extra": "^10.0.0", "got": "^11.8.5" @@ -1155,53 +1156,53 @@ } }, "node_modules/@electron-forge/plugin-auto-unpack-natives": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.7.0.tgz", - "integrity": "sha512-cYeD4x2oQXUyK4+DtIR6wMxcIHvyPgsJq1diEuBoQ+MFTh+s6DXZl6JvwtI3scD0XieCkzcmUmf8ygzqs124+w==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.8.0.tgz", + "integrity": "sha512-JGal5ltZmbTQ5rNq67OgGC4MJ2zjjFW0fqykHy8X9J8cgaH7SRdKkT4yYZ8jH01IAF1J57FD2zIob1MvcBqjcg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/plugin-base": "7.7.0", - "@electron-forge/shared-types": "7.7.0" + "@electron-forge/plugin-base": "7.8.0", + "@electron-forge/shared-types": "7.8.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/plugin-base": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz", - "integrity": "sha512-6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.8.0.tgz", + "integrity": "sha512-rDeeChRWIp5rQVo3Uc1q0ncUvA+kWWURW7tMuQjPvy2qVSgX+jIf5krk+T1Dp06+D4YZzEIrkibRaamAaIcR1w==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0" + "@electron-forge/shared-types": "7.8.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/publisher-base": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz", - "integrity": "sha512-jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.8.0.tgz", + "integrity": "sha512-wrZyptJ0Uqvlh2wYzDZfIu2HgCQ+kdGiBlcucmLY4W+GUqf043O8cbYso3D9NXQxOow55QC/1saCQkgLphprPA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0" + "@electron-forge/shared-types": "7.8.0" }, "engines": { "node": ">= 16.4.0" } }, "node_modules/@electron-forge/shared-types": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz", - "integrity": "sha512-1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.8.0.tgz", + "integrity": "sha512-Ul+7HPvAZiAirqpZm0vc9YvlkAE+2bcrI10p3t50mEtuxn5VO/mB72NXiEKfWzHm8F31JySIe9bUV6s1MHQcCw==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/tracer": "7.7.0", + "@electron-forge/tracer": "7.8.0", "@electron/packager": "^18.3.5", "@electron/rebuild": "^3.7.0", "listr2": "^7.0.2" @@ -1211,14 +1212,14 @@ } }, "node_modules/@electron-forge/template-base": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz", - "integrity": "sha512-jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.8.0.tgz", + "integrity": "sha512-hc8NwoDqEEmZFH/p0p3MK/7xygMmI+cm8Gavoj2Mr2xS7VUUu4r3b5PwIGKvkLfPG34uwsiVwtid2t1rWGF4UA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/core-utils": "7.7.0", - "@electron-forge/shared-types": "7.7.0", + "@electron-forge/core-utils": "7.8.0", + "@electron-forge/shared-types": "7.8.0", "@malept/cross-spawn-promise": "^2.0.0", "debug": "^4.3.1", "fs-extra": "^10.0.0", @@ -1257,14 +1258,14 @@ } }, "node_modules/@electron-forge/template-vite": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz", - "integrity": "sha512-6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.8.0.tgz", + "integrity": "sha512-bf/jd8WzD0gU7Jet+WSi0Lm0SQmseb08WY27ZfJYEs2EVNMiwDfPicgQnOaqP++2yTrXhj1OY/rolZCP9CUyVw==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", - "@electron-forge/template-base": "7.7.0", + "@electron-forge/shared-types": "7.8.0", + "@electron-forge/template-base": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1272,14 +1273,14 @@ } }, "node_modules/@electron-forge/template-vite-typescript": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz", - "integrity": "sha512-32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.8.0.tgz", + "integrity": "sha512-kW3CaVxKHUYuVfY+rT3iepeZ69frBRGh3YZOngLY2buCvGIqNEx+VCgrFBRDDbOKGmwQtwO1E9wp2rtC8q6Ztg==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", - "@electron-forge/template-base": "7.7.0", + "@electron-forge/shared-types": "7.8.0", + "@electron-forge/template-base": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1343,14 +1344,14 @@ } }, "node_modules/@electron-forge/template-webpack": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz", - "integrity": "sha512-7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.8.0.tgz", + "integrity": "sha512-AdLGC6NVgrd7Q0SaaeiwJKmSBjN6C2EHxZgLMy1yxNSpazU9m3DtYQilDjXqmCWfxkeNzdke0NaeDvLgdJSw5A==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", - "@electron-forge/template-base": "7.7.0", + "@electron-forge/shared-types": "7.8.0", + "@electron-forge/template-base": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1358,14 +1359,14 @@ } }, "node_modules/@electron-forge/template-webpack-typescript": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz", - "integrity": "sha512-w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.8.0.tgz", + "integrity": "sha512-Pl8l+gv3HzqCfFIMLxlEsoAkNd0VEWeZZ675SYyqs0/kBQUifn0bKNhVE4gUZwKGgQCcG1Gvb23KdVGD3H3XmA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/shared-types": "7.7.0", - "@electron-forge/template-base": "7.7.0", + "@electron-forge/shared-types": "7.8.0", + "@electron-forge/template-base": "7.8.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1429,9 +1430,9 @@ } }, "node_modules/@electron-forge/tracer": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz", - "integrity": "sha512-R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.8.0.tgz", + "integrity": "sha512-t4fIATZEX6/7PJNfyh6tLzKEsNMpO01Nz/rgHWBxeRvjCw5UNul9OOxoM7b43vfFAO9Jv++34oI3VJ09LeVQ2Q==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index bff6ddb3f..b7d521cfc 100644 --- a/package.json +++ b/package.json @@ -153,14 +153,14 @@ "yauzl": "3.2.0" }, "devDependencies": { - "@electron-forge/cli": "7.7.0", - "@electron-forge/maker-deb": "7.7.0", - "@electron-forge/maker-dmg": "7.7.0", - "@electron-forge/maker-flatpak": "7.7.0", - "@electron-forge/maker-rpm": "7.7.0", - "@electron-forge/maker-squirrel": "7.7.0", - "@electron-forge/maker-zip": "7.7.0", - "@electron-forge/plugin-auto-unpack-natives": "7.7.0", + "@electron-forge/cli": "7.8.0", + "@electron-forge/maker-deb": "7.8.0", + "@electron-forge/maker-dmg": "7.8.0", + "@electron-forge/maker-flatpak": "7.8.0", + "@electron-forge/maker-rpm": "7.8.0", + "@electron-forge/maker-squirrel": "7.8.0", + "@electron-forge/maker-zip": "7.8.0", + "@electron-forge/plugin-auto-unpack-natives": "7.8.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.23.0", "@excalidraw/excalidraw": "0.18.0", From 93dc16de45ec155cb5b40236adcf0558ba90a8ea Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 17:06:59 +0300 Subject: [PATCH 5/7] chore(package): update lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b262b0e4..6aedfa5d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.92.4", + "version": "0.92.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.92.4", + "version": "0.92.5", "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "7.1.1", From 7b2bbdd52a4035c61091bfa9deeda8944dedea4c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 17:21:35 +0300 Subject: [PATCH 6/7] fix(release): unable to find appdmg --- package-lock.json | 333 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 3 + 2 files changed, 321 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6aedfa5d0..8cb7fde82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -200,6 +200,9 @@ "webpack": "5.98.0", "webpack-cli": "6.0.1", "webpack-dev-middleware": "7.4.2" + }, + "optionalDependencies": { + "appdmg": "0.6.6" } }, "node_modules/@ampproject/remapping": { @@ -6445,6 +6448,42 @@ "node": ">= 8" } }, + "node_modules/appdmg": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/appdmg/-/appdmg-0.6.6.tgz", + "integrity": "sha512-GRmFKlCG+PWbcYF4LUNonTYmy0GjguDy6Jh9WP8mpd0T6j80XIJyXBiWlD0U+MLNhqV9Nhx49Gl9GpVToulpLg==", + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "async": "^1.4.2", + "ds-store": "^0.1.5", + "execa": "^1.0.0", + "fs-temp": "^1.0.0", + "fs-xattr": "^0.3.0", + "image-size": "^0.7.4", + "is-my-json-valid": "^2.20.0", + "minimist": "^1.1.3", + "parse-color": "^1.0.0", + "path-exists": "^4.0.0", + "repeat-string": "^1.5.4" + }, + "bin": { + "appdmg": "bin/appdmg.js" + }, + "engines": { + "node": ">=8.5" + } + }, + "node_modules/appdmg/node_modules/async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", + "license": "MIT", + "optional": true + }, "node_modules/append-field": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", @@ -6774,6 +6813,16 @@ "license": "Apache-2.0", "optional": true }, + "node_modules/base32-encode": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/base32-encode/-/base32-encode-1.2.0.tgz", + "integrity": "sha512-cHFU8XeRyx0GgmoWi5qHMCVRiqU6J3MHWxVgun7jggCBUpVzm1Ir7M9dYr2whjSNc3tFeXfQ/oZjQu/4u55h9A==", + "license": "MIT", + "optional": true, + "dependencies": { + "to-data-view": "^1.1.0" + } + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -7050,6 +7099,16 @@ "object-assign": "^4.1.1" } }, + "node_modules/bplist-creator": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz", + "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==", + "license": "MIT", + "optional": true, + "dependencies": { + "stream-buffers": "~2.2.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -9489,6 +9548,18 @@ "unidragger": "^3.0.0" } }, + "node_modules/ds-store": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ds-store/-/ds-store-0.1.6.tgz", + "integrity": "sha512-kY21M6Lz+76OS3bnCzjdsJSF7LBpLYGCVfavW8TgQD2XkcqIZ86W0y9qUDZu6fp7SIZzqosMDW2zi7zVFfv4hw==", + "license": "MIT", + "optional": true, + "dependencies": { + "bplist-creator": "~0.0.3", + "macos-alias": "~0.2.5", + "tn1150": "^0.1.0" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -10305,6 +10376,13 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "license": "MIT" }, + "node_modules/encode-utf8": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz", + "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==", + "license": "MIT", + "optional": true + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -10820,7 +10898,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "cross-spawn": "^6.0.0", @@ -10839,7 +10917,7 @@ "version": "6.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "nice-try": "^1.0.4", @@ -10856,7 +10934,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -10866,7 +10944,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -10876,7 +10954,7 @@ "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, + "devOptional": true, "license": "ISC", "bin": { "semver": "bin/semver" @@ -10886,7 +10964,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "shebang-regex": "^1.0.0" @@ -10899,7 +10977,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -10909,7 +10987,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -11581,6 +11659,16 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/fmix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/fmix/-/fmix-0.1.0.tgz", + "integrity": "sha512-Y6hyofImk9JdzU8k5INtTXX1cu8LDlePWDFU5sftm9H+zKCr5SGrVjdhkvsim646cw5zD0nADj8oHyXMZmCZ9w==", + "license": "MIT", + "optional": true, + "dependencies": { + "imul": "^1.0.0" + } + }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -11792,6 +11880,30 @@ "node": ">= 8" } }, + "node_modules/fs-temp": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/fs-temp/-/fs-temp-1.2.1.tgz", + "integrity": "sha512-okTwLB7/Qsq82G6iN5zZJFsOfZtx2/pqrA7Hk/9fvy+c+eJS9CvgGXT2uNxwnI14BDY9L/jQPkaBgSvlKfSW9w==", + "license": "MIT", + "optional": true, + "dependencies": { + "random-path": "^0.1.0" + } + }, + "node_modules/fs-xattr": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/fs-xattr/-/fs-xattr-0.3.1.tgz", + "integrity": "sha512-UVqkrEW0GfDabw4C3HOrFlxKfx0eeigfRne69FxSBdHIP8Qt5Sq6Pu3RM9KmMlkygtC4pPKkj5CiPO5USnj2GA==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "!win32" + ], + "engines": { + "node": ">=8.6.0" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -11893,6 +12005,26 @@ "license": "MIT", "optional": true }, + "node_modules/generate-function": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", + "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "is-property": "^1.0.2" + } + }, + "node_modules/generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "is-property": "^1.0.0" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -11995,7 +12127,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "pump": "^3.0.0" @@ -12770,6 +12902,19 @@ "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==", "license": "MIT" }, + "node_modules/image-size": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.5.tgz", + "integrity": "sha512-Hiyv+mXHfFEP7LzUL/llg9RwFxxY+o9N3JVLIeG5E7iFIFAalxvRU9UZthBdYDEVnzHMgjnKJPPpay5BWf1g9g==", + "license": "MIT", + "optional": true, + "bin": { + "image-size": "bin/image-size.js" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/image-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/image-type/-/image-type-5.2.0.tgz", @@ -12835,6 +12980,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/imul": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz", + "integrity": "sha512-WFAgfwPLAjU66EKt6vRdTlKj4nAgIDQzh29JonLa4Bqtl6D8JrIMvWjCnx7xEjVNmP3U0fM5o8ZObk7d0f62bA==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -13067,6 +13222,27 @@ "dev": true, "license": "MIT" }, + "node_modules/is-my-ip-valid": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz", + "integrity": "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==", + "license": "MIT", + "optional": true + }, + "node_modules/is-my-json-valid": { + "version": "2.20.6", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz", + "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==", + "license": "MIT", + "optional": true, + "dependencies": { + "generate-function": "^2.0.0", + "generate-object-property": "^1.1.0", + "is-my-ip-valid": "^1.0.0", + "jsonpointer": "^5.0.0", + "xtend": "^4.0.0" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -13101,6 +13277,13 @@ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "license": "MIT" }, + "node_modules/is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", + "license": "MIT", + "optional": true + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -13643,6 +13826,16 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsonpointer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz", + "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/jsplumb": { "version": "2.15.6", "resolved": "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.6.tgz", @@ -14140,6 +14333,20 @@ "dev": true, "license": "MIT" }, + "node_modules/macos-alias": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/macos-alias/-/macos-alias-0.2.12.tgz", + "integrity": "sha512-yiLHa7cfJcGRFq4FrR4tMlpNHb4Vy4mWnpajlSSIFM5k4Lv8/7BbbDLzCAVogWNl0LlLhizRp1drXv0hK9h0Yw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "nan": "^2.4.0" + } + }, "node_modules/magic-string": { "version": "0.30.17", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", @@ -15275,6 +15482,25 @@ "object-assign": "^4.1.1" } }, + "node_modules/murmur-32": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/murmur-32/-/murmur-32-0.2.0.tgz", + "integrity": "sha512-ZkcWZudylwF+ir3Ld1n7gL6bI2mQAzXvSobPwVtu8aYi2sbXeipeSkdcanRLzIofLcM5F53lGaKm2dk7orBi7Q==", + "license": "MIT", + "optional": true, + "dependencies": { + "encode-utf8": "^1.0.3", + "fmix": "^0.1.0", + "imul": "^1.0.0" + } + }, + "node_modules/nan": { + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", + "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", + "license": "MIT", + "optional": true + }, "node_modules/nanoid": { "version": "3.3.8", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", @@ -15332,7 +15558,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/node-addon-api": { @@ -15602,7 +15828,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "path-key": "^2.0.0" @@ -15615,7 +15841,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -15903,7 +16129,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -16076,6 +16302,22 @@ "node": ">=4.0" } }, + "node_modules/parse-color": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz", + "integrity": "sha512-fuDHYgFHJGbpGMgw9skY/bj3HL/Jrn4l/5rSspy00DoT4RyLnDcRvPxdZ+r6OFwIsgAuhDh4I09tAId4mI12bw==", + "license": "MIT", + "optional": true, + "dependencies": { + "color-convert": "~0.5.0" + } + }, + "node_modules/parse-color/node_modules/color-convert": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", + "integrity": "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling==", + "optional": true + }, "node_modules/parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -16151,7 +16393,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -17003,6 +17245,17 @@ "node": ">= 0.8" } }, + "node_modules/random-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/random-path/-/random-path-0.1.2.tgz", + "integrity": "sha512-4jY0yoEaQ5v9StCl5kZbNIQlg1QheIDBrdkDn53EynpPb9FgO6//p3X/tgMnrC45XN6QZCzU1Xz/+pSSsJBpRw==", + "license": "MIT", + "optional": true, + "dependencies": { + "base32-encode": "^0.1.0 || ^1.0.0", + "murmur-32": "^0.1.0 || ^0.2.0" + } + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -17538,6 +17791,16 @@ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", "license": "MIT" }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -18790,6 +19053,16 @@ "dev": true, "license": "MIT" }, + "node_modules/stream-buffers": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", + "integrity": "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==", + "license": "Unlicense", + "optional": true, + "engines": { + "node": ">= 0.10.0" + } + }, "node_modules/stream-throttle": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", @@ -18964,7 +19237,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -19709,6 +19982,26 @@ "tmp": "^0.2.0" } }, + "node_modules/tn1150": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tn1150/-/tn1150-0.1.0.tgz", + "integrity": "sha512-DbplOfQFkqG5IHcDyyrs/lkvSr3mPUVsFf/RbDppOshs22yTPnSJWEe6FkYd1txAwU/zcnR905ar2fi4kwF29w==", + "license": "MIT", + "optional": true, + "dependencies": { + "unorm": "^1.4.1" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/to-data-view": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/to-data-view/-/to-data-view-1.1.0.tgz", + "integrity": "sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==", + "license": "MIT", + "optional": true + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -20249,6 +20542,16 @@ "node": ">= 10.0.0" } }, + "node_modules/unorm": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", + "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==", + "license": "MIT or GPL-2.0", + "optional": true, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index b7d521cfc..1bcdd48a5 100644 --- a/package.json +++ b/package.json @@ -256,5 +256,8 @@ "webpack": "5.98.0", "webpack-cli": "6.0.1", "webpack-dev-middleware": "7.4.2" + }, + "optionalDependencies": { + "appdmg": "0.6.6" } } From 2d3a1e90231fc8adbe163e774dfb9b23d4f6fac1 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Mar 2025 17:34:45 +0300 Subject: [PATCH 7/7] fix(build): flaky copy of the artifact --- forge.config.cjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge.config.cjs b/forge.config.cjs index e04419450..dff7ac806 100644 --- a/forge.config.cjs +++ b/forge.config.cjs @@ -156,7 +156,7 @@ module.exports = { hooks: { postMake(_, makeResults) { const outputDir = path.join(__dirname, "..", "upload"); - fs.mkdirp(outputDir); + fs.mkdirpSync(outputDir); for (const makeResult of makeResults) { for (const artifactPath of makeResult.artifacts) { // Ignore certain artifacts. @@ -174,7 +174,7 @@ module.exports = { const outputPath = path.join(outputDir, fileName); console.log(`[Artifact] ${artifactPath} -> ${outputPath}`); - fs.copyFile(artifactPath, outputPath); + fs.copyFileSync(artifactPath, outputPath); } } }