Актуализация ветки Dev #2

Merged
Royce59 merged 43 commits from main into dev 2026-02-18 17:08:04 +00:00
Showing only changes of commit c50f3f0097 - Show all commits

View File

@@ -17,7 +17,6 @@
"appId": "im.rosetta", "appId": "im.rosetta",
"icon": "icons/mac/icon.icns", "icon": "icons/mac/icon.icns",
"target": [ "target": [
"zip",
"pkg" "pkg"
], ],
"artifactName": "builds/darwin/${arch}/Rosetta-${version}.${ext}", "artifactName": "builds/darwin/${arch}/Rosetta-${version}.${ext}",
@@ -33,15 +32,13 @@
"linux": { "linux": {
"icon": "icons/png/256x256.png", "icon": "icons/png/256x256.png",
"target": [ "target": [
"AppImage", "AppImage"
"zip"
], ],
"artifactName": "builds/linux/${arch}/Rosetta-${version}.${ext}" "artifactName": "builds/linux/${arch}/Rosetta-${version}.${ext}"
}, },
"win": { "win": {
"icon": "icons/win/icon.ico", "icon": "icons/win/icon.ico",
"target": [ "target": [
"zip",
"nsis" "nsis"
], ],
"artifactName": "builds/win/${arch}/Rosetta-${version}.${ext}" "artifactName": "builds/win/${arch}/Rosetta-${version}.${ext}"
@@ -62,11 +59,11 @@
"start": "electron-vite preview", "start": "electron-vite preview",
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"build:unpack": "electron-vite build && electron-builder --dir", "build:unpack": "electron-vite build && electron-builder --dir",
"kernel:win": "electron-vite build && electron-builder --win --x64", "kernel:win": "mkdir -p dist/builds/win32/x64 && electron-vite build && electron-builder --win --x64",
"kernel:darwin-arm64": "electron-vite build && electron-builder --mac --arm64", "kernel:darwin-arm64": "electron-vite build && electron-builder --mac --arm64",
"kernel:darwin-x64": "electron-vite build && electron-builder --mac --x64", "kernel:darwin-x64": "electron-vite build && electron-builder --mac --x64",
"kernel:mac": "npm run kernel:darwin-x64 && npm run kernel:darwin-arm64", "kernel:mac": "mkdir -p dist/builds/darwin/arm64 dist/builds/darwin/x64 && npm run kernel:darwin-x64 && npm run kernel:darwin-arm64",
"kernel:linux": "mkdir -p dist/builds/linux/x86_64 dist/builds/linux/arm64 dist/builds/linux/x64 && electron-vite build && electron-builder --linux --x64 --arm64" "kernel:linux": "mkdir -p dist/builds/linux/x64 dist/builds/linux/arm64 dist/builds/linux/x86_64 && electron-vite build && electron-builder --linux --x64 --arm64 && if [ -d dist/builds/linux/x86_64 ]; then mkdir -p dist/builds/linux/x64 && mv dist/builds/linux/x86_64/* dist/builds/linux/x64/ 2>/dev/null || true; rmdir dist/builds/linux/x86_64 2>/dev/null || true; fi"
}, },
"dependencies": { "dependencies": {
"@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/preload": "^3.0.1",