From 147e57817a7d8b7cea903b02334c0e654beaa369 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 15 Aug 2017 17:26:18 -0700
Subject: [PATCH] Fix tests

---
 app/package.json                     | 20 +++++++++++++++++++-
 package-lock.json                    | 14 +++++++-------
 package.json                         | 22 ++--------------------
 webpack/webpack.config.base.babel.js |  7 ++++---
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/app/package.json b/app/package.json
index 00ffdad01..5c0dc78ae 100644
--- a/app/package.json
+++ b/app/package.json
@@ -7,5 +7,23 @@
   "description": "Debug APIs like a human, not a robot",
   "homepage": "https://insomnia.rest",
   "author": "Insomnia <support@insomnia.rest>",
-  "main": "main.min.js"
+  "main": "main.min.js",
+  "dependencies": {
+    "electron-context-menu": "^0.9.0",
+    "electron-devtools-installer": "^2.2.0",
+    "electron-squirrel-startup": "^1.0.0",
+    "deep-equal": "^1.0.1",
+    "hkdf": "^0.0.2",
+    "httpsnippet": "git://github.com/getinsomnia/httpsnippet.git#85e00f4d2574ff2457f3de21dd3faf50db4ab74a",
+    "insomnia-importers": "^1.3.9",
+    "jsonpath": "^0.2.11",
+    "mkdirp": "^0.5.1",
+    "nedb": "^1.8.0",
+    "node-forge": "^0.7.0",
+    "node-libcurl": "git://github.com/getinsomnia/node-libcurl.git#d3ee4d436a174c2bd5f2dc89b165257a5cac32ea",
+    "srp-js": "^0.2.0",
+    "tar": "^3.1.7",
+    "tough-cookie": "^2.3.1",
+    "vkbeautify": "^0.99.1"
+  }
 }
diff --git a/package-lock.json b/package-lock.json
index 7e9b243e0..50b428e5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@types/node": {
-      "version": "7.0.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz",
-      "integrity": "sha512-7+0Ai8r8Xt6NNVM0Eo+XSqiZsBUYXg2yrCwyBhQzSfFHTGQWzFv/pk9106vPR8HWjKmGK+zzUj244POs4xfO2g==",
+      "version": "7.0.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.41.tgz",
+      "integrity": "sha512-m0kvfhUKxOig8kono87g4iRrhdI4cJL+q7VansizNvbOQXZ3wMc+IcpKtzGPTNd/UA3TgqgNXOXoetlRvzQrrw==",
       "dev": true
     },
     "7zip": {
@@ -3002,12 +3002,12 @@
       "dev": true
     },
     "electron": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-1.6.11.tgz",
-      "integrity": "sha1-vnnA69zv7bW/KBF0CYAPpTus7/o=",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.5.tgz",
+      "integrity": "sha1-BloxAr+LhxAt9QxQmF/v5sVpBFs=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.32",
+        "@types/node": "7.0.41",
         "electron-download": "3.3.0",
         "extract-zip": "1.6.5"
       }
diff --git a/package.json b/package.json
index a0bc9fa06..79db32ba0 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "concurrently": "^2.0.0",
     "cross-env": "^2.0.0",
     "css-loader": "^0.26.2",
-    "electron": "^1.6.11",
+    "electron": "^1.7.5",
     "electron-builder": "^10.17.3",
     "electron-rebuild": "^1.5.7",
     "eslint": "^3.16.1",
@@ -203,23 +203,5 @@
     "webpack-dev-server": "^2.4.1",
     "webpack-hot-middleware": "^2.17.1",
     "webpack-target-electron-renderer": "^0.4.0"
-  },
-  "externals": [
-    "electron-context-menu",
-    "electron-devtools-installer",
-    "electron-squirrel-startup",
-    "deep-equal",
-    "hkdf",
-    "httpsnippet",
-    "insomnia-importers",
-    "jsonpath",
-    "mkdirp",
-    "nedb",
-    "node-forge",
-    "node-libcurl",
-    "srp-js",
-    "tar",
-    "tough-cookie",
-    "vkbeautify"
-  ]
+  }
 }
diff --git a/webpack/webpack.config.base.babel.js b/webpack/webpack.config.base.babel.js
index ced4ccd74..9fde3ba55 100644
--- a/webpack/webpack.config.base.babel.js
+++ b/webpack/webpack.config.base.babel.js
@@ -1,6 +1,6 @@
 const webpack = require('webpack');
 const path = require('path');
-const pkg = require('../package.json');
+const pkg = require('../app/package.json');
 
 module.exports = {
   devtool: 'source-map',
@@ -54,11 +54,12 @@ module.exports = {
   },
   externals: [
     // Omit all dependencies in app/package.json (we want them loaded at runtime via NodeJS)
-    ...pkg.externals,
+    ...Object.keys(pkg.dependencies),
 
     // To get jsonlint working...
     'file', 'system'
   ],
-  plugins: [],
+  plugins: [
+  ],
   target: 'electron-renderer'
 };