Merge branch 'ThaUnknown:master' into master

.github/workflows/main.yml

@@ -16,7 +16,8 @@ jobs:
 
     steps:
       - name: Install Setuptools for Python
-        run: pip3 install setuptools
+        if: matrix.os == 'macos-latest'
+        run: pip3 install setuptools --break-system-packages
 
       - name: Check out Git repository
         uses: actions/checkout@v3
@@ -29,7 +30,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'pnpm'
 
       - name: Install dependencies

capacitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "private": true,
   "scripts": {
     "build:native": "cd public/nodejs/ && npm install && docker build -t android-build:latest . && docker run -v ${PWD}:/app/ -it android-build:latest /bin/bash /app/setup-deps.sh",
@@ -17,7 +17,7 @@
     "test:e2e": "cross-env NODE_ENV=production run-s build:web dev:android"
   },
   "devDependencies": {
-    "@capacitor/assets": "^3.0.1",
+    "@capacitor/assets": "github:thaunknown/capacitor-assets",
     "cordova-res": "^0.15.4",
     "nodejs-mobile-gyp": "^0.3.1",
     "npm-run-all": "^4.1.5",

capacitor/webpack.config.cjs

@@ -29,7 +29,8 @@ const capacitorConfig = {
     alias: {
       ...alias,
       wrtc: false,
-      'bittorrent-tracker/lib/client/http-tracker.js': resolve('../node_modules/bittorrent-tracker/lib/client/http-tracker.js')
+      'bittorrent-tracker/lib/client/http-tracker.js': resolve('../node_modules/bittorrent-tracker/lib/client/http-tracker.js'),
+      'webrtc-polyfill': resolve('../node_modules/webrtc-polyfill/browser.js')
     }
   },
   target: 'node',

electron/webpack.config.cjs

@@ -27,7 +27,8 @@ module.exports = [
         'node-fetch': false,
         ws: false,
         wrtc: false,
-        'bittorrent-tracker/lib/client/http-tracker.js': resolve('../node_modules/bittorrent-tracker/lib/client/http-tracker.js')
+        'bittorrent-tracker/lib/client/http-tracker.js': resolve('../node_modules/bittorrent-tracker/lib/client/http-tracker.js'),
+        'webrtc-polyfill': resolve('../node_modules/webrtc-polyfill/browser.js')
       }
     },
     plugins: [new HtmlWebpackPlugin({ filename: 'background.html' })],

package.json

@@ -27,10 +27,10 @@
     "html-webpack-plugin": "^5.6.0",
     "matroska-metadata": "^1.0.6",
     "mini-css-extract-plugin": "^2.8.1",
-    "webpack": "^5.90.3",
+    "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.2",
-    "webtorrent": "^2.2.1"
+    "webtorrent": "^2.3.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240222.0",