From 31c371f82849ae688b4d8c112d8bc5afbab68c77 Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Wed, 29 May 2024 00:15:01 +0200 Subject: [PATCH] fix: build --- capacitor/webpack.config.cjs | 3 +- electron/webpack.config.cjs | 3 +- package.json | 4 +- pnpm-lock.yaml | 111 ++++++++++++++++++----------------- 4 files changed, 62 insertions(+), 59 deletions(-) diff --git a/capacitor/webpack.config.cjs b/capacitor/webpack.config.cjs index ae51c65c..1eb336b9 100644 --- a/capacitor/webpack.config.cjs +++ b/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', diff --git a/electron/webpack.config.cjs b/electron/webpack.config.cjs index ca7169d5..29182546 100644 --- a/electron/webpack.config.cjs +++ b/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' })], diff --git a/package.json b/package.json index ecc63cf7..16bb80a2 100644 --- a/package.json +++ b/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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 841d9eaa..bc603e03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,13 +16,13 @@ importers: version: 8.2.2 copy-webpack-plugin: specifier: ^12.0.2 - version: 12.0.2(webpack@5.90.3) + version: 12.0.2(webpack@5.91.0) cross-env: specifier: ^7.0.3 version: 7.0.3 css-loader: specifier: ^6.10.0 - version: 6.10.0(webpack@5.90.3) + version: 6.10.0(webpack@5.91.0) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -34,25 +34,25 @@ importers: version: 2.35.1(eslint@8.57.0) html-webpack-plugin: specifier: ^5.6.0 - version: 5.6.0(webpack@5.90.3) + version: 5.6.0(webpack@5.91.0) matroska-metadata: specifier: ^1.0.6 version: 1.0.6 mini-css-extract-plugin: specifier: ^2.8.1 - version: 2.8.1(webpack@5.90.3) + version: 2.8.1(webpack@5.91.0) webpack: - specifier: ^5.90.3 - version: 5.90.3(webpack-cli@5.1.4) + specifier: ^5.91.0 + version: 5.91.0(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.4 - version: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) + version: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) webpack-dev-server: specifier: ^5.0.2 - version: 5.0.2(webpack-cli@5.1.4)(webpack@5.90.3) + version: 5.0.2(webpack-cli@5.1.4)(webpack@5.91.0) webtorrent: - specifier: ^2.2.1 - version: 2.2.1 + specifier: ^2.3.2 + version: 2.3.2 devDependencies: '@cloudflare/workers-types': specifier: ^4.20240222.0 @@ -117,7 +117,7 @@ importers: version: 4.1.5 webpack-cli: specifier: ^5.1.4 - version: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) + version: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) webpack-merge: specifier: ^5.10.0 version: 5.10.0 @@ -1758,27 +1758,27 @@ packages: '@webassemblyjs/ast': 1.12.1 '@xtuc/long': 4.2.2 - /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.90.3): + /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.91.0): resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==} engines: {node: '>=14.15.0'} peerDependencies: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.90.3(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) + webpack: 5.91.0(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) - /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.90.3): + /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.91.0): resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==} engines: {node: '>=14.15.0'} peerDependencies: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.90.3(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) + webpack: 5.91.0(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) - /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.90.3): + /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.91.0): resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==} engines: {node: '>=14.15.0'} peerDependencies: @@ -1789,9 +1789,9 @@ packages: webpack-dev-server: optional: true dependencies: - webpack: 5.90.3(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) - webpack-dev-server: 5.0.2(webpack-cli@5.1.4)(webpack@5.90.3) + webpack: 5.91.0(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) + webpack-dev-server: 5.0.2(webpack-cli@5.1.4)(webpack@5.91.0) /@webtorrent/http-node@1.3.0: resolution: {integrity: sha512-GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ==} @@ -3182,7 +3182,7 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} - /copy-webpack-plugin@12.0.2(webpack@5.90.3): + /copy-webpack-plugin@12.0.2(webpack@5.91.0): resolution: {integrity: sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==} engines: {node: '>= 18.12.0'} peerDependencies: @@ -3194,7 +3194,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.2 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) dev: false /cordova-plugin-navigationbar@1.0.31: @@ -3325,7 +3325,7 @@ packages: engines: {node: '>=8'} dev: true - /css-loader@6.10.0(webpack@5.90.3): + /css-loader@6.10.0(webpack@5.91.0): resolution: {integrity: sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -3345,7 +3345,7 @@ packages: postcss-modules-values: 4.0.0(postcss@8.4.38) postcss-value-parser: 4.2.0 semver: 7.6.2 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) dev: false /css-select@4.3.0: @@ -5153,7 +5153,7 @@ packages: terser: 5.31.0 dev: false - /html-webpack-plugin@5.6.0(webpack@5.90.3): + /html-webpack-plugin@5.6.0(webpack@5.91.0): resolution: {integrity: sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==} engines: {node: '>=10.13.0'} peerDependencies: @@ -5170,7 +5170,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) dev: false /htmlparser2@6.1.0: @@ -5337,6 +5337,7 @@ packages: /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + requiresBuild: true /ignore-by-default@1.0.1: resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==} @@ -6218,7 +6219,7 @@ packages: engines: {node: '>=4'} dev: true - /mini-css-extract-plugin@2.8.1(webpack@5.90.3): + /mini-css-extract-plugin@2.8.1(webpack@5.91.0): resolution: {integrity: sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -6226,7 +6227,7 @@ packages: dependencies: schema-utils: 4.2.0 tapable: 2.2.1 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) dev: false /minimalistic-assert@1.0.1: @@ -8519,7 +8520,7 @@ packages: unique-string: 2.0.0 dev: true - /terser-webpack-plugin@5.3.10(webpack@5.90.3): + /terser-webpack-plugin@5.3.10(webpack@5.91.0): resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -8540,7 +8541,7 @@ packages: schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.31.0 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) /terser@5.31.0: resolution: {integrity: sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==} @@ -8955,7 +8956,6 @@ packages: requiresBuild: true dependencies: node-gyp-build: 4.8.1 - dev: false /utf-8-validate@6.0.4: resolution: {integrity: sha512-xu9GQDeFp+eZ6LnCywXN/zBancWvOpUMzgjLPSjy4BRHSmTelvn2E0DG0o1sTiw5hkCKBHo8rwSKncfRfv2EEQ==} @@ -8963,6 +8963,7 @@ packages: requiresBuild: true dependencies: node-gyp-build: 4.8.1 + dev: false /utf8-byte-length@1.0.5: resolution: {integrity: sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==} @@ -9121,7 +9122,7 @@ packages: dev: false optional: true - /webpack-cli@5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3): + /webpack-cli@5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0): resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==} engines: {node: '>=14.15.0'} hasBin: true @@ -9139,9 +9140,9 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.90.3) - '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.90.3) - '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.90.3) + '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.91.0) + '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.91.0) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.91.0) colorette: 2.0.20 commander: 10.0.1 cross-spawn: 7.0.3 @@ -9150,11 +9151,11 @@ packages: import-local: 3.1.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.90.3(webpack-cli@5.1.4) - webpack-dev-server: 5.0.2(webpack-cli@5.1.4)(webpack@5.90.3) + webpack: 5.91.0(webpack-cli@5.1.4) + webpack-dev-server: 5.0.2(webpack-cli@5.1.4)(webpack@5.91.0) webpack-merge: 5.10.0 - /webpack-dev-middleware@7.2.1(webpack@5.90.3): + /webpack-dev-middleware@7.2.1(webpack@5.91.0): resolution: {integrity: sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==} engines: {node: '>= 18.12.0'} peerDependencies: @@ -9169,9 +9170,9 @@ packages: on-finished: 2.4.1 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.90.3(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@5.1.4) - /webpack-dev-server@5.0.2(webpack-cli@5.1.4)(webpack@5.90.3): + /webpack-dev-server@5.0.2(webpack-cli@5.1.4)(webpack@5.91.0): resolution: {integrity: sha512-IVj3qsQhiLJR82zVg3QdPtngMD05CYP/Am+9NG5QSl+XwUR/UPtFwllRBKrMwM9ttzFsC6Zj3DMgniPyn/Z0hQ==} engines: {node: '>= 18.12.0'} hasBin: true @@ -9212,10 +9213,10 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.90.3(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) - webpack-dev-middleware: 7.2.1(webpack@5.90.3) - ws: 8.17.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) + webpack: 5.91.0(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) + webpack-dev-middleware: 7.2.1(webpack@5.91.0) + ws: 8.17.0(bufferutil@4.0.8)(utf-8-validate@5.0.10) transitivePeerDependencies: - bufferutil - debug @@ -9234,8 +9235,8 @@ packages: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - /webpack@5.90.3(webpack-cli@5.1.4): - resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==} + /webpack@5.91.0(webpack-cli@5.1.4): + resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -9265,9 +9266,9 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(webpack@5.90.3) + terser-webpack-plugin: 5.3.10(webpack@5.91.0) watchpack: 2.4.1 - webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.90.3) + webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0) webpack-sources: 3.2.3 transitivePeerDependencies: - '@swc/core' @@ -9294,12 +9295,12 @@ packages: resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} engines: {node: '>=0.8.0'} - /webtorrent@2.2.1: - resolution: {integrity: sha512-dK9AI0kKHl6VrSCzCSdy8EUqNrjsIHfLCcMsObMZe9mEsetJYuLsA8ZI6exxwpbyiOlsa920TNYNbSqP0/v/6w==} - engines: {node: '>=14'} + /webtorrent@2.3.2: + resolution: {integrity: sha512-t/NhKQ4pn20PEwLdrsjNfQu24Jd7cpDr4hfYRIFMW8iWIjeQJnTf/uGvqAraAoRYMf0hkEbk9KyoVJrC5iT2hQ==} + engines: {node: '>=16'} dependencies: '@silentbot1/nat-api': 0.4.7 - '@thaunknown/simple-peer': 9.12.1 + '@thaunknown/simple-peer': 10.0.7 '@webtorrent/http-node': 1.3.0 addr-to-ip-port: 2.0.0 bitfield: 4.2.0 @@ -9390,7 +9391,7 @@ packages: /wide-align@1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 1.0.2 + string-width: 4.2.3 dev: true /wildcard@2.0.1: @@ -9471,7 +9472,6 @@ packages: dependencies: bufferutil: 4.0.8 utf-8-validate: 5.0.10 - dev: false /ws@8.17.0(bufferutil@4.0.8)(utf-8-validate@6.0.4): resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==} @@ -9487,6 +9487,7 @@ packages: dependencies: bufferutil: 4.0.8 utf-8-validate: 6.0.4 + dev: false /xcode@3.0.1: resolution: {integrity: sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==}