Merge pull request #1 from YokiToki/v0.0.3

V0.0.3

.eslintrc.json

@@ -0,0 +1,39 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "extends": "prettier",
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "warn",
+      "single"
+    ],
+    "semi": [
+      "warn",
+      "always"
+    ],
+    "curly": [
+      "warn",
+      "all"
+    ]
+  }
+}

.gitignore

@@ -1,5 +1,5 @@
+.DS_Store
 .idea/
+dist/
 release/
-app/build/
-node_modules
-npm-debug.log
+node_modules/

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all"
+}

.yarnclean

@@ -0,0 +1,39 @@
+# test directories
+__tests__
+node_modules/*/test
+node_modules/*/tests
+powered-test
+
+# asset directories
+docs
+doc
+website
+images
+
+# examples
+example
+examples
+
+# code coverage directories
+coverage
+.nyc_output
+
+# build scripts
+Makefile
+Gulpfile.js
+Gruntfile.js
+
+# configs
+.tern-project
+.gitattributes
+.editorconfig
+.*ignore
+.eslintrc
+.jshintrc
+.flowconfig
+.documentup.json
+.yarn-metadata.json
+
+# misc
+*.gz
+*.md

README.md

@@ -23,7 +23,7 @@ For building on Windows you need install build tools.
 As Administrator run:
 
 ```
-> npm i -g --production windows-build-tools
+> yarn global add windows-build-tools
 ```
 
 And set environment variable:
@@ -39,19 +39,25 @@ Maybe you need download [Build Tools for Visual Studio](https://download.visuals
 Start the app in the `dev` environment:
 
 ```
-$ npm start
+$ yarn start
+```
+
+If you got error, about incorrect version of native modules, try run following command:
+
+```
+$ yarn build:deps
 ```
 
 ## Building
 
 To build apps (tar.gz, deb) for the linux:
 
 ```
-$ npm run build-linux
+$ yarn build-linux
 ```
 
 Windows portable:
 
 ```
-> npm run build-windows
+> yarn build-windows
 ```

package.json

@@ -1,36 +1,57 @@
 {
   "name": "interkm",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Client application for read/write rw1990 keys",
-  "main": "main.js",
+  "author": {
+    "name": "Stanislav Tamat",
+    "email": "[email protected]"
+  },
+  "license": "MIT",
+  "homepage": "https://yokitoki.github.io/interkm",
   "scripts": {
-    "serve": "electron .",
-    "start": "cross-env NODE_ENV=development concurrently \"yarn run serve\" \"webpack --config webpack.config.dev.js --colors\"",
-    "build": "cross-env NODE_ENV=production node --trace-warnings ./node_modules/webpack/bin/webpack --config webpack.config.prod.js --colors",
-    "build-windows": "yarn run build && electron-builder --win --x64",
-    "build-linux": "yarn run build && electron-builder --linux",
-    "postinstall": "electron-builder install-app-deps"
+    "start": "electron-webpack dev",
+    "compile": "electron-webpack",
+    "build:windows": "yarn compile && electron-builder --win --x64",
+    "build:linux": "yarn compile && electron-builder --linux",
+    "build:dir": "yarn dist --dir -c.compression=store -c.mac.identity=null",
+    "build:clean": "rm -rf dist/ && rm -rf release/",
+    "build:deps": "electron-builder install-app-deps",
+    "build:publish": "electron-builder --publish onTag"
+  },
+  "electronWebpack": {
+    "commonDistDirectory": "dist",
+    "commonSourceDirectory": "src/common",
+    "main": {
+      "sourceDirectory": "src/main"
+    },
+    "renderer": {
+      "sourceDirectory": "src/renderer",
+      "webpackConfig": "src/renderer/config/webpack.config.js",
+      "template": "src/renderer/public/index.html"
+    }
+  },
+  "babel": {
+    "presets": [
+      "@babel/preset-react",
+      "@babel/preset-env"
+    ]
   },
   "build": {
     "productName": "interkm",
     "appId": "io.github.yokitoki",
-    "files": [
-      "app/build/**/*",
-      "app/src/assets/**/*",
-      "app/index.html",
-      "node_modules/**/*",
-      "main.js",
-      "package.json"
-    ],
+    "publish": {
+      "provider": "github"
+    },
     "win": {
       "target": [
         "portable"
       ]
     },
     "linux": {
       "target": [
+        "tar.gz",
         "deb",
-        "tar.gz"
+        "appImage"
       ],
       "category": "Development"
     },
@@ -39,34 +60,28 @@
       "output": "release"
     }
   },
-  "author": {
-    "name": "Stanislav Tamat",
-    "email": "[email protected]"
-  },
-  "license": "MIT",
-  "homepage": "https://yokitoki.github.io/interkm",
   "dependencies": {
     "bcrypt": "^4.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "serialport": "^8.0.7"
+    "serialport": "^8.0.7",
+    "source-map-support": "^0.5.12"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",
     "@babel/preset-env": "^7.8.4",
     "@babel/preset-react": "^7.8.3",
     "babel-loader": "^8.0.6",
-    "concurrently": "^5.1.0",
-    "cross-env": "^7.0.0",
-    "css-loader": "^3.4.2",
-    "electron": "^7.1.13",
+    "electron": "7.1.13",
     "electron-builder": "^22.3.2",
-    "electron-reload": "^1.5.0",
-    "file-loader": "^5.1.0",
-    "mini-css-extract-plugin": "^0.9.0",
-    "webpack": "^4.41.6",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.10.3"
+    "electron-webpack": "^2.7.4",
+    "eslint": "^5.16.0",
+    "eslint-config-prettier": "^4.2.0",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-react": "^7.12.4",
+    "prettier": "^1.17.0",
+    "prettier-eslint": "^8.8.2",
+    "webpack": "^4.41.6"
   },
   "devEngines": {
     "node": ">=10.16.0",