From de06746ab7eb2fb0e6bb61e5f588c33fdf7237ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 23:03:20 +0900 Subject: [PATCH] chore(deps): update dependency electron to v28 (#357) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Keith Co-authored-by: yanguoyu <841185308@qq.com> --- package.json | 2 +- packages/neuron-ui/package.json | 2 +- packages/neuron-ui/src/services/subjects.ts | 4 +- packages/neuron-wallet/package.json | 2 +- yarn.lock | 41 +++++++++++++-------- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 6eb94d735a..e7a4b58bad 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "prettier": "2.8.8", "ts-jest": "29.1.1", "typescript": "5.3.3", - "wait-on": "7.0.1" + "wait-on": "7.2.0" }, "dependencies": {}, "resolutions": { diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index 540fe4d81f..4404c9df4e 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -90,7 +90,7 @@ "@types/styled-components": "5.1.34", "@wojtekmaj/enzyme-adapter-react-17": "0.8.0", "babel-jest": "25.5.1", - "electron": "24.8.8", + "electron": "28.0.0", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.7", "eslint-config-airbnb": "19.0.4", diff --git a/packages/neuron-ui/src/services/subjects.ts b/packages/neuron-ui/src/services/subjects.ts index b78aebf9d2..a9e36665c9 100644 --- a/packages/neuron-ui/src/services/subjects.ts +++ b/packages/neuron-ui/src/services/subjects.ts @@ -1,5 +1,5 @@ import { CONSTANTS } from 'utils' -import { ipcRenderer } from 'electron' +import { ipcRenderer, type IpcRendererEvent } from 'electron' const { LOCALES } = CONSTANTS @@ -37,7 +37,7 @@ const SubjectConstructor = ( return ipcRenderer ? { subscribe: (handler: (data: T) => void) => { - const handlerWrap = (_e: Event, data: T) => { + const handlerWrap = (_e: IpcRendererEvent, data: T) => { handler(data) } ipcRenderer.on(channel, handlerWrap) diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 73b45ea269..a65fe657f7 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -93,7 +93,7 @@ "@types/sqlite3": "3.1.11", "@types/uuid": "8.3.4", "devtron": "1.4.0", - "electron": "24.8.8", + "electron": "28.0.0", "electron-build-env": "0.2.0", "electron-builder": "23.6.0", "electron-devtools-installer": "3.2.0", diff --git a/yarn.lock b/yarn.lock index 9fad12f853..ecae933a08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7218,7 +7218,7 @@ axios@0.21.4: dependencies: follow-redirects "^1.14.0" -axios@0.27.2, axios@^0.27.2: +axios@0.27.2: version "0.27.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== @@ -7235,6 +7235,15 @@ axios@^1.0.0: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" + integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axobject-query@^3.1.1: version "3.2.1" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a" @@ -9714,10 +9723,10 @@ electron-window-state@5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@24.8.8: - version "24.8.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-24.8.8.tgz#b369e8f8910d41e94817b79ea3d37e0f0822e884" - integrity sha512-0A2tGwG/0hxnD32Lil9wgSydQ0HCP5AdkgcH+qee3QgaC2jVq55YIbrj/0ZAq4L7yiZvQTzYIrc6kie7OahJKQ== +electron@28.0.0: + version "28.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-28.0.0.tgz#21e5590c967125a3c1ec6b0d8d923baf9eb6fd72" + integrity sha512-eDhnCFBvG0PGFVEpNIEdBvyuGUBsFdlokd+CtuCe2ER3P+17qxaRfWRxMmksCOKgDHb5Wif5UxqOkZSlA4snlw== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" @@ -13509,7 +13518,7 @@ jiti@^1.18.2: resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== -joi@^17.7.0: +joi@^17.11.0: version "17.11.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.11.0.tgz#aa9da753578ec7720e6f0ca2c7046996ed04fc1a" integrity sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ== @@ -14636,7 +14645,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -17787,7 +17796,7 @@ rxjs@6, rxjs@6.6.7: dependencies: tslib "^1.9.0" -rxjs@^7.5.5, rxjs@^7.8.0, rxjs@^7.8.1: +rxjs@^7.5.5, rxjs@^7.8.1: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== @@ -19954,16 +19963,16 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-on@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.0.1.tgz#5cff9f8427e94f4deacbc2762e6b0a489b19eae9" - integrity sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog== +wait-on@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.2.0.tgz#d76b20ed3fc1e2bebc051fae5c1ff93be7892928" + integrity sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ== dependencies: - axios "^0.27.2" - joi "^17.7.0" + axios "^1.6.1" + joi "^17.11.0" lodash "^4.17.21" - minimist "^1.2.7" - rxjs "^7.8.0" + minimist "^1.2.8" + rxjs "^7.8.1" walker@^1.0.7, walker@^1.0.8, walker@~1.0.5: version "1.0.8"