From ae1f2f80c97b7ed3ed8167c033eb77162fc37aae Mon Sep 17 00:00:00 2001 From: philippe_mertens Date: Mon, 26 Aug 2024 14:14:56 +0200 Subject: [PATCH] Cleaning --- .gitignore | 1 + README.md | 4 ++-- package-lock.json | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index b520ec1dc..f1578d59c 100755 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ filters .idea .vscode .editorconfig +.vs \ No newline at end of file diff --git a/README.md b/README.md index f5d56e8ab..65a0a3173 100644 --- a/README.md +++ b/README.md @@ -150,12 +150,12 @@ nvm use && rm -rf node_modules && npm run setup-widevine && npm run build && npm ### Build for Windows (On Windows) Attention: use ffmpeg-static 3.0.0 ``` -nvm use 18.16.1 ; rd .\node_modules -Recurse -Force ; npm run setup ; npm run build ; npm run cw +nvm use 20.14.0 ; rd .\node_modules -Recurse -Force ; npm run setup ; npm run build ; npm run cw ``` ### Build for Windows with Widevine support (On Windows) Attention: use ffmpeg-static 3.0.0 ``` -nvm use 18.16.1 ; rd .\node_modules -Recurse -Force ; npm run setup-widevine ; npm run build ; npm run cww +nvm use 20.14.0 ; rd .\node_modules -Recurse -Force ; npm run setup-widevine ; npm run build ; npm run cww ``` ### Helpers (linux/OSX only) diff --git a/package-lock.json b/package-lock.json index aa1550e2a..07ae29a2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "flowr-desktop", - "version": "1.3.7", + "version": "1.3.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "flowr-desktop", - "version": "1.3.7", + "version": "1.3.9", "dependencies": { "@cliqz/adblocker": "0.9.1", - "@electron/remote": "2.1.0", + "@electron/remote": "2.1.2", "@fortawesome/fontawesome-svg-core": "1.2.21", "@fortawesome/free-solid-svg-icons": "5.10.1", "@fortawesome/react-fontawesome": "0.1.4", @@ -70,7 +70,7 @@ "copy-webpack-plugin": "10.2.4", "cross-env": "5.2.0", "css-loader": "6.7.1", - "electron": "26.6.2", + "electron": "31.3.1", "electron-builder": "23.5.1", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", @@ -521,9 +521,9 @@ } }, "node_modules/@electron/remote": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.0.tgz", - "integrity": "sha512-38jzz2beoYTo0DNS+aoaGyLS/fHeNTAc1Aom6HlYsxKnvVWjcg4xriC7J2IUkYSEDHGKX/D7jUst+mH4dHR6QA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", "peerDependencies": { "electron": ">= 13.0.0" } @@ -4451,13 +4451,13 @@ } }, "node_modules/electron": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-26.6.2.tgz", - "integrity": "sha512-OWxzVtCJwN9en34bnLupw2dTRsDTBzQZyz0Wx0zjeJ2wgUVlpqavtVDpt50aaJpJR/5GcHH/apIa3uvGWz/ABQ==", + "version": "31.3.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.1.tgz", + "integrity": "sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -4911,9 +4911,9 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/electron/node_modules/@types/node": { - "version": "18.19.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.1.tgz", - "integrity": "sha512-mZJ9V11gG5Vp0Ox2oERpeFDl+JvCwK24PGy76vVY/UgBtjwJWc5rYBThFxmbnYOm9UPZNm6wEl/sxHt2SU7x9A==", + "version": "20.14.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.15.tgz", + "integrity": "sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw==", "dependencies": { "undici-types": "~5.26.4" }