This commit is contained in:
an-lee
2024-03-01 15:44:40 +08:00
parent f52ecf7226
commit 824c25272a
5 changed files with 302 additions and 5 deletions

View File

@@ -78,3 +78,4 @@ jobs:
enjoy/out/make/**/*.rpm
enjoy/out/make/**/*.zip
enjoy/out/make/**/*.exe
enjoy/out/make/**/*.dmg

View File

@@ -26,11 +26,17 @@ const config = {
},
rebuildConfig: {},
makers: [
{
name: "@electron-forge/maker-dmg",
config: {
icon: "./assets/icon.png",
},
},
new MakerSquirrel({
name: "Enjoy",
setupIcon: "./assets/icon.ico",
}),
new MakerZIP(["darwin", "win32"]),
new MakerZIP(["win32"]),
new MakerDeb({
options: {
name: "enjoy",

View File

@@ -30,6 +30,7 @@
"devDependencies": {
"@electron-forge/cli": "^7.3.0",
"@electron-forge/maker-deb": "^7.3.0",
"@electron-forge/maker-dmg": "^7.3.0",
"@electron-forge/maker-rpm": "^7.3.0",
"@electron-forge/maker-squirrel": "^7.3.0",
"@electron-forge/maker-zip": "^7.3.0",

View File

@@ -79,8 +79,13 @@ export const AppSettingsProvider = ({
}, [user, apiUrl, language]);
const prepareFfmpeg = async () => {
const valid = await EnjoyApp.ffmpeg.check();
setFfmpegValid(valid);
try {
const valid = await EnjoyApp.ffmpeg.check();
setFfmpegValid(valid);
} catch (err) {
console.error(err);
toast.error(err.message);
}
loadFfmpegWASM();
};

288
yarn.lock
View File

@@ -449,6 +449,21 @@ __metadata:
languageName: node
linkType: hard
"@electron-forge/maker-dmg@npm:^7.3.0":
version: 7.3.0
resolution: "@electron-forge/maker-dmg@npm:7.3.0"
dependencies:
"@electron-forge/maker-base": "npm:7.3.0"
"@electron-forge/shared-types": "npm:7.3.0"
electron-installer-dmg: "npm:^4.0.0"
fs-extra: "npm:^10.0.0"
dependenciesMeta:
electron-installer-dmg:
optional: true
checksum: 10c0/10025842de677d1ae563d0eee17af85cff2aeb166780780e78274d54585e6098c452365a0b72e8fd08b363906f865e62dfaf9592b65ccf263de6627a76ab50c0
languageName: node
linkType: hard
"@electron-forge/maker-rpm@npm:^7.3.0":
version: 7.3.0
resolution: "@electron-forge/maker-rpm@npm:7.3.0"
@@ -4252,6 +4267,27 @@ __metadata:
languageName: node
linkType: hard
"appdmg@npm:^0.6.4":
version: 0.6.6
resolution: "appdmg@npm:0.6.6"
dependencies:
async: "npm:^1.4.2"
ds-store: "npm:^0.1.5"
execa: "npm:^1.0.0"
fs-temp: "npm:^1.0.0"
fs-xattr: "npm:^0.3.0"
image-size: "npm:^0.7.4"
is-my-json-valid: "npm:^2.20.0"
minimist: "npm:^1.1.3"
parse-color: "npm:^1.0.0"
path-exists: "npm:^4.0.0"
repeat-string: "npm:^1.5.4"
bin:
appdmg: bin/appdmg.js
conditions: os=darwin
languageName: node
linkType: hard
"aproba@npm:^1.0.3 || ^2.0.0":
version: 2.0.0
resolution: "aproba@npm:2.0.0"
@@ -4452,6 +4488,13 @@ __metadata:
languageName: node
linkType: hard
"async@npm:^1.4.2":
version: 1.5.2
resolution: "async@npm:1.5.2"
checksum: 10c0/9ee84592c393aad1047d1223004317ecc65a9a3f76101e0f4614a0818eac962e666510353400a3c9ea158df540579a293f486f3578e918c5e90a0f5ed52e8aea
languageName: node
linkType: hard
"asynckit@npm:^0.4.0":
version: 0.4.0
resolution: "asynckit@npm:0.4.0"
@@ -4539,6 +4582,15 @@ __metadata:
languageName: node
linkType: hard
"base32-encode@npm:^0.1.0 || ^1.0.0":
version: 1.2.0
resolution: "base32-encode@npm:1.2.0"
dependencies:
to-data-view: "npm:^1.1.0"
checksum: 10c0/ebc97b324b90ad64c019a338c2cb9291f7e260584b8222bd0861bf69e0509153263e40ee2546c744cc1849b353339dbd98a0cb08c5c37bab221a41010522a0e2
languageName: node
linkType: hard
"base64-js@npm:^1.3.1, base64-js@npm:^1.5.1":
version: 1.5.1
resolution: "base64-js@npm:1.5.1"
@@ -4653,6 +4705,15 @@ __metadata:
languageName: node
linkType: hard
"bplist-creator@npm:~0.0.3":
version: 0.0.8
resolution: "bplist-creator@npm:0.0.8"
dependencies:
stream-buffers: "npm:~2.2.0"
checksum: 10c0/21c865784db7f14ca26ff20b4aab85b87577549f7592271c22052de6df95cfab9cc7671f602106f4c9e6dc9c0de9710c907b8d4f7345427a710ae8616a578587
languageName: node
linkType: hard
"brace-expansion@npm:^1.1.7":
version: 1.1.11
resolution: "brace-expansion@npm:1.1.11"
@@ -5180,6 +5241,13 @@ __metadata:
languageName: node
linkType: hard
"color-convert@npm:~0.5.0":
version: 0.5.3
resolution: "color-convert@npm:0.5.3"
checksum: 10c0/324b863446bab6c5f88cb0010c3a16a6ca6bf6709eb7b7b3482d3e9ca6cfcfa690c25c1151bd2dc6279a0f4e2c593630486a2b9caae3c3eb96b82f5408e23e54
languageName: node
linkType: hard
"color-name@npm:1.1.3":
version: 1.1.3
resolution: "color-name@npm:1.1.3"
@@ -5825,6 +5893,17 @@ __metadata:
languageName: node
linkType: hard
"ds-store@npm:^0.1.5":
version: 0.1.6
resolution: "ds-store@npm:0.1.6"
dependencies:
bplist-creator: "npm:~0.0.3"
macos-alias: "npm:~0.2.5"
tn1150: "npm:^0.1.0"
checksum: 10c0/40293e925e27fa6df7f043320a2e277c5901368c49a7e420ecfc510dd843a6878b92875b126b841b53a70be7a6ab67338582b7f7ffd4ace3e581cf15aea0a1e2
languageName: node
linkType: hard
"duplexer@npm:~0.1.1":
version: 0.1.2
resolution: "duplexer@npm:0.1.2"
@@ -5901,6 +5980,22 @@ __metadata:
languageName: node
linkType: hard
"electron-installer-dmg@npm:^4.0.0":
version: 4.0.0
resolution: "electron-installer-dmg@npm:4.0.0"
dependencies:
appdmg: "npm:^0.6.4"
debug: "npm:^4.3.2"
minimist: "npm:^1.1.1"
dependenciesMeta:
appdmg:
optional: true
bin:
electron-installer-dmg: bin/electron-installer-dmg.js
checksum: 10c0/5e257a67c1fa08306f6b451b481c9559ed0e75c5169f341db84939f506eb8e87354c44da7af4a83b1851bea7edfe6698c1dbcc1c955e2aff44d87d70579ec1ca
languageName: node
linkType: hard
"electron-installer-redhat@npm:^3.2.0":
version: 3.4.0
resolution: "electron-installer-redhat@npm:3.4.0"
@@ -6013,6 +6108,13 @@ __metadata:
languageName: node
linkType: hard
"encode-utf8@npm:^1.0.3":
version: 1.0.3
resolution: "encode-utf8@npm:1.0.3"
checksum: 10c0/6b3458b73e868113d31099d7508514a5c627d8e16d1e0542d1b4e3652299b8f1f590c468e2b9dcdf1b4021ee961f31839d0be9d70a7f2a8a043c63b63c9b3a88
languageName: node
linkType: hard
"encodeurl@npm:~1.0.2":
version: 1.0.2
resolution: "encodeurl@npm:1.0.2"
@@ -6055,6 +6157,7 @@ __metadata:
"@andrkrn/ffprobe-static": "npm:^5.2.0"
"@electron-forge/cli": "npm:^7.3.0"
"@electron-forge/maker-deb": "npm:^7.3.0"
"@electron-forge/maker-dmg": "npm:^7.3.0"
"@electron-forge/maker-rpm": "npm:^7.3.0"
"@electron-forge/maker-squirrel": "npm:^7.3.0"
"@electron-forge/maker-zip": "npm:^7.3.0"
@@ -7008,6 +7111,15 @@ __metadata:
languageName: node
linkType: hard
"fmix@npm:^0.1.0":
version: 0.1.0
resolution: "fmix@npm:0.1.0"
dependencies:
imul: "npm:^1.0.0"
checksum: 10c0/af9e54eacc00b46e1c4a77229840e37252fff7634f81026591da9d24438ca15a1afa2786f579eb7865489ded21b76af7327d111b90b944e7409cd60f4d4f2ded
languageName: node
linkType: hard
"follow-redirects@npm:^1.15.4":
version: 1.15.5
resolution: "follow-redirects@npm:1.15.5"
@@ -7183,6 +7295,24 @@ __metadata:
languageName: node
linkType: hard
"fs-temp@npm:^1.0.0":
version: 1.2.1
resolution: "fs-temp@npm:1.2.1"
dependencies:
random-path: "npm:^0.1.0"
checksum: 10c0/d1487c2a6bb28d89c185d7f4c216c4bda61f6804dde4a92a364c5e0bff7e37cc3a3ddcaa3ee9ed3fa1ca3dfe7a5615e3294f25a8811211b8834fc3778aa92b89
languageName: node
linkType: hard
"fs-xattr@npm:^0.3.0":
version: 0.3.1
resolution: "fs-xattr@npm:0.3.1"
dependencies:
node-gyp: "npm:latest"
conditions: "!os=win32"
languageName: node
linkType: hard
"fs.realpath@npm:^1.0.0":
version: 1.0.0
resolution: "fs.realpath@npm:1.0.0"
@@ -7297,6 +7427,24 @@ __metadata:
languageName: node
linkType: hard
"generate-function@npm:^2.0.0":
version: 2.3.1
resolution: "generate-function@npm:2.3.1"
dependencies:
is-property: "npm:^1.0.2"
checksum: 10c0/4645cf1da90375e46a6f1dc51abc9933e5eafa4cd1a44c2f7e3909a30a4e9a1a08c14cd7d5b32da039da2dba2a085e1ed4597b580c196c3245b2d35d8bc0de5d
languageName: node
linkType: hard
"generate-object-property@npm:^1.1.0":
version: 1.2.0
resolution: "generate-object-property@npm:1.2.0"
dependencies:
is-property: "npm:^1.0.0"
checksum: 10c0/0b30acb43283a489b1adf4655f3f413b448dbec750678cf70bfde92b04a22f85b286be004b66fd713e3060e418d7beb562f05431235ec95c044b63e324759e8c
languageName: node
linkType: hard
"gensync@npm:^1.0.0-beta.2":
version: 1.0.0-beta.2
resolution: "gensync@npm:1.0.0-beta.2"
@@ -7943,6 +8091,15 @@ __metadata:
languageName: node
linkType: hard
"image-size@npm:^0.7.4":
version: 0.7.5
resolution: "image-size@npm:0.7.5"
bin:
image-size: bin/image-size.js
checksum: 10c0/74e978c525e7d777df145bc66cfc4a4a7aa56de8e5daead3a69b0872082dbe385deb4a3b80799810df9e34b2031467412ae28810f2f65ec2e5fe08b895aa3491
languageName: node
linkType: hard
"import-fresh@npm:^3.2.1":
version: 3.3.0
resolution: "import-fresh@npm:3.3.0"
@@ -7960,6 +8117,13 @@ __metadata:
languageName: node
linkType: hard
"imul@npm:^1.0.0":
version: 1.0.1
resolution: "imul@npm:1.0.1"
checksum: 10c0/d564c45a5017f01f965509ef409fad8175749bc96a52a95e1a09f05378d135fb37051cea7194d0eeca5147541d8e80d68853f5f681eef05f9f14f1d551edae2f
languageName: node
linkType: hard
"imurmurhash@npm:^0.1.4":
version: 0.1.4
resolution: "imurmurhash@npm:0.1.4"
@@ -8235,6 +8399,26 @@ __metadata:
languageName: node
linkType: hard
"is-my-ip-valid@npm:^1.0.0":
version: 1.0.1
resolution: "is-my-ip-valid@npm:1.0.1"
checksum: 10c0/61bc2dac50aa664b9fc9edb7aa7a68363a554dea2432e09766b6b860fcda5fc60aad6d47d273be635511346c4c4964dc1f3f96f8c8db02f1e380ad9992d67cca
languageName: node
linkType: hard
"is-my-json-valid@npm:^2.20.0":
version: 2.20.6
resolution: "is-my-json-valid@npm:2.20.6"
dependencies:
generate-function: "npm:^2.0.0"
generate-object-property: "npm:^1.1.0"
is-my-ip-valid: "npm:^1.0.0"
jsonpointer: "npm:^5.0.0"
xtend: "npm:^4.0.0"
checksum: 10c0/1f74c24db02b3ee9dc7042f828b4fb204566350d72b01ca1efa8a61e8c41fab8ef664dfeb1158c11de29a3ca87ac2645b9829e50116205919a1da91b7039d041
languageName: node
linkType: hard
"is-negative-zero@npm:^2.0.2":
version: 2.0.3
resolution: "is-negative-zero@npm:2.0.3"
@@ -8279,6 +8463,13 @@ __metadata:
languageName: node
linkType: hard
"is-property@npm:^1.0.0, is-property@npm:^1.0.2":
version: 1.0.2
resolution: "is-property@npm:1.0.2"
checksum: 10c0/33ab65a136e4ba3f74d4f7d9d2a013f1bd207082e11cedb160698e8d5394644e873c39668d112a402175ccbc58a087cef87198ed46829dbddb479115a0257283
languageName: node
linkType: hard
"is-regex@npm:^1.1.4":
version: 1.1.4
resolution: "is-regex@npm:1.1.4"
@@ -8558,7 +8749,7 @@ __metadata:
languageName: node
linkType: hard
"jsonpointer@npm:^5.0.1":
"jsonpointer@npm:^5.0.0, jsonpointer@npm:^5.0.1":
version: 5.0.1
resolution: "jsonpointer@npm:5.0.1"
checksum: 10c0/89929e58b400fcb96928c0504fcf4fc3f919d81e9543ceb055df125538470ee25290bb4984251e172e6ef8fcc55761eb998c118da763a82051ad89d4cb073fe7
@@ -9140,6 +9331,16 @@ __metadata:
languageName: node
linkType: hard
"macos-alias@npm:~0.2.5":
version: 0.2.11
resolution: "macos-alias@npm:0.2.11"
dependencies:
nan: "npm:^2.4.0"
node-gyp: "npm:latest"
conditions: os=darwin
languageName: node
linkType: hard
"make-error@npm:^1.1.1":
version: 1.3.6
resolution: "make-error@npm:1.3.6"
@@ -9771,7 +9972,7 @@ __metadata:
languageName: node
linkType: hard
"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
"minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
version: 1.2.8
resolution: "minimist@npm:1.2.8"
checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
@@ -10011,6 +10212,17 @@ __metadata:
languageName: node
linkType: hard
"murmur-32@npm:^0.1.0 || ^0.2.0":
version: 0.2.0
resolution: "murmur-32@npm:0.2.0"
dependencies:
encode-utf8: "npm:^1.0.3"
fmix: "npm:^0.1.0"
imul: "npm:^1.0.0"
checksum: 10c0/1f08bb39b1a2f12bd265a0591c8f9f822d6cb3c2099320bb0efa9945f4ede1d233e08e92d64c6db8f5763f1eebac1729cb4e9dda6dd94fa2c8cfd56a706825fe
languageName: node
linkType: hard
"mz@npm:^2.7.0":
version: 2.7.0
resolution: "mz@npm:2.7.0"
@@ -10022,6 +10234,15 @@ __metadata:
languageName: node
linkType: hard
"nan@npm:^2.4.0":
version: 2.18.0
resolution: "nan@npm:2.18.0"
dependencies:
node-gyp: "npm:latest"
checksum: 10c0/9209d80134fdb98c0afe35c1372d2b930a0a8d3c52706cb5e4257a27e9845c375f7a8daedadadec8d6403ca2eebb3b37d362ff5d1ec03249462abf65fef2a148
languageName: node
linkType: hard
"nanoid@npm:^3.3.7":
version: 3.3.7
resolution: "nanoid@npm:3.3.7"
@@ -10669,6 +10890,15 @@ __metadata:
languageName: node
linkType: hard
"parse-color@npm:^1.0.0":
version: 1.0.0
resolution: "parse-color@npm:1.0.0"
dependencies:
color-convert: "npm:~0.5.0"
checksum: 10c0/53b864bd91f9e3134e8d05b834c42c9ece76c6c3426fe979c36fc0452cfd9c8cbe8c7497cd7ddd8436a5878cd43af982a5eaf85908f69a6de0fe3daf122b65f7
languageName: node
linkType: hard
"parse-entities@npm:^4.0.0":
version: 4.0.1
resolution: "parse-entities@npm:4.0.1"
@@ -11206,6 +11436,16 @@ __metadata:
languageName: node
linkType: hard
"random-path@npm:^0.1.0":
version: 0.1.2
resolution: "random-path@npm:0.1.2"
dependencies:
base32-encode: "npm:^0.1.0 || ^1.0.0"
murmur-32: "npm:^0.1.0 || ^0.2.0"
checksum: 10c0/fc76b09553db9dd27980c770f2e72bc065044162cfae2d9f428fdd2f4f8cec238bf4e1193e62cf14988e8f756b3426b2c6a82b0203d9bd83e285bc1adf463a56
languageName: node
linkType: hard
"range-parser@npm:~1.2.1":
version: 1.2.1
resolution: "range-parser@npm:1.2.1"
@@ -11565,6 +11805,13 @@ __metadata:
languageName: node
linkType: hard
"repeat-string@npm:^1.5.4":
version: 1.6.1
resolution: "repeat-string@npm:1.6.1"
checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
languageName: node
linkType: hard
"require-directory@npm:^2.1.1":
version: 2.1.1
resolution: "require-directory@npm:2.1.1"
@@ -12380,6 +12627,13 @@ __metadata:
languageName: node
linkType: hard
"stream-buffers@npm:~2.2.0":
version: 2.2.0
resolution: "stream-buffers@npm:2.2.0"
checksum: 10c0/14a351f0a066eaa08c8c64a74f4aedd87dd7a8e59d4be224703da33dca3eb370828ee6c0ae3fff59a9c743e8098728fc95c5f052ae7741672a31e6b1430ba50a
languageName: node
linkType: hard
"stream-combiner@npm:~0.0.4":
version: 0.0.4
resolution: "stream-combiner@npm:0.0.4"
@@ -12771,6 +13025,22 @@ __metadata:
languageName: node
linkType: hard
"tn1150@npm:^0.1.0":
version: 0.1.0
resolution: "tn1150@npm:0.1.0"
dependencies:
unorm: "npm:^1.4.1"
checksum: 10c0/5a07b2e9ecddca3bab11f75450800c74b99fec182be77f20c65ce22ae716c434bdf69c472aabb566e04d9574588fc99597e2983804ae0336ddb71d5e8c5ea4f0
languageName: node
linkType: hard
"to-data-view@npm:^1.1.0":
version: 1.1.0
resolution: "to-data-view@npm:1.1.0"
checksum: 10c0/5dfff586ccb523c8de1c03567ef9a220dbf466f90c3265bf51247e3e69c3857b3fa1b31b77866c4a40ea6245dc4a5f9d5c077a29076c44cab31b97d768034baa
languageName: node
linkType: hard
"to-fast-properties@npm:^2.0.0":
version: 2.0.0
resolution: "to-fast-properties@npm:2.0.0"
@@ -13245,6 +13515,13 @@ __metadata:
languageName: node
linkType: hard
"unorm@npm:^1.4.1":
version: 1.6.0
resolution: "unorm@npm:1.6.0"
checksum: 10c0/ff0caa3292f318e2e832d02ad019a401118fe42f5e554dca3b9c7e4a2a3100eda051945711234a6ffbd74088cf51930755782456d30864240936cb3485f80a01
languageName: node
linkType: hard
"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
version: 1.0.0
resolution: "unpipe@npm:1.0.0"
@@ -13686,6 +13963,13 @@ __metadata:
languageName: node
linkType: hard
"xtend@npm:^4.0.0":
version: 4.0.2
resolution: "xtend@npm:4.0.2"
checksum: 10c0/366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
languageName: node
linkType: hard
"xterm-addon-fit@npm:^0.5.0":
version: 0.5.0
resolution: "xterm-addon-fit@npm:0.5.0"