Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
e6c1c43
chore(deps): update dependency lerna to v7.4.2 (#314)
renovate[bot] Nov 27, 2023
52acea6
chore(deps): update dependency jest-when to v3.6.0 (#313)
renovate[bot] Nov 27, 2023
b894c1a
chore(deps): update dependency jest-styled-components to v7.2.0 (#312)
renovate[bot] Nov 28, 2023
89d58c3
fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317)
renovate[bot] Nov 28, 2023
28ec92f
chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309)
renovate[bot] Nov 28, 2023
e2f63d1
fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319)
renovate[bot] Nov 28, 2023
799eb2f
fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322)
renovate[bot] Nov 28, 2023
2cd52f2
fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-nex…
renovate[bot] Nov 28, 2023
9d3d1b5
fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3…
renovate[bot] Nov 28, 2023
1dede13
fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-nex…
renovate[bot] Nov 28, 2023
633f4ed
Merge branch 'develop' of https://github.com/magickbase/neuron into d…
Keith-CY Dec 8, 2023
3dfc45a
chore(deps): update dependency react-i18next to v13.5.0 (#325)
renovate[bot] Dec 10, 2023
ff90dd3
chore(deps): update dependency @babel/core to v7.23.5 (#327)
renovate[bot] Dec 10, 2023
81a5139
chore(deps): update dependency typescript to v5.3.3
renovate[bot] Dec 10, 2023
32dc1c7
chore(deps): update dependency @types/enzyme to v3.10.18 (#328)
renovate[bot] Dec 10, 2023
2602094
Merge pull request #332 from Magickbase/renovate/typescript-5.x
Keith-CY Dec 10, 2023
421c4c1
chore: update reviewers of renovate (#330)
Keith-CY Dec 11, 2023
a1fddf6
Merge branch 'develop' into develop
Keith-CY Dec 12, 2023
a156dca
Merge branch 'develop' of https://github.com/nervosnetwork/neuron int…
Keith-CY Dec 14, 2023
08ce34e
chore(deps): update dependency @babel/core to v7.23.6
renovate[bot] Dec 14, 2023
97fc6a2
chore(deps): update dependency eslint-plugin-import to v2.29.1
renovate[bot] Dec 14, 2023
ede62d3
refactor: introduce tslib
Keith-CY Dec 15, 2023
4a0a7c6
chore(deps): update dependency eslint to v8.56.0
renovate[bot] Dec 16, 2023
d25dd3a
chore(deps): update react monorepo to v18
renovate[bot] Dec 16, 2023
fa96899
Merge branch 'develop' into develop
Keith-CY Dec 19, 2023
a16d727
Merge branch 'nervosnetwork:develop' into develop
Keith-CY Dec 19, 2023
9480299
Merge pull request #334 from Magickbase/renovate/babel-monorepo
Keith-CY Dec 19, 2023
a73fea1
Merge pull request #336 from Magickbase/renovate/eslint-plugin-import…
Keith-CY Dec 19, 2023
0ffaaa6
Merge pull request #337 from Magickbase/renovate/eslint-8.x
Keith-CY Dec 19, 2023
82d3b69
chore(deps): update dependency wait-on to v7.2.0
renovate[bot] Dec 19, 2023
edb06e2
chore(deps): update dependency webpack to v5.89.0
renovate[bot] Dec 19, 2023
38fb7ec
chore(deps): update dependency @types/styled-components to v5.1.34
renovate[bot] Dec 19, 2023
cf83ee2
chore(deps): update node.js to v18.19.0
renovate[bot] Dec 19, 2023
b134514
refactor: update type declaration for react 18
Keith-CY Dec 19, 2023
71cdef1
Merge branch 'develop' into develop
Keith-CY Dec 19, 2023
ceccbe5
Merge pull request #340 from Magickbase/renovate/node-18.x
Keith-CY Dec 19, 2023
4dd20b1
chore(deps): update peterjgrainger/action-create-branch action to v2.4.0
renovate[bot] Dec 19, 2023
b8c0f7f
Merge pull request #341 from Magickbase/renovate/peterjgrainger-actio…
Keith-CY Dec 19, 2023
ebc0d2f
Merge pull request #331 from Magickbase/renovate/styled-components-5.x
Keith-CY Dec 19, 2023
357db30
Merge pull request #338 from Magickbase/renovate/wait-on-7.x
Keith-CY Dec 19, 2023
515562a
Merge pull request #339 from Magickbase/renovate/webpack-5.x
Keith-CY Dec 19, 2023
a715ead
Merge branch 'develop' into renovate/major-react-monorepo
Keith-CY Dec 19, 2023
898fcc3
chore(deps): update typescript-eslint monorepo to v5.62.0
renovate[bot] Dec 19, 2023
ca5bdc7
fix(deps): update dependency react-router-dom to v6.21.0
renovate[bot] Dec 19, 2023
4d0656c
Merge pull request #345 from Magickbase/renovate/react-router-monorepo
Keith-CY Dec 20, 2023
7a9454f
Merge pull request #343 from Magickbase/renovate/typescript-eslint-mo…
Keith-CY Dec 20, 2023
017bdf8
fix(deps): update dependency sass to v1.69.5
renovate[bot] Dec 20, 2023
62b64db
fix(deps): update dependency undici to v5.28.2
renovate[bot] Dec 20, 2023
932aa48
Merge branch 'develop' into renovate/major-react-monorepo
Keith-CY Dec 20, 2023
e2e9fe4
Merge pull request #348 from Magickbase/renovate/undici-5.x
Keith-CY Dec 20, 2023
04f6d36
Merge pull request #347 from Magickbase/renovate/sass-1.x
Keith-CY Dec 20, 2023
4a78509
Merge branch 'develop' into renovate/major-react-monorepo
Keith-CY Dec 20, 2023
8058371
chore(deps): update storybook monorepo to v7.6.6 (#342)
renovate[bot] Dec 20, 2023
139ad0e
Merge branch 'develop' into renovate/major-react-monorepo
Keith-CY Dec 20, 2023
0fbed24
chore(deps): update actions/checkout action to v4 (#349)
renovate[bot] Dec 20, 2023
2853ba5
chore(deps): update actions/github-script action to v7 (#350)
renovate[bot] Dec 20, 2023
d29e785
Merge branch 'develop' into renovate/major-react-monorepo
Keith-CY Dec 20, 2023
c903c57
Merge pull request #243 from Magickbase/renovate/major-react-monorepo
Keith-CY Dec 20, 2023
00fc98e
chore(deps): update dependency react-i18next to v12.3.1
renovate[bot] Dec 20, 2023
feab509
chore(deps): update actions/setup-node action to v4
renovate[bot] Dec 20, 2023
0f4ec16
chore(deps): update actions/stale action to v9
renovate[bot] Dec 20, 2023
39b2bda
chore(deps): update actions/upload-artifact action to v4
renovate[bot] Dec 20, 2023
e418d8a
Merge pull request #353 from Magickbase/renovate/actions-stale-9.x
Keith-CY Dec 21, 2023
680fc4e
Merge pull request #352 from Magickbase/renovate/actions-setup-node-4.x
Keith-CY Dec 21, 2023
8703fd9
Merge pull request #351 from Magickbase/renovate/react-i18next-12.x
Keith-CY Dec 21, 2023
205e8c4
Merge pull request #354 from Magickbase/renovate/actions-upload-artif…
Keith-CY Dec 21, 2023
dd630e7
chore(deps): update crazy-max/ghaction-import-gpg action to v6 (#355)
renovate[bot] Dec 21, 2023
db947d6
chore(deps): update dependency electron to v28
renovate[bot] Dec 21, 2023
f09666d
fix: Adapt electron's type
yanguoyu Dec 21, 2023
421e783
Merge branch 'develop' into renovate/electron-28.x
Keith-CY Dec 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/neuron-ui/src/services/subjects.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CONSTANTS } from 'utils'
import { ipcRenderer } from 'electron'
import { ipcRenderer, type IpcRendererEvent } from 'electron'

const { LOCALES } = CONSTANTS

Expand Down Expand Up @@ -37,7 +37,7 @@ const SubjectConstructor = <T>(
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)
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
41 changes: 25 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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==
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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"
Expand Down