From 876fc70af1417aa16e599d8b6ca29b9b548a3c5a Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 29 Jun 2018 15:30:07 +0200 Subject: [PATCH 1/4] Change some metadata --- package.json | 6 +++--- packages/light-hoc/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2c83689a..58e493a7 100644 --- a/package.json +++ b/package.json @@ -41,11 +41,11 @@ "scripts": { "build": "lerna run build", "preelectron": "yarn build", - "electron": "cd packages/fether-electron && yarn electron", + "electron": "lerna run electron --scope fether", "lint": "lerna run lint --parallel", "prepackage": "yarn build", - "package": "cd packages/fether-electron && yarn package", - "release": "cd packages/fether-electron && yarn release", + "package": "lerna run package --scope fether", + "release": "lerna run release --scope fether", "start": "npm-run-all -l -p start-*", "start-electron": "cd packages/fether-electron && yarn start", "start-hoc": "cd packages/light-hoc && yarn start", diff --git a/packages/light-hoc/README.md b/packages/light-hoc/README.md index 41baba6a..3c0543eb 100644 --- a/packages/light-hoc/README.md +++ b/packages/light-hoc/README.md @@ -1,5 +1,5 @@ # light-hoc -A HOC to use @parity/light.js with React. Basically the equivalent of oo7-react for Observables. +A HOC to use [@parity/light.js](https://github.com/parity-js/light.js) with React. Basically the equivalent of oo7-react for Observables. Probably this should go inside its own repo. -- GitLab From 2a328480b4a9ed30bb01d8558fbf1165f455b4ad Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 29 Jun 2018 15:38:39 +0200 Subject: [PATCH 2/4] Add basic readme files --- packages/fether-electron/README.md | 3 +++ packages/fether-react/README.md | 3 +++ .../fether-react/src/utils/withBalance.js | 2 +- packages/fether-ui/README.md | 4 ++++ packages/light-hoc/README.md | 20 +++++++++++++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packages/fether-electron/README.md create mode 100644 packages/fether-react/README.md diff --git a/packages/fether-electron/README.md b/packages/fether-electron/README.md new file mode 100644 index 00000000..6a6b2371 --- /dev/null +++ b/packages/fether-electron/README.md @@ -0,0 +1,3 @@ +# fether-electron + +Electron wrapper around `fether-react`. diff --git a/packages/fether-react/README.md b/packages/fether-react/README.md new file mode 100644 index 00000000..5d5d37ef --- /dev/null +++ b/packages/fether-react/README.md @@ -0,0 +1,3 @@ +# fether-react + +Fether React SPA app. diff --git a/packages/fether-react/src/utils/withBalance.js b/packages/fether-react/src/utils/withBalance.js index 360a704b..e852cadb 100644 --- a/packages/fether-react/src/utils/withBalance.js +++ b/packages/fether-react/src/utils/withBalance.js @@ -19,7 +19,7 @@ import light from 'light-hoc'; * A HOC on light.js to get the current balance. * * @example - * @withBalance + * @withBalance() * class MyComponent extends React.Component{ * * } diff --git a/packages/fether-ui/README.md b/packages/fether-ui/README.md index 8080a9cc..1cc2a9c7 100644 --- a/packages/fether-ui/README.md +++ b/packages/fether-ui/README.md @@ -1,3 +1,7 @@ # fether-ui UI components used in Fether. + +## TODO + +Use Semantic UI (or another UI libray) as a base, instead of recoding everything ourselves. diff --git a/packages/light-hoc/README.md b/packages/light-hoc/README.md index 3c0543eb..83bada42 100644 --- a/packages/light-hoc/README.md +++ b/packages/light-hoc/README.md @@ -3,3 +3,23 @@ A HOC to use [@parity/light.js](https://github.com/parity-js/light.js) with React. Basically the equivalent of oo7-react for Observables. Probably this should go inside its own repo. + +## Usage + +The libray provides a higher-order component to use these Observables easily with React apps. + +```javascript +import light from '???'; // ??? to be decided +import { syncing$ } from '@parity/light.js'; + +@light({ + syncingVariable: syncing$ +}) +class MyClass extends React.Component { + render() { + return
{JSON.stringify(this.props.syncingVariable)}
; + } +} +``` + +The UI will automatically update when the syncing state changes. -- GitLab From 67e282d8f53ea79d8c81430b065c4398073c8ecd Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 29 Jun 2018 15:44:34 +0200 Subject: [PATCH 3/4] Disable GPU on linux (fix #85) --- packages/fether-electron/src/main/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/fether-electron/src/main/index.js b/packages/fether-electron/src/main/index.js index 63e6024c..5cf7436e 100644 --- a/packages/fether-electron/src/main/index.js +++ b/packages/fether-electron/src/main/index.js @@ -26,6 +26,12 @@ const { app, BrowserWindow, ipcMain, session } = electron; let mainWindow; const pino = Pino(); +// Disable gpu acceleration on linux +// https://github.com/parity-js/fether/issues/85 +if (!['darwin', 'win32'].includes(process.platform)) { + app.disableHardwareAcceleration(); +} + function createWindow () { pino.info(`Starting ${productName}...`); mainWindow = new BrowserWindow({ -- GitLab From bda636ca143af472b1ea52f8c98ab92365472177 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 29 Jun 2018 15:51:14 +0200 Subject: [PATCH 4/4] Use same linter for all --- package.json | 6 ++++-- packages/fether-electron/package.json | 3 --- packages/fether-react/config-overrides.js | 2 +- packages/fether-react/package.json | 5 +---- packages/fether-ui/package.json | 5 +---- packages/light-hoc/package.json | 5 +---- packages/parity-electron/package.json | 8 ++++---- yarn.lock | 2 +- 8 files changed, 13 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 58e493a7..195f50c0 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "build": "lerna run build", "preelectron": "yarn build", "electron": "lerna run electron --scope fether", - "lint": "lerna run lint --parallel", + "lint": "semistandard 'packages/**/*.js' --parser babel-eslint", "prepackage": "yarn build", "package": "lerna run package --scope fether", "release": "lerna run release --scope fether", @@ -55,7 +55,9 @@ "test": "lerna run test --parallel" }, "devDependencies": { + "babel-eslint": "^8.2.5", "lerna": "^2.11.0", - "npm-run-all": "^4.1.2" + "npm-run-all": "^4.1.2", + "semistandard": "^12.0.1" } } diff --git a/packages/fether-electron/package.json b/packages/fether-electron/package.json index aad76015..ef5365c8 100644 --- a/packages/fether-electron/package.json +++ b/packages/fether-electron/package.json @@ -31,7 +31,6 @@ "prebuild": "copyfiles -u 2 \"../fether-react/build/**/*\" static/ && ./scripts/fixElectronBug.sh", "build": "electron-webpack", "electron": "electron dist/main/main.js", - "lint": "semistandard 'src/**/*.js' --parser babel-eslint", "prepackage": "./scripts/revertElectronBug.sh", "package": "electron-builder", "prerelease": "./scripts/revertElectronBug.sh", @@ -49,13 +48,11 @@ "source-map-support": "^0.5.6" }, "devDependencies": { - "babel-eslint": "^8.2.3", "copyfiles": "^2.0.0", "cross-env": "^5.2.0", "electron": "^2.0.2", "electron-builder": "^20.15.1", "electron-webpack": "^2.1.2", - "semistandard": "^12.0.1", "webpack": "^4.7.0" } } diff --git a/packages/fether-react/config-overrides.js b/packages/fether-react/config-overrides.js index 3718e65b..bb3a6bfb 100644 --- a/packages/fether-react/config-overrides.js +++ b/packages/fether-react/config-overrides.js @@ -1,7 +1,7 @@ const { injectBabelPlugin } = require('react-app-rewired'); /* config-overrides.js */ -module.exports = function override(config) { +module.exports = function override (config) { // use the MobX rewire to use @decorators config = injectBabelPlugin('transform-decorators-legacy', config); diff --git a/packages/fether-react/package.json b/packages/fether-react/package.json index e5e7b473..8915aad5 100644 --- a/packages/fether-react/package.json +++ b/packages/fether-react/package.json @@ -28,7 +28,6 @@ "build": "npm-run-all build-*", "build-css": "node-sass-chokidar src/ -o src/", "build-js": "react-app-rewired build", - "lint": "semistandard 'src/**/*.js' --parser babel-eslint", "start": "npm-run-all -p start-*", "start-css": "npm run build-css -- --watch --recursive", "start-js": "react-app-rewired start", @@ -56,12 +55,10 @@ "rxjs": "^6.2.0" }, "devDependencies": { - "babel-eslint": "^8.2.3", "babel-plugin-transform-decorators-legacy": "^1.3.5", "node-sass": "^4.9.0", "node-sass-chokidar": "^1.2.2", "npm-run-all": "^4.1.2", - "react-app-rewired": "^1.5.2", - "semistandard": "^12.0.1" + "react-app-rewired": "^1.5.2" } } diff --git a/packages/fether-ui/package.json b/packages/fether-ui/package.json index 9096b9b1..14ee7376 100644 --- a/packages/fether-ui/package.json +++ b/packages/fether-ui/package.json @@ -28,7 +28,6 @@ "scripts": { "prebuild": "rimraf lib", "build": "babel src --out-dir lib", - "lint": "semistandard 'src/**/*.js' --parser babel-eslint", "start": "yarn build --watch" }, "dependencies": { @@ -42,11 +41,9 @@ "@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-eslint": "^8.2.3", "prop-types": "^15.6.1", "react": "^16.4.0", - "rimraf": "^2.6.2", - "semistandard": "^12.0.1" + "rimraf": "^2.6.2" }, "peerDependencies": { "prop-types": "^15.6.1", diff --git a/packages/light-hoc/package.json b/packages/light-hoc/package.json index 3f22122c..dd1024bc 100644 --- a/packages/light-hoc/package.json +++ b/packages/light-hoc/package.json @@ -28,7 +28,6 @@ "scripts": { "prebuild": "rimraf lib", "build": "babel src --out-dir lib", - "lint": "semistandard 'src/**/*.js' --parser babel-eslint", "start": "yarn build --watch" }, "peerDependencies": { @@ -41,8 +40,6 @@ "@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-eslint": "^8.2.3", - "rimraf": "^2.6.2", - "semistandard": "^12.0.1" + "rimraf": "^2.6.2" } } diff --git a/packages/parity-electron/package.json b/packages/parity-electron/package.json index 32f6371d..94bdd479 100644 --- a/packages/parity-electron/package.json +++ b/packages/parity-electron/package.json @@ -28,7 +28,6 @@ "scripts": { "prebuild": "rimraf lib", "build": "babel src --out-dir lib", - "lint": "semistandard 'src/**/*.js' --parser babel-eslint", "start": "yarn build --watch" }, "dependencies": { @@ -42,8 +41,9 @@ }, "devDependencies": { "@babel/plugin-transform-runtime": "^7.0.0-beta.51", - "electron": "^2.0.2", - "semistandard": "^12.0.1" + "electron": "^2.0.2" }, - "peerDependencies": {} + "peerDependencies": { + "electron": "^2.0.3" + } } diff --git a/yarn.lock b/yarn.lock index 41cf72b7..bdc3dfe2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1657,7 +1657,7 @@ babel-eslint@7.2.3: babel-types "^6.23.0" babylon "^6.17.0" -babel-eslint@^8.2.3: +babel-eslint@^8.2.5: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.5.tgz#dc2331c259d36782aa189da510c43dedd5adc7a3" dependencies: -- GitLab