Merge pull request #91 from Tarnadas/dev

2.2.0

Author: Mario Reder

.babelrc

@@ -2,7 +2,7 @@
   "presets": [
     ["env", {
       "targets": {
-        "electron": "1.8.3"
+        "electron": "2.0.17"
       },
       "useBuiltIns": true
     }]

.eslintrc

@@ -1,7 +1,6 @@
 {
   "parser": "typescript-eslint-parser",
   "extends": [
-    "standard-with-typescript",
     "plugin:react/recommended"
   ],
   "plugins": [
@@ -10,13 +9,17 @@
     "jsdoc"
   ],
   "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
     "ecmaFeatures": {
-      "jsx": true
+      "jsx": true,
+      "modules": true
     }
   },
   "rules": {
     "indent": "off",
     "indent-legacy": ["error", 2, { "SwitchCase": 1 }],
+    "no-unused-vars": "off",
     "react/prop-types": "off",
     "react/jsx-no-target-blank": "off",
     "jsdoc/check-param-names": 1,
@@ -30,11 +33,17 @@
     "jsdoc/require-param-type": 1,
     "jsdoc/require-returns-description": 1,
     "jsdoc/require-returns-type": 1,
-    "typescript/explicit-member-accessibility": "off"
+    "typescript/explicit-member-accessibility": "off",
+    "typescript/no-empty-interface": "off"
   },
   "env": {
     "browser": true,
     "worker": true,
     "jest": true
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
   }
 }

.gitignore

@@ -1,8 +1,8 @@
+.credentials
 /.idea/
 /node_modules/
 /build/*
-#!/build/patches/
-!/build/winprocess/
+!/build/patches/
 !/build/img/
 !/build/styles/
 /build/styles/renderer.*

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Mario Reder
+Copyright (c) 2017-2019 Mario Reder
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build-app.js

@@ -29,5 +29,4 @@ packager({
     fs.createReadStream(file).pipe(fs.createWriteStream(path.join(appPaths[0], `patches/${file.split('patches/')[1]}`)))
   })
   rimraf(path.join(appPaths[0], 'resources/app/patches'), () => {})
-  rimraf(path.join(appPaths[0], 'resources/app/package-lock.json'), () => {})
 })