From 2070b7879dc6bb5e0355c2402d5d7591deaa2e1c Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Wed, 17 Aug 2022 22:54:51 +1000 Subject: [PATCH] build(eth-pm):downgrade React to avoid peer dep conflict with mui Material UI 4 is not compatible with React 18 and it looks like some peer dep were recently changed, creating conflict issues in CI. --- eth-pm/.npmrc | 1 + eth-pm/package.json | 3 +- eth-pm/pnpm-lock.yaml | 104 +++++++++++++++++++++--------------------- 3 files changed, 53 insertions(+), 55 deletions(-) create mode 100644 eth-pm/.npmrc diff --git a/eth-pm/.npmrc b/eth-pm/.npmrc new file mode 100644 index 0000000..3e775ef --- /dev/null +++ b/eth-pm/.npmrc @@ -0,0 +1 @@ +auto-install-peers=true diff --git a/eth-pm/package.json b/eth-pm/package.json index ec4f754..4e6ae69 100644 --- a/eth-pm/package.json +++ b/eth-pm/package.json @@ -13,8 +13,7 @@ "js-waku": "^0.24.0", "protobufjs": "^6.11.2", "react": "^17.0.2", - "react-dom": "^17.0.2", - "uint8arrays": "^3.1.0" + "react-dom": "^17.0.2" }, "scripts": { "start": "cra-webpack-rewired start", diff --git a/eth-pm/pnpm-lock.yaml b/eth-pm/pnpm-lock.yaml index e45648a..e6d794a 100644 --- a/eth-pm/pnpm-lock.yaml +++ b/eth-pm/pnpm-lock.yaml @@ -27,7 +27,6 @@ specifiers: react-scripts: 5.0.0 stream-browserify: ^3.0.0 typescript: ^4.5.5 - uint8arrays: ^3.1.0 dependencies: '@ethersproject/providers': 5.6.8 @@ -36,11 +35,10 @@ dependencies: eth-sig-util: 3.0.1 ethers: 5.6.9 fontsource-roboto: 4.0.0 - js-waku: 0.24.0 + js-waku: 0.24.0_node-fetch@2.6.7 protobufjs: 6.11.3 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 - uint8arrays: 3.1.0 devDependencies: '@ethersproject/shims': 5.6.0 @@ -56,7 +54,7 @@ devDependencies: npm-run-all: 4.1.5 prettier: 2.7.1 process: 0.11.10 - react-scripts: 5.0.0_s7dhm7uhgnhsqh75wuilf3r4wi + react-scripts: 5.0.0_yogd765a4nbo65imtxeijpro7y stream-browserify: 3.0.0 typescript: 4.7.4 @@ -5327,11 +5325,11 @@ packages: resolution: {integrity: sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==} dev: true - /dns-over-http-resolver/1.2.3: + /dns-over-http-resolver/1.2.3_node-fetch@2.6.7: resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: debug: 4.3.4 - native-fetch: 3.0.0 + native-fetch: 3.0.0_node-fetch@2.6.7 receptacle: 1.3.2 transitivePeerDependencies: - node-fetch @@ -5673,7 +5671,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-react-app/7.0.1_gxsh7ni3jr2i4mnimuxscncbum: + /eslint-config-react-app/7.0.1_x3alemznk2vpfvvnowlkwitfze: resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -5691,7 +5689,7 @@ packages: babel-preset-react-app: 10.0.1 confusing-browser-globals: 1.0.11 eslint: 8.21.0 - eslint-plugin-flowtype: 8.0.3_eslint@8.21.0 + eslint-plugin-flowtype: 8.0.3_bfhyaeqlroxospgntnspvajiaq eslint-plugin-import: 2.26.0_wuikv5nqgdfyng42xxm7lklfmi eslint-plugin-jest: 25.7.0_rgnm43ao3zb6h53qs7rzyfjfmm eslint-plugin-jsx-a11y: 6.6.1_eslint@8.21.0 @@ -5743,7 +5741,7 @@ packages: - supports-color dev: true - /eslint-plugin-flowtype/8.0.3_eslint@8.21.0: + /eslint-plugin-flowtype/8.0.3_bfhyaeqlroxospgntnspvajiaq: resolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5751,6 +5749,8 @@ packages: '@babel/plugin-transform-react-jsx': ^7.14.9 eslint: ^8.1.0 dependencies: + '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.10 + '@babel/plugin-transform-react-jsx': 7.18.10_@babel+core@7.18.10 eslint: 8.21.0 lodash: 4.17.21 string-natural-compare: 3.0.1 @@ -8249,7 +8249,7 @@ packages: /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - /js-waku/0.24.0: + /js-waku/0.24.0_node-fetch@2.6.7: resolution: {integrity: sha512-8l7/WuadaaGy6XmVKutZpJ61JohbBe8WamJUtNiTd8WdxhBuz/rXh5RUiD8mjiiG8kEzQ+3+E68rvIpb/+BbXw==} engines: {node: '>=16'} dependencies: @@ -8263,15 +8263,15 @@ packages: it-length-prefixed: 5.0.3 it-pipe: 1.1.0 js-sha3: 0.8.0 - libp2p: 0.36.2 - libp2p-bootstrap: 0.14.0 + libp2p: 0.36.2_node-fetch@2.6.7 + libp2p-bootstrap: 0.14.0_node-fetch@2.6.7 libp2p-crypto: 0.21.2 - libp2p-gossipsub: 0.13.0 - libp2p-interfaces: 4.0.6 + libp2p-gossipsub: 0.13.0_node-fetch@2.6.7 + libp2p-interfaces: 4.0.6_node-fetch@2.6.7 libp2p-mplex: 0.10.7 - libp2p-websockets: 0.16.2 + libp2p-websockets: 0.16.2_node-fetch@2.6.7 long: 4.0.0 - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 multiformats: 9.7.1 peer-id: 0.16.0 protobufjs: 6.11.3 @@ -8549,13 +8549,13 @@ packages: type-check: 0.4.0 dev: true - /libp2p-bootstrap/0.14.0: + /libp2p-bootstrap/0.14.0_node-fetch@2.6.7: resolution: {integrity: sha512-j3slZo5nOdA8wVlav8dRZeAXutZ7psz/f10DLoIEX/EFif7uU5oZfIYvjbVGo3ZDl+VQLo2tR0m1lV0westQ3g==} engines: {node: '>=15.0.0'} dependencies: debug: 4.3.4 - mafmt: 10.0.0 - multiaddr: 10.0.1 + mafmt: 10.0.0_node-fetch@2.6.7 + multiaddr: 10.0.1_node-fetch@2.6.7 peer-id: 0.16.0 transitivePeerDependencies: - node-fetch @@ -8576,7 +8576,7 @@ packages: uint8arrays: 3.1.0 dev: false - /libp2p-gossipsub/0.13.0: + /libp2p-gossipsub/0.13.0_node-fetch@2.6.7: resolution: {integrity: sha512-xy2jRZGmJpjy++Di6f1admtjve8Fx0z5l8NISTQS282egwbRMmTPE6/UeYktb6hNGAgtSTIwXdHjXmMOiTarFA==} dependencies: '@types/debug': 4.1.7 @@ -8584,7 +8584,7 @@ packages: denque: 1.5.1 err-code: 3.0.1 it-pipe: 1.1.0 - libp2p-interfaces: 4.0.6 + libp2p-interfaces: 4.0.6_node-fetch@2.6.7 peer-id: 0.16.0 protobufjs: 6.11.3 uint8arrays: 3.1.0 @@ -8593,7 +8593,7 @@ packages: - supports-color dev: false - /libp2p-interfaces/4.0.6: + /libp2p-interfaces/4.0.6_node-fetch@2.6.7: resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 @@ -8603,7 +8603,7 @@ packages: it-pipe: 1.1.0 it-pushable: 1.4.2 libp2p-crypto: 0.21.2 - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 multiformats: 9.7.1 p-queue: 6.6.2 peer-id: 0.16.0 @@ -8628,7 +8628,7 @@ packages: - supports-color dev: false - /libp2p-utils/0.4.1: + /libp2p-utils/0.4.1_node-fetch@2.6.7: resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 @@ -8636,14 +8636,14 @@ packages: err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 private-ip: 2.3.3 transitivePeerDependencies: - node-fetch - supports-color dev: false - /libp2p-websockets/0.16.2: + /libp2p-websockets/0.16.2_node-fetch@2.6.7: resolution: {integrity: sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==} dependencies: abortable-iterator: 3.0.2 @@ -8652,10 +8652,10 @@ packages: err-code: 3.0.1 ipfs-utils: 9.0.7 it-ws: 4.0.0 - libp2p-utils: 0.4.1 - mafmt: 10.0.0 - multiaddr: 10.0.1 - multiaddr-to-uri: 8.0.0 + libp2p-utils: 0.4.1_node-fetch@2.6.7 + mafmt: 10.0.0_node-fetch@2.6.7 + multiaddr: 10.0.1_node-fetch@2.6.7 + multiaddr-to-uri: 8.0.0_node-fetch@2.6.7 p-defer: 3.0.0 p-timeout: 4.1.0 transitivePeerDependencies: @@ -8665,7 +8665,7 @@ packages: - utf-8-validate dev: false - /libp2p/0.36.2: + /libp2p/0.36.2_node-fetch@2.6.7: resolution: {integrity: sha512-UpNYBMQVivMu56zoibdGitopv39uBBAybIBOEGWmFy/I2NnTVGUutLPrxo47AuN2kntYgo/TNJfW+PpswUgSaw==} engines: {node: '>=15.0.0'} dependencies: @@ -8696,12 +8696,12 @@ packages: it-sort: 1.0.1 it-take: 1.0.2 libp2p-crypto: 0.21.2 - libp2p-interfaces: 4.0.6 - libp2p-utils: 0.4.1 - mafmt: 10.0.0 + libp2p-interfaces: 4.0.6_node-fetch@2.6.7 + libp2p-utils: 0.4.1_node-fetch@2.6.7 + mafmt: 10.0.0_node-fetch@2.6.7 merge-options: 3.0.4 mortice: 2.0.1 - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 multiformats: 9.7.1 multistream-select: 3.0.2 mutable-proxy: 1.0.0 @@ -8843,10 +8843,10 @@ packages: yallist: 4.0.0 dev: true - /mafmt/10.0.0: + /mafmt/10.0.0_node-fetch@2.6.7: resolution: {integrity: sha512-K1bziJOXcnepfztu+2Xy9FLKVLaFMDuspmiyJIYRxnO0WOxFSV7XKSdMxMrVZxcvg1+YjlTIvSGTImUHU2k4Aw==} dependencies: - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 transitivePeerDependencies: - node-fetch - supports-color @@ -9021,19 +9021,19 @@ packages: /ms/2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /multiaddr-to-uri/8.0.0: + /multiaddr-to-uri/8.0.0_node-fetch@2.6.7: resolution: {integrity: sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA==} dependencies: - multiaddr: 10.0.1 + multiaddr: 10.0.1_node-fetch@2.6.7 transitivePeerDependencies: - node-fetch - supports-color dev: false - /multiaddr/10.0.1: + /multiaddr/10.0.1_node-fetch@2.6.7: resolution: {integrity: sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==} dependencies: - dns-over-http-resolver: 1.2.3 + dns-over-http-resolver: 1.2.3_node-fetch@2.6.7 err-code: 3.0.1 is-ip: 3.1.0 multiformats: 9.7.1 @@ -9102,12 +9102,6 @@ packages: - supports-color dev: false - /native-fetch/3.0.0: - resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} - peerDependencies: - node-fetch: '*' - dev: false - /native-fetch/3.0.0_hmwa7nplpltavckpkeobtw6pv4: resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} peerDependencies: @@ -9116,6 +9110,14 @@ packages: node-fetch: /@achingbrain/node-fetch/2.6.7 dev: false + /native-fetch/3.0.0_node-fetch@2.6.7: + resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} + peerDependencies: + node-fetch: '*' + dependencies: + node-fetch: 2.6.7 + dev: false + /natural-compare/1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -9159,7 +9161,6 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 - dev: true /node-forge/1.3.1: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} @@ -10742,7 +10743,7 @@ packages: engines: {node: '>=0.10.0'} dev: true - /react-scripts/5.0.0_s7dhm7uhgnhsqh75wuilf3r4wi: + /react-scripts/5.0.0_yogd765a4nbo65imtxeijpro7y: resolution: {integrity: sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==} engines: {node: '>=14.0.0'} hasBin: true @@ -10769,7 +10770,7 @@ packages: dotenv: 10.0.0 dotenv-expand: 5.1.0 eslint: 8.21.0 - eslint-config-react-app: 7.0.1_gxsh7ni3jr2i4mnimuxscncbum + eslint-config-react-app: 7.0.1_x3alemznk2vpfvvnowlkwitfze eslint-webpack-plugin: 3.2.0_u2suxbtqimpjcabkd5w2ufy4qm file-loader: 6.2.0_webpack@5.74.0 fs-extra: 10.1.0 @@ -12101,7 +12102,6 @@ packages: /tr46/0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: true /tr46/1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -12446,7 +12446,6 @@ packages: /webidl-conversions/3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: true /webidl-conversions/4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -12628,7 +12627,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url/7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}