From a35b5df6a74e58da8a85e02baa9c569c1e3da5b6 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Mon, 3 Oct 2016 22:29:06 -0700 Subject: [PATCH] (fix) $preRoute merge issue --- legacy/service.middleware/apiviewRoutes.js | 9 +-------- lib/service.middleware/apiviewRoutes.js | 9 +-------- package.json | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/legacy/service.middleware/apiviewRoutes.js b/legacy/service.middleware/apiviewRoutes.js index 3b7da56..fbc4ed3 100644 --- a/legacy/service.middleware/apiviewRoutes.js +++ b/legacy/service.middleware/apiviewRoutes.js @@ -314,14 +314,7 @@ var ApiViewRoutes = function (_ServiceMiddleware) { var deferer = when.defer(); var resolveOutput = function resolveOutput(newOutput) { - // needed to add this customer to work around the issue of lodash converting buffers to arrays - // https://github.com/lodash/lodash/issues/1453 - var out = _.merge(orgOutput, newOutput, function (a, b) { - if (b instanceof Buffer) { - return b; - } - }); - deferer.resolve(out); + deferer.resolve(newOutput); }; // TODO: dependency injection diff --git a/lib/service.middleware/apiviewRoutes.js b/lib/service.middleware/apiviewRoutes.js index 273ddb4..6e6fb89 100644 --- a/lib/service.middleware/apiviewRoutes.js +++ b/lib/service.middleware/apiviewRoutes.js @@ -286,14 +286,7 @@ class ApiViewRoutes extends ServiceMiddleware { var deferer = when.defer(); var resolveOutput = function (newOutput) { - // needed to add this customer to work around the issue of lodash converting buffers to arrays - // https://github.com/lodash/lodash/issues/1453 - var out = _.merge(orgOutput, newOutput, function (a, b) { - if (b instanceof Buffer) { - return b; - } - }); - deferer.resolve(out); + deferer.resolve(newOutput); }; // TODO: dependency injection diff --git a/package.json b/package.json index 929aeb3..9cecfb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hyper.io", - "version": "0.6.4", + "version": "0.6.5", "description": "MicroServices so fast they've gone plaid!", "homepage": "https://github.com/jstty/hyper.io#readme", "keywords": [