From e812a865999c507308a73613ef02e156d7a0a12b Mon Sep 17 00:00:00 2001 From: Michael Hollister Date: Mon, 14 Oct 2024 17:53:15 -0500 Subject: [PATCH] Added more linux makers and started windows squirrel --- receivers/electron/.gitlab-ci.yml | 4 +- receivers/electron/assets/icons/icon512.png | Bin 0 -> 43658 bytes receivers/electron/forge.config.js | 110 ++++++--- receivers/electron/package-lock.json | 246 ++++++++++++++++++-- receivers/electron/package.json | 10 +- 5 files changed, 313 insertions(+), 57 deletions(-) create mode 100644 receivers/electron/assets/icons/icon512.png diff --git a/receivers/electron/.gitlab-ci.yml b/receivers/electron/.gitlab-ci.yml index 29ecc7f..d34889a 100644 --- a/receivers/electron/.gitlab-ci.yml +++ b/receivers/electron/.gitlab-ci.yml @@ -21,7 +21,9 @@ buildLinux: script: - npm install - npm run build - - npm run make -- --platform="darwin" --arch="arm64" + - npm run make -- --platform="win32" --arch="x64" + - npm run make -- --platform="linux" --arch="x64" + - npm run make -- --platform="linux" --arch="arm64" when: manual deploy: diff --git a/receivers/electron/assets/icons/icon512.png b/receivers/electron/assets/icons/icon512.png new file mode 100644 index 0000000000000000000000000000000000000000..84248ff2cb1b6acb642f791679af6908c3509c51 GIT binary patch literal 43658 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 K-+qtk75RVLC2tY{ literal 0 HcmV?d00001 diff --git a/receivers/electron/forge.config.js b/receivers/electron/forge.config.js index 2133622..9a67c7f 100644 --- a/receivers/electron/forge.config.js +++ b/receivers/electron/forge.config.js @@ -6,12 +6,13 @@ const { FusesPlugin } = require('@electron-forge/plugin-fuses'); const { FuseV1Options, FuseVersion } = require('@electron/fuses'); const argv = yargs(hideBin(process.argv)).argv; +// const APPLICATION_NAME = 'FCast Receiver'; +const APPLICATION_NAME = 'fcast-receiver'; module.exports = { packagerConfig: { asar: true, icon: './assets/icons/icon', - name: 'FCast Receiver', osxSign: {}, osxNotarize: { appleApiKey: process.env.FCAST_APPLE_API_KEY, @@ -21,10 +22,16 @@ module.exports = { }, rebuildConfig: {}, makers: [ - // { - // name: '@electron-forge/maker-squirrel', - // config: {}, - // }, + { + name: '@electron-forge/maker-deb', + config: { + options: { + categories: ['AudioVideo', 'Audio', 'Video', 'Network', 'Utility'], + homepage: 'https://fcast.org/', + icon: './assets/icons/icon.png', + } + }, + }, { name: '@electron-forge/maker-dmg', config: { @@ -42,58 +49,97 @@ module.exports = { }, background: './assets/images/background.png', contents: [ - { 'x': 90, 'y': 350, 'type': 'file', 'path': `out/FCast Receiver-darwin-${argv.arch}/FCast Receiver.app` }, + { 'x': 90, 'y': 350, 'type': 'file', 'path': `out/${APPLICATION_NAME}-darwin-${argv.arch}/${APPLICATION_NAME}.app` }, { 'x': 360, 'y': 350, 'type': 'link', 'path': '/Applications' }, { 'x': 0, 'y': 540, 'type': 'position', 'path': '.background' }, { 'x': 120, 'y': 540, 'type': 'position', 'path': '.VolumeIcon.icns' } ], format: 'ULFO', icon: './assets/icons/icon.icns', - name: 'FCast Receiver' + name: APPLICATION_NAME + } + }, + { + name: '@electron-forge/maker-rpm', + config: { + options: { + categories: ['AudioVideo', 'Audio', 'Video', 'Network', 'Utility'], + homepage: 'https://fcast.org/', + icon: './assets/icons/icon.png', + license: 'GPL-3.0+', + } + }, + }, + { + name: '@electron-forge/maker-squirrel', + config: { + loadingGif: './assets/images/installing.gif' } }, { name: '@electron-forge/maker-zip', - platforms: ['win32', 'darwin', 'linux'], config: {} }, - // { - - // name: '@electron-forge/maker-deb', - // config: {}, - // }, - // { - // name: '@electron-forge/maker-rpm', - // config: {}, - // }, ], hooks: { postMake: async (forgeConfig, makeResults) => { makeResults.forEach(e => { // Standardize artifact output naming switch (e.platform) { - case "win32": - break; - case "darwin": { - let artifactName = 'FCast Receiver.dmg'; - if (fs.existsSync(`./out/make/${artifactName}`)) { - fs.renameSync(`./out/make/${artifactName}`, `./out/make/FCast-Receiver-${e.packageJSON.version}-macOS-${e.arch}.dmg`); + case "win32": { + let artifactName = `${APPLICATION_NAME}-win32-${e.arch}-${e.packageJSON.version}.zip`; + if (fs.existsSync(`./out/make/zip/win32/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/zip/win32/${e.arch}/${artifactName}`, `./out/make/zip/win32/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-windows-${e.arch}.zip`); } - artifactName = 'FCast Receiver-darwin-arm64-1.0.14.zip'; - if (fs.existsSync(`./out/make/zip/darwin/arm64/${artifactName}`)) { - fs.renameSync(`./out/make/zip/darwin/arm64/${artifactName}`, `./out/make/zip/darwin/arm64/FCast-Receiver-${e.packageJSON.version}-macOS-${e.arch}.zip`); - } - - artifactName = 'FCast Receiver-darwin-x64-1.0.14.zip'; - if (fs.existsSync(`./out/make/zip/darwin/x64/${artifactName}`)) { - fs.renameSync(`./out/make/zip/darwin/x64/${artifactName}`, `./out/make/zip/darwin/x64/FCast-Receiver-${e.packageJSON.version}-macOS-${e.arch}.zip`); + artifactName = `${APPLICATION_NAME}-${e.packageJSON.version} Setup.exe`; + if (fs.existsSync(`./out/make/zip/squirrel.windows/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/zip/squirrel.windows/${e.arch}/${artifactName}`, `./out/make/zip/squirrel.windows/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-windows-${e.arch}-setup.exe`); } break; } - case "linux": + case "darwin": { + let artifactName = `${APPLICATION_NAME}.dmg`; + if (fs.existsSync(`./out/make/${artifactName}`)) { + fs.renameSync(`./out/make/${artifactName}`, `./out/make/FCast-Receiver-${e.packageJSON.version}-macOS-${e.arch}.dmg`); + } + + artifactName = `${APPLICATION_NAME}-darwin-${e.arch}-${e.packageJSON.version}.zip`; + if (fs.existsSync(`./out/make/zip/darwin/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/zip/darwin/${e.arch}/${artifactName}`, `./out/make/zip/darwin/${e.arch}/FCast-Receiver-${e.packageJSON.version}-macOS-${e.arch}.zip`); + } + break; + } + case "linux": { + let artifactName = `${APPLICATION_NAME}-linux-${e.arch}-${e.packageJSON.version}.zip`; + if (fs.existsSync(`./out/make/zip/linux/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/zip/linux/${e.arch}/${artifactName}`, `./out/make/zip/linux/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-linux-${e.arch}.zip`); + } + + artifactName = `${APPLICATION_NAME}_${e.packageJSON.version}_amd64.deb` + if (fs.existsSync(`./out/make/deb/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/deb/${e.arch}/${artifactName}`, `./out/make/deb/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-linux-${e.arch}.deb`); + } + + artifactName = `${APPLICATION_NAME}_${e.packageJSON.version}_arm64.deb` + if (fs.existsSync(`./out/make/deb/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/deb/${e.arch}/${artifactName}`, `./out/make/deb/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-linux-${e.arch}.deb`); + } + + artifactName = `${APPLICATION_NAME}-${e.packageJSON.version}-1.x86_64.rpm` + if (fs.existsSync(`./out/make/rpm/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/rpm/${e.arch}/${artifactName}`, `./out/make/rpm/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-linux-${e.arch}.rpm`); + } + + artifactName = `${APPLICATION_NAME}-${e.packageJSON.version}-1.arm64.rpm` + if (fs.existsSync(`./out/make/rpm/${e.arch}/${artifactName}`)) { + fs.renameSync(`./out/make/rpm/${e.arch}/${artifactName}`, `./out/make/rpm/${e.arch}/${APPLICATION_NAME}-${e.packageJSON.version}-linux-${e.arch}.rpm`); + } + + break; + } default: break; } diff --git a/receivers/electron/package-lock.json b/receivers/electron/package-lock.json index 9eb0064..1c8a3b0 100644 --- a/receivers/electron/package-lock.json +++ b/receivers/electron/package-lock.json @@ -22,10 +22,10 @@ }, "devDependencies": { "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", + "@electron-forge/maker-deb": "^7.5.0", "@electron-forge/maker-dmg": "^7.5.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", + "@electron-forge/maker-rpm": "^7.5.0", + "@electron-forge/maker-squirrel": "^7.5.0", "@electron-forge/maker-zip": "^7.4.0", "@electron-forge/plugin-auto-unpack-natives": "^7.4.0", "@electron-forge/plugin-fuses": "^7.4.0", @@ -1274,14 +1274,14 @@ } }, "node_modules/@electron-forge/maker-deb": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.4.0.tgz", - "integrity": "sha512-npWea3IpGeu96xNqJpsCOYX6V4E+HY6u/okeTUzUOMX96UteT14MecdUefMam158glRTX84k2ryh7WcBoOa4mg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.5.0.tgz", + "integrity": "sha512-rMXYJzu2LuyDQ5TX4VzQ2OSWDFC7Y1nJpBoyJvXfkA5fF5NNScOFYPv1YzEYAXMcG5hCOVLorsG9HDTEC8uh9g==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.4.0", - "@electron-forge/shared-types": "7.4.0" + "@electron-forge/maker-base": "7.5.0", + "@electron-forge/shared-types": "7.5.0" }, "engines": { "node": ">= 16.4.0" @@ -1290,6 +1290,88 @@ "electron-installer-debian": "^3.2.0" } }, + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/maker-base": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.5.0.tgz", + "integrity": "sha512-+jluKW2UPxaI1+qQQ8fqaUVVbZohRjOSF0Iti7STRFbgJKJitzPB24Cjji9qJCKIx5klMeEiwp0YPAE/d9Xt8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/shared-types": "7.5.0", + "fs-extra": "^10.0.0", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/shared-types": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.5.0.tgz", + "integrity": "sha512-VXuLVGYa3ZulBlmjA40ZEpk+iPH5ebN0v7t27wDt3rm23bph2aQrL7uSTLXhobenXYBVKggXnQt6rJ9A7FCDNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/tracer": "7.5.0", + "@electron/packager": "^18.3.5", + "@electron/rebuild": "^3.2.10", + "listr2": "^7.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/tracer": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.5.0.tgz", + "integrity": "sha512-1dE0wKCmv/K3BXCH70o2jp/y2kXgZQm73gIvzyadySXYwu2L4BWxhAO+Q+JsnbUk+nclHEup5ph4D0JoPIWLcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chrome-trace-event": "^1.0.3" + }, + "engines": { + "node": ">= 14.17.5" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/maker-dmg": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.5.0.tgz", @@ -1391,14 +1473,14 @@ } }, "node_modules/@electron-forge/maker-rpm": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.4.0.tgz", - "integrity": "sha512-N64Yh/K/91GzIk28T1jKsCGgYaquDuhXcEJW+TkVyP5tPZ9aTz9SjXLBxAg8WhcroArAZEsVyPOFKthmFzAUuA==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.5.0.tgz", + "integrity": "sha512-NzrtEqa61D++GoaURpicj9oxwOA/z0wcZaeipsrzUEBXE53UAo47tdIZjh396MhC0z9Mr6bxgDwpPUZF9QgfDA==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.4.0", - "@electron-forge/shared-types": "7.4.0" + "@electron-forge/maker-base": "7.5.0", + "@electron-forge/shared-types": "7.5.0" }, "engines": { "node": ">= 16.4.0" @@ -1407,15 +1489,97 @@ "electron-installer-redhat": "^3.2.0" } }, - "node_modules/@electron-forge/maker-squirrel": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.4.0.tgz", - "integrity": "sha512-mCQyufnSNfjffiKho59ZqVg4W601zGOl6h01OyfDwjOU/G4iQtpnnDEOXGe26q7OVT5ORb1WDnfyGgBeJ6Ge7g==", + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/maker-base": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.5.0.tgz", + "integrity": "sha512-+jluKW2UPxaI1+qQQ8fqaUVVbZohRjOSF0Iti7STRFbgJKJitzPB24Cjji9qJCKIx5klMeEiwp0YPAE/d9Xt8g==", "dev": true, "license": "MIT", "dependencies": { - "@electron-forge/maker-base": "7.4.0", - "@electron-forge/shared-types": "7.4.0", + "@electron-forge/shared-types": "7.5.0", + "fs-extra": "^10.0.0", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/shared-types": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.5.0.tgz", + "integrity": "sha512-VXuLVGYa3ZulBlmjA40ZEpk+iPH5ebN0v7t27wDt3rm23bph2aQrL7uSTLXhobenXYBVKggXnQt6rJ9A7FCDNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/tracer": "7.5.0", + "@electron/packager": "^18.3.5", + "@electron/rebuild": "^3.2.10", + "listr2": "^7.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/tracer": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.5.0.tgz", + "integrity": "sha512-1dE0wKCmv/K3BXCH70o2jp/y2kXgZQm73gIvzyadySXYwu2L4BWxhAO+Q+JsnbUk+nclHEup5ph4D0JoPIWLcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chrome-trace-event": "^1.0.3" + }, + "engines": { + "node": ">= 14.17.5" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-squirrel": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.5.0.tgz", + "integrity": "sha512-fz3vbp1BnbQWeZVVM3lKOGhrCVKLjAXKDTntBL2+8Rz02a63eozGjOtC5KZYXax6nM4TF6LvwjagY/qTs5jFag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/maker-base": "7.5.0", + "@electron-forge/shared-types": "7.5.0", "fs-extra": "^10.0.0" }, "engines": { @@ -1425,6 +1589,50 @@ "electron-winstaller": "^5.3.0" } }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/maker-base": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.5.0.tgz", + "integrity": "sha512-+jluKW2UPxaI1+qQQ8fqaUVVbZohRjOSF0Iti7STRFbgJKJitzPB24Cjji9qJCKIx5klMeEiwp0YPAE/d9Xt8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/shared-types": "7.5.0", + "fs-extra": "^10.0.0", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/shared-types": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.5.0.tgz", + "integrity": "sha512-VXuLVGYa3ZulBlmjA40ZEpk+iPH5ebN0v7t27wDt3rm23bph2aQrL7uSTLXhobenXYBVKggXnQt6rJ9A7FCDNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@electron-forge/tracer": "7.5.0", + "@electron/packager": "^18.3.5", + "@electron/rebuild": "^3.2.10", + "listr2": "^7.0.2" + }, + "engines": { + "node": ">= 16.4.0" + } + }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/tracer": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.5.0.tgz", + "integrity": "sha512-1dE0wKCmv/K3BXCH70o2jp/y2kXgZQm73gIvzyadySXYwu2L4BWxhAO+Q+JsnbUk+nclHEup5ph4D0JoPIWLcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chrome-trace-event": "^1.0.3" + }, + "engines": { + "node": ">= 14.17.5" + } + }, "node_modules/@electron-forge/maker-squirrel/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", diff --git a/receivers/electron/package.json b/receivers/electron/package.json index 8843f29..11a5721 100644 --- a/receivers/electron/package.json +++ b/receivers/electron/package.json @@ -3,10 +3,10 @@ "version": "1.0.14", "description": "An application implementing a FCast receiver.", "main": "dist/bundle.js", - "author": "Koen Jeukendrup", + "author": "FUTO", "license": "MIT", "scripts": { - "build": "rm -rf dist/ && webpack --config ./webpack.config.js && cp -r src/player dist/player && cp -r src/main dist/main && cp assets/icons/icon.ico dist/ && cp assets/icons/icon.png dist/", + "build": "rm -rf dist/ && webpack --config ./webpack.config.js && cp -r src/player dist/player && cp -r src/main dist/main && cp assets/icons/icon.ico dist/ && cp assets/icons/icon.png dist/ && cp assets/icons/icon512.png dist/", "start": "electron-forge start", "test": "jest", "package": "electron-forge package", @@ -14,10 +14,10 @@ }, "devDependencies": { "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", + "@electron-forge/maker-deb": "^7.5.0", "@electron-forge/maker-dmg": "^7.5.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", + "@electron-forge/maker-rpm": "^7.5.0", + "@electron-forge/maker-squirrel": "^7.5.0", "@electron-forge/maker-zip": "^7.4.0", "@electron-forge/plugin-auto-unpack-natives": "^7.4.0", "@electron-forge/plugin-fuses": "^7.4.0",