Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
777bba8
chore(deps): update dependency @types/npmlog to v7
renovate[bot] Dec 21, 2023
7a30b47
chore(deps): update dependency electron-builder to v24
renovate[bot] Dec 21, 2023
de06746
chore(deps): update dependency electron to v28 (#357)
renovate[bot] Dec 21, 2023
600bd38
Merge pull request #358 from Magickbase/renovate/electron-builder-24.x
Keith-CY Dec 21, 2023
fdda1c4
Merge pull request #356 from Magickbase/renovate/npmlog-7.x
Keith-CY Dec 21, 2023
6255eea
chore(deps): update dependency eslint-config-prettier to v9
renovate[bot] Dec 21, 2023
fd1483a
Merge branch 'nervosnetwork:develop' into develop
Keith-CY Dec 21, 2023
102f84f
Merge pull request #360 from Magickbase/renovate/eslint-config-pretti…
Keith-CY Dec 21, 2023
b3eb4a4
chore(deps): update dependency lint-staged to v15
renovate[bot] Dec 21, 2023
f56bb7e
Merge pull request #363 from Magickbase/renovate/lint-staged-15.x
Keith-CY Dec 21, 2023
f64088a
chore(deps): update dependency lerna to v8
renovate[bot] Dec 21, 2023
7acc6ac
chore(deps): update dependency react-i18next to v14
renovate[bot] Dec 21, 2023
103adbb
Merge pull request #362 from Magickbase/renovate/major-lerna-monorepo
Keith-CY Dec 21, 2023
f3c7b54
fix(deps): update dependency react-router-dom to v6.21.1
renovate[bot] Dec 21, 2023
575a906
Merge pull request #366 from Magickbase/renovate/react-router-monorepo
Keith-CY Dec 22, 2023
1fa62f0
Merge pull request #365 from Magickbase/renovate/react-i18next-14.x-l…
Keith-CY Dec 22, 2023
0b61ead
Merge branch 'nervosnetwork:develop' into develop
Keith-CY Dec 22, 2023
dc7271d
Merge branch 'nervosnetwork:develop' into develop
Keith-CY Dec 26, 2023
46d9071
chore(deps): update dependency electron to v28.1.0 (#367)
renovate[bot] Dec 26, 2023
6c8ee43
chore(deps): update dependency react-i18next to v14 (#368)
renovate[bot] Dec 26, 2023
09e1e5c
chore(deps): update dependency storybook-addon-react-router-v6 to v2
renovate[bot] Dec 26, 2023
cb43b4b
Merge pull request #369 from Magickbase/renovate/storybook-addon-reac…
Keith-CY Dec 26, 2023
f7e56e7
chore(deps): update github/codeql-action action to v3 (#370)
renovate[bot] Dec 26, 2023
3655d6b
chore(deps): update node.js to v20 (#371)
renovate[bot] Dec 26, 2023
2335945
chore(deps): update peter-evans/commit-comment action to v3 (#372)
renovate[bot] Dec 26, 2023
48d0c96
chore(deps): update tj-actions/changed-files action to v41 (#373)
renovate[bot] Dec 26, 2023
46cec89
chore: revert wait-on
Keith-CY Dec 26, 2023
216dfc8
fix(deps): update dependency archiver to v6 (#375)
renovate[bot] Dec 27, 2023
b57b148
chore(deps): update typescript-eslint monorepo to v6 (#374)
renovate[bot] Dec 27, 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 .github/workflows/check-code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Changed Files
id: changed-files
uses: tj-actions/changed-files@v37
uses: tj-actions/changed-files@v41
with:
files: "packages/**/*.{js,cjs,mjs,jsx,ts,tsx,css,scss}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_checksums.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
body="${body//$'\r'/'%0D'}"
echo "body=$body" >> $GITHUB_OUTPUT

- uses: peter-evans/commit-comment@v2
- uses: peter-evans/commit-comment@v3
with:
body: ${{ steps.comment_body.outputs.body }}

6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,4 +69,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ jobs:
steps:
- name: Comment by push event
if: ${{ github.event_name == 'push' }}
uses: peter-evans/commit-comment@v2
uses: peter-evans/commit-comment@v3
with:
body: |
Packaging for test is done in [${{ github.run_id }}](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
"devDependencies": {
"@babel/core": "7.23.6",
"@types/jest": "27.5.2",
"@types/node": "18.19.3",
"@types/npmlog": "4.1.6",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@types/node": "20.10.5",
"@types/npmlog": "7.0.0",
"@typescript-eslint/eslint-plugin": "6.16.0",
"@typescript-eslint/parser": "6.16.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"eslint": "8.56.0",
"eslint-config-prettier": "8.10.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
"lerna": "7.4.2",
"lint-staged": "13.3.0",
"lerna": "8.0.1",
"lint-staged": "15.2.0",
"ncp": "2.0.0",
"prettier": "2.8.8",
"ts-jest": "29.1.1",
Expand All @@ -67,6 +67,6 @@
"react-i18next": ">=11.16.4"
},
"volta": {
"node": "18.19.0"
"node": "20.10.0"
}
}
10 changes: 5 additions & 5 deletions packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "13.5.0",
"react-router-dom": "6.21.0",
"react-router-dom": "6.21.1",
"react-transition-group": "4.4.5",
"sass": "1.69.5",
"tslib": "2.6.2"
Expand All @@ -83,14 +83,14 @@
"@storybook/testing-library": "0.2.2",
"@types/enzyme": "3.10.18",
"@types/enzyme-adapter-react-16": "1.0.9",
"@types/node": "18.19.3",
"@types/node": "20.10.5",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.18",
"@types/react-router-dom": "5.3.3",
"@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.1.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.7",
"eslint-config-airbnb": "19.0.4",
Expand All @@ -102,10 +102,10 @@
"react-scripts": "5.0.1",
"react-test-renderer": "18.2.0",
"storybook": "7.6.6",
"storybook-addon-react-router-v6": "1.0.2",
"storybook-addon-react-router-v6": "2.0.10",
"webpack": "5.89.0"
},
"resolutions": {
"react-i18next": "12.3.1"
"react-i18next": "14.0.0"
}
}
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
8 changes: 4 additions & 4 deletions packages/neuron-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@iarna/toml": "2.2.5",
"@ledgerhq/hw-transport-node-hid": "6.27.22",
"@spore-sdk/core": "0.1.0-beta.9",
"archiver": "5.3.2",
"archiver": "6.0.1",
"async": "3.2.5",
"bn.js": "4.12.0",
"chalk": "3.0.0",
Expand All @@ -80,7 +80,7 @@
"devDependencies": {
"@electron/notarize": "2.2.0",
"@nervosnetwork/ckb-types": "0.109.0",
"@types/archiver": "3.1.1",
"@types/archiver": "6.0.2",
"@types/async": "3.2.24",
"@types/electron-devtools-installer": "2.2.5",
"@types/elliptic": "6.4.18",
Expand All @@ -93,9 +93,9 @@
"@types/sqlite3": "3.1.11",
"@types/uuid": "8.3.4",
"devtron": "1.4.0",
"electron": "24.8.8",
"electron": "28.1.0",
"electron-build-env": "0.2.0",
"electron-builder": "23.6.0",
"electron-builder": "24.9.1",
"electron-devtools-installer": "3.2.0",
"jest-when": "3.6.0",
"neuron-ui": "0.112.0",
Expand Down
Loading