Skip to content

Commit

Permalink
Resolve: Update npm dependencies (09-30-2021) (#1801)
Browse files Browse the repository at this point in the history
* Update simple dependencies

* Update typescript dependencies

* Update linter dependencies

* Update electron and remove deprecated remote module setting

* Update prettier config name

* Update @types/react

* Fix  Error: Could not detect abi for version 15.0.0

and runtime electron.  Updating "node-abi" might help solve this issue if it is a new release of electron

Fix:
"For anyone else that runs into this problem and if you're using yarn:
go into yarn.lock file, find entry for node-abi, delete it, then re-run
yarn." (@see
electron/forge#667 (comment))

* Update node version

Co-authored-by: Veado <veado@protonmail.com>
  • Loading branch information
gromxyz and veado committed Sep 30, 2021
1 parent 918f86a commit d127d09
Show file tree
Hide file tree
Showing 7 changed files with 240 additions and 267 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macOS-latest, ubuntu-latest]
node-version: [14.17]
node-version: [16.5.0]
steps:
- name: Checkout git repo
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Unit tests
strategy:
matrix:
node-version: [14.17]
node-version: [16.5.0]

runs-on: ubuntu-latest

Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
name: ESLint
strategy:
matrix:
node-version: [14.17]
node-version: [16.5.0]

runs-on: ubuntu-latest

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
name: Production build
strategy:
matrix:
node-version: [14.17]
node-version: [16.5.0]

runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17
16.5.0
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"tabWidth": 2,
"singleQuote": true,
"trailingComma": "none",
"jsxBracketSameLine": true,
"bracketSameLine": true,
"semi": false
}
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@
],
"homepage": "https://thorchain.org",
"dependencies": {
"@ant-design/icons": "^4.6.4",
"@ant-design/icons": "^4.7.0",
"@binance-chain/javascript-sdk": "^4.2.0",
"@craco/craco": "^6.2.0",
"@craco/craco": "^6.3.0",
"@devexperts/remote-data-ts": "^2.1.1",
"@devexperts/rx-utils": "^1.0.0-alpha.14",
"@devexperts/utils": "^1.0.0-alpha.14",
"@ledgerhq/hw-transport": "^6.3.0",
"@ledgerhq/hw-transport-node-hid-singleton": "^6.6.0",
"@openapitools/openapi-generator-cli": "^2.4.2",
"@openapitools/openapi-generator-cli": "^2.4.7",
"@psf/bitcoincashjs-lib": "^4.0.2",
"@thorchain/asgardex-midgard": "^1.1.0",
"@thorchain/asgardex-theme": "^0.1.1",
Expand Down Expand Up @@ -97,8 +97,8 @@
"electron-debug": "^3.2.0",
"electron-log": "^4.4.1",
"electron-updater": "^4.3.9",
"ethers": "^5.4.6",
"fp-ts": "2.10.5",
"ethers": "^5.4.7",
"fp-ts": "^2.11.4",
"fp-ts-rxjs": "^0.6.15",
"fs-extra": "^10.0.0",
"io-ts": "^2.2.16",
Expand All @@ -107,17 +107,17 @@
"observable-hooks": "^4.0.5",
"qrcode": "^1.4.4",
"react": "^17.0.2",
"react-chartjs-2": "^3.0.4",
"react-chartjs-2": "^3.0.5",
"react-circular-progressbar": "^2.0.4",
"react-dom": "^17.0.2",
"react-intl": "^5.20.10",
"react-intl": "^5.20.12",
"react-router-dom": "^5.3.0",
"react-scripts": "^4.0.3",
"react-test-renderer": "^17.0.2",
"rxjs": "^6.6.7",
"styled-components": "^5.3.1",
"styled-theme": "^0.3.3",
"typescript": "^4.4.2",
"typescript": "^4.4.3",
"uuid": "^8.3.2",
"wif": "^2.0.6"
},
Expand All @@ -134,34 +134,34 @@
"@storybook/react": "6.1.21",
"@storybook/theming": "^6.3.8",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/react": "^12.1.1",
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.2.1",
"@types/bchaddrjs": "^0.4.0",
"@types/fs-extra": "^9.0.12",
"@types/jest": "^27.0.1",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^27.0.2",
"@types/lodash.shuffle": "^4.2.6",
"@types/node": "^14.17",
"@types/node": "^16.4.2",
"@types/qrcode": "^1.4.1",
"@types/react": "^17.0.20",
"@types/react": "^17.0.25",
"@types/react-dom": "^17.0.9",
"@types/react-intl": "^3.0.0",
"@types/react-router-dom": "^5.1.8",
"@types/react-router-dom": "^5.3.0",
"@types/styled-components": "^5.1.14",
"concurrently": "^6.2.1",
"concurrently": "^6.2.2",
"cross-env": "^7.0.3",
"electron": "^13.3.0",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.1.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-prettier": "^4.0.0",
"git-revision-webpack-plugin": "^5.0.0",
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"node-abi": "^3.0.0",
"nodemon": "^2.0.12",
"prettier": "2.3.2",
"node-abi": "^3.2.0",
"nodemon": "^2.0.13",
"prettier": "^2.4.1",
"source-map-explorer": "^2.5.2",
"testcafe": "^1.16.0",
"testcafe-browser-provider-electron": "^0.0.16",
Expand Down
3 changes: 0 additions & 3 deletions src/main/electron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ const initMainWindow = async () => {
// ^ https://www.electronjs.org/docs/tutorial/context-isolation
// From Electron 12, it will be enabled by default.
contextIsolation: true,
// Disable `remote` module
// https://www.electronjs.org/docs/tutorial/security#15-disable-the-remote-module
enableRemoteModule: false,
// preload script
preload: join(__dirname, IS_DEV ? '../../public/' : '../build/', 'preload.js')
}
Expand Down

0 comments on commit d127d09

Please sign in to comment.