use Object.assign instead of _.merge

TryGhost · Feb 4, 2018 · 36f6340 · 36f6340
1 parent 4002815
commit 36f6340
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/process-manager.js b/lib/process-manager.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const every = require('lodash/every');
-const merge = require('lodash/merge');
 const requiredMethods = [
     'start',
     'stop',
@@ -70,7 +69,7 @@ class ProcessManager {
     ensureStarted(options) {
         const portPolling = require('./utils/port-polling');
 
-        options = merge({
+        options = Object.assign({
             stopOnError: true,
             port: this.instance.config.get('server.port')
         }, options || {});

diff --git a/lib/utils/port-polling.js b/lib/utils/port-polling.js
@@ -1,11 +1,10 @@
 'use strict';
 
 const net = require('net');
-const merge = require('lodash/merge');
 const errors = require('../errors');
 
 module.exports = function portPolling(options) {
-    options = merge({
+    options = Object.assign({
         timeoutInMS: 1000,
         maxTries: 20,
         delayOnConnectInMS: 3 * 1000,