From 11e42a4ce977a91a0df39ec1755c0492802f19e7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 21 Jan 2018 15:41:56 +0200
Subject: [PATCH] Move deps to root

---
 client/package.json      | 13 +------------
 client/webpack.config.js |  2 +-
 core/package.json        |  9 +--------
 package.json             | 24 ++++++++++++++++++++++--
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/client/package.json b/client/package.json
index b6b44845..4ce1f4ab 100644
--- a/client/package.json
+++ b/client/package.json
@@ -16,18 +16,7 @@
   },
   "private": false,
   "devDependencies": {
-    "webpack": "^3.10.0",
-    "babel-core": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-loader": "^7.1.2",
-    "jquery": "^3.2.1",
-    "vue": "^2.5.13",
-    "vue-loader": "^13.7.0",
-    "vue-template-compiler": "^2.5.13",
-    "css-loader": "^0.28.9",
-    "sass-loader": "^6.0.6",
-    "node-sass": "^4.7.2"
+    
   },
   "scripts": {
     "build": "webpack --progress --colors",
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 666dc045..31f20f8b 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = {
     },
     resolve: {
         alias: {
-            vue$: path.resolve('node_modules', 'vue', 'dist', 'vue.esm.js')
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
         }
     }
    /* resolve: {
diff --git a/core/package.json b/core/package.json
index 95aa5a2a..a607036b 100644
--- a/core/package.json
+++ b/core/package.json
@@ -16,14 +16,7 @@
   },
   "private": false,
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "electron": "^1.7.10",
-    "gulp": "^3.9.1",
-    "gulp-babel": "^7.0.0",
-    "pump": "^2.0.0",
-    "gulp-plumber": "^1.2.0",
-    "gulp-watch": "^5.0.0"
+    
   },
   "scripts": {
     "build": "gulp build",
diff --git a/package.json b/package.json
index 6db66b8b..c0cfc6cd 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "0.4.0",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "index.js",
+  "main": "./core/index.js",
   "contributors": [
     "Jiiks",
     "Pohky"
@@ -15,7 +15,27 @@
     "url": "https://github.com/Jiiks/BetterDiscordApp.git"
   },
   "private": false,
-  "devDependencies": {},
+  "devDependencies": {
+    "webpack": "^3.10.0",
+    "babel-core": "^6.26.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
+    "babel-loader": "^7.1.2",
+    "jquery": "^3.2.1",
+    "vue": "^2.5.13",
+    "vue-loader": "^13.7.0",
+    "vue-template-compiler": "^2.5.13",
+    "css-loader": "^0.28.9",
+    "sass-loader": "^6.0.6",
+    "node-sass": "^4.7.2",
+    "electron": "^1.7.10",
+    "gulp": "^3.9.1",
+    "gulp-babel": "^7.0.0",
+    "pump": "^2.0.0",
+    "gulp-plumber": "^1.2.0",
+    "gulp-watch": "^5.0.0"
+  },
   "scripts": {
     "build": "cd ./client && npm run build && cd ../core && npm run build",
     "watch_client": "cd ./client && npm run watch",