Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

chore: Relates to #309. Update to Electron v4.0.1 #352

Merged
merged 18 commits into from
Feb 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cache:

linux-test:
stage: test
image: node:8
image: node:10
script:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
Expand All @@ -37,7 +37,7 @@ linux-test:

linux-build:
stage: build
image: node:8
image: node:10
<<: *branches
script:
- curl -o- -L https://yarnpkg.com/install.sh | bash
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ $ /path/to/fether

### Dependencies

Make sure you have at least `yarn` version 1.4.2 and [Node.js >=8.12.0](https://nodejs.org/en/)
Make sure you have at least `yarn` version 1.4.2 and [Node.js >=10.10.0](https://nodejs.org/en/)

```bash
yarn --version // Should be at least 1.4.2
Expand Down
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"lerna": "2.11.0",
"npmClient": "yarn",
"packages": [
"packages/*"
],
"useWorkspaces": true,
"version": "0.3.0"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
]
},
"engines": {
"node": ">=8.12.0",
"node": ">=10.10.0",
"yarn": "^1.4.2"
},
"scripts": {
Expand All @@ -62,9 +62,9 @@
"devDependencies": {
"babel-eslint": "^10.0.1",
"husky": "^1.0.0-rc.13",
"lerna": "^2.11.0",
"lerna": "^3.4.3",
"npm-run-all": "^4.1.2",
"prettier": "^1.14.2",
"semistandard": "^13.0.1"
}
}
}
5 changes: 2 additions & 3 deletions packages/fether-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,18 @@
"test": "echo Skipped."
},
"dependencies": {
"@parity/electron": "^3.0.1",
"@parity/electron": "^4.0.0",
"commander": "^2.15.1",
"commander-remaining-args": "^1.2.0",
"fether-react": "^0.3.0",
"menubar": "^5.2.3",
"pino": "^4.16.1",
"pino-multi-stream": "^3.1.2",
"source-map-support": "^0.5.6"
},
"devDependencies": {
"copyfiles": "^2.0.0",
"cross-env": "^5.2.0",
"electron": "^2.0.2",
"electron": "^4.0.1",
"electron-builder": "^20.29.0",
"electron-webpack": "^2.1.2",
"webpack": "^4.7.0"
Expand Down
18 changes: 9 additions & 9 deletions packages/fether-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"test": "ln -s ../../../node_modules/react-scripts node_modules/ && cross-env SKIP_PREFLIGHT_CHECK=true craco test; rm node_modules/react-scripts"
},
"dependencies": {
"@craco/craco": "^3.2.3",
"@parity/abi": "^3.0.25",
"@parity/api": "^3.0.25",
"@parity/contracts": "^3.0.25",
"@parity/light.js": "^3.0.25",
"@parity/light.js-react": "^3.0.25",
"@craco/craco": "^3.3.1",
"@parity/abi": "^3.0.27",
"@parity/api": "^3.0.27",
"@parity/contracts": "^3.0.27",
"@parity/light.js": "^3.0.27",
"@parity/light.js-react": "^3.0.27",
"@parity/qr-signer": "^0.3.2",
"bignumber.js": "^8.0.1",
"bip39": "^2.5.0",
Expand All @@ -66,15 +66,15 @@
"react-markdown": "^3.3.4",
"react-resize-detector": "^3.0.1",
"react-router-dom": "^4.2.2",
"react-scripts": "^2.1.1",
"react-scripts": "^2.1.3",
"recompose": "^0.27.1",
"rxjs": "^6.2.0"
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.2.0",
"capitalize": "^1.0.0",
"node-sass": "^4.9.0",
"node-sass-chokidar": "^1.2.2",
"node-sass": "^4.11.0",
"node-sass-chokidar": "^1.3.4",
"npm-run-all": "^4.1.2"
},
"browserslist": [
Expand Down
8 changes: 2 additions & 6 deletions packages/fether-ui/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
module.exports = {
plugins: [
'@babel/plugin-proposal-class-properties',
['@babel/plugin-proposal-class-properties', { loose: false }],
'inline-import-data-uri'
],
presets: [
'@babel/preset-env',
'@babel/preset-react',
['@babel/preset-stage-0', { decoratorsLegacy: true }]
]
presets: ['@babel/preset-env', '@babel/preset-react']
};
16 changes: 10 additions & 6 deletions packages/fether-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
"build": "babel src --out-dir lib",
"start": "yarn build --watch"
},
"resolutions": {
"terser": "3.16.1"
},
"dependencies": {
"babel-plugin-inline-import-data-uri": "^1.0.1",
"react-blockies": "^1.3.0",
Expand All @@ -39,14 +42,15 @@
"semantic-ui-react": "^0.81.3"
},
"devDependencies": {
"@babel/cli": "^7.0.0-beta.49",
"@babel/core": "^7.0.0-beta.49",
"@babel/preset-env": "^7.0.0-beta.49",
"@babel/preset-react": "^7.0.0-beta.49",
"@babel/preset-stage-0": "^7.0.0-beta.49",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.3.0",
"prop-types": "^15.6.1",
"react": "^16.4.0",
"rimraf": "^2.6.2"
"rimraf": "^2.6.2",
"terser": "^3.16.1"
},
"peerDependencies": {
"prop-types": "^15.6.1",
Expand Down
Loading