Merge pull request #323 from buttercup/unified-window

Unified Window

.babelrc

@@ -16,15 +16,17 @@
     "polished",
     "transform-object-rest-spread",
     "transform-strict-mode",
-    "transform-class-properties"
+    "transform-class-properties",
+    "jsx-control-statements"
   ],
   "env": {
   	"production": {
   		"presets": ["react-optimize"],
   		"plugins": [
   			"transform-remove-console",
   			"transform-remove-debugger",
-  			"dev-expression"
+        "dev-expression",
+        "jsx-control-statements"
   		]
   	},
     "node": {
@@ -35,7 +37,7 @@
     },
     "development": {
       "plugins": [
-        "react-hot-loader/babel"
+        // "react-hot-loader/babel"
       ]
     }
   }

.eslintrc

@@ -1,8 +1,12 @@
 {
   "parser": "babel-eslint",
+  "plugins": [
+    "jsx-control-statements"
+  ],
   "extends": [
     "standard",
-    "standard-react"
+    "standard-react",
+    "plugin:jsx-control-statements/recommended"
   ],
   "env": {
     "node": true,

app/package.json

@@ -1,13 +1,14 @@
 {
   "name": "buttercup",
-  "version": "0.18.2",
+  "version": "0.20.0",
   "productName": "Buttercup",
   "main": "./dist/app.js",
   "description": "Free and Open Source password vault",
   "license": "GPL-3.0",
   "homepage": "https://buttercup.pw",
   "author": "Buttercup <[email protected]>",
   "dependencies": {
+    "conf": "~1.0.0",
     "buttercup-importer": "~0.9.2",
     "dropbox": "^2.3.0",
     "webdav": "~0.10.0",

config/webpack.config.base.js

@@ -33,6 +33,6 @@ module.exports = {
   plugins: [
   ],
   externals: [
-    'buttercup-importer', 'zxcvbn', 'dropbox', 'webdav'
+    'buttercup-importer', 'zxcvbn', 'dropbox', 'webdav', 'conf'
   ]
 };

config/webpack.config.development.js

@@ -9,8 +9,6 @@ module.exports = merge(baseConfig, {
   entry: {
     main: [
       'react-hot-loader/patch',
-      'webpack-dev-server/client?http://localhost:3000/',
-      'webpack/hot/only-dev-server',
       resolve(__dirname, '../src/renderer/index')
     ],
     fileManager: resolve(__dirname, '../src/renderer/file-manager')