Compare commits

..

3 Commits

Author SHA1 Message Date
Gilles De Mey
86baea3b0e fix app not being interactive on MacOS 2024-03-29 16:58:43 +01:00
Herwig Hochleitner
0c3e55d1f0 update: electron 27 + related latest 2023-10-28 02:10:19 +02:00
Herwig Hochleitner
5751a9bcb7 fix startup errors on electron 26 2023-10-28 01:00:39 +02:00
6 changed files with 1916 additions and 1932 deletions

View File

@@ -10,10 +10,10 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
node: node:
- '20' - '16'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: actions/setup-node@v4 - uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
- run: npm install - run: npm install

View File

@@ -5,10 +5,10 @@ jobs:
package_linux: package_linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: actions/setup-node@v4 - uses: actions/setup-node@v3
with: with:
node-version: '20' node-version: '16'
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
path: ~/.npm path: ~/.npm
@@ -17,7 +17,7 @@ jobs:
${{ runner.os }}-node- ${{ runner.os }}-node-
- run: npm install - run: npm install
- run: npm run package -- linux - run: npm run package -- linux
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v3
with: with:
name: linux name: linux
path: | path: |
@@ -27,11 +27,11 @@ jobs:
package_macos: package_macos:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: actions/setup-node@v4 - uses: actions/setup-node@v3
with: with:
node-version: '20' node-version: '16'
- uses: actions/cache@v4 - uses: actions/cache@v3
with: with:
path: ~/.npm path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -39,7 +39,7 @@ jobs:
${{ runner.os }}-node- ${{ runner.os }}-node-
- run: npm install - run: npm install
- run: npm run package -- darwin - run: npm run package -- darwin
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v3
with: with:
name: macos name: macos
path: | path: |
@@ -48,11 +48,11 @@ jobs:
package_windows: package_windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: actions/setup-node@v4 - uses: actions/setup-node@v3
with: with:
node-version: '20' node-version: '16'
- uses: actions/cache@v4 - uses: actions/cache@v3
with: with:
path: ~/.npm path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -60,7 +60,7 @@ jobs:
${{ runner.os }}-node- ${{ runner.os }}-node-
- run: npm install - run: npm install
- run: npm run package -- win32 - run: npm run package -- win32
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v3
with: with:
name: windows name: windows
path: | path: |

View File

@@ -13,7 +13,7 @@
<p align="center"> <p align="center">
<a href="https://discord.gg/cnXkm4Z"><img src="https://img.shields.io/discord/612575111718895616" alt="discord"></a> <a href="https://discord.gg/cnXkm4Z"><img src="https://img.shields.io/discord/612575111718895616" alt="discord"></a>
<a href="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml"><img src="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml/badge.svg" alt="GitHub CI action"></a> <a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a> <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a> <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
<a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a> <a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>

3782
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@
"url": "https://github.com/webtorrent/webtorrent-desktop/issues" "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "2.1.2", "@electron/remote": "2.0.11",
"airplayer": "github:webtorrent/airplayer#fix-security", "airplayer": "github:webtorrent/airplayer#fix-security",
"application-config": "2.0.0", "application-config": "2.0.0",
"arch": "2.2.0", "arch": "2.2.0",
@@ -40,7 +40,7 @@
"languagedetect": "2.0.0", "languagedetect": "2.0.0",
"location-history": "1.1.2", "location-history": "1.1.2",
"material-ui": "0.20.2", "material-ui": "0.20.2",
"music-metadata": "7.14.0", "music-metadata": "7.13.4",
"network-address": "1.1.2", "network-address": "1.1.2",
"parse-torrent": "9.1.5", "parse-torrent": "9.1.5",
"prettier-bytes": "1.0.4", "prettier-bytes": "1.0.4",
@@ -58,17 +58,17 @@
"winreg": "1.2.4" "winreg": "1.2.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "7.24.8", "@babel/cli": "7.22.15",
"@babel/core": "7.25.2", "@babel/core": "7.22.15",
"@babel/eslint-parser": "7.25.1", "@babel/eslint-parser": "7.22.15",
"@babel/plugin-transform-react-jsx": "7.25.2", "@babel/plugin-transform-react-jsx": "7.22.15",
"cross-zip": "4.0.0", "cross-zip": "4.0.0",
"depcheck": "1.4.7", "depcheck": "1.4.5",
"electron": "27.3.11", "electron": "27.0.2",
"electron-notarize": "1.2.2", "electron-notarize": "1.2.2",
"electron-osx-sign": "0.6.0", "electron-osx-sign": "0.6.0",
"electron-packager": "17.1.2", "electron-packager": "17.1.2",
"electron-winstaller": "5.3.1", "electron-winstaller": "5.1.2",
"gh-release": "7.0.2", "gh-release": "7.0.2",
"minimist": "1.2.8", "minimist": "1.2.8",
"nodemon": "2.0.22", "nodemon": "2.0.22",
@@ -78,11 +78,11 @@
"run-series": "1.1.9", "run-series": "1.1.9",
"spectron": "19.0.0", "spectron": "19.0.0",
"standard": "17.0.0", "standard": "17.0.0",
"tape": "5.8.1" "tape": "5.6.6"
}, },
"engines": { "engines": {
"node": "^16.0.0 || ^18.0.0", "node": "^16.0.0 || ^18.0.0",
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0 || ^10.0.0" "npm": "^7.10.0 || ^8.0.0 || ^9.0.0"
}, },
"homepage": "https://webtorrent.io", "homepage": "https://webtorrent.io",
"keywords": [ "keywords": [

View File

@@ -70,7 +70,7 @@ table {
} }
.app { .app {
-webkit-user-select: none; user-select: none;
height: 100%; height: 100%;
display: flex; display: flex;
flex-flow: column; flex-flow: column;