From bee082649815d694f075dadf4481589ff90c76de Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Fri, 24 Sep 2021 10:08:29 -0700 Subject: [PATCH] feat(deps): remove 'merge' package This package has an open security vulnerability, but can easily be replaced by the Lodash [_.merge](https://docs-lodash.com/v4/merge/) function. --- package.json | 1 - stream/tag_mapper.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index d5c64221..5cfac8aa 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "iso-639-3": "^1.0.0", "joi": "^14.0.0", "lodash": "^4.17.4", - "merge": "^1.2.0", "pbf2json": "^6.9.0", "pelias-blacklist-stream": "^1.0.0", "pelias-config": "^4.12.0", diff --git a/stream/tag_mapper.js b/stream/tag_mapper.js index 33099690..a670f315 100644 --- a/stream/tag_mapper.js +++ b/stream/tag_mapper.js @@ -6,12 +6,11 @@ const _ = require('lodash'); const through = require('through2'); -const merge = require('merge'); const peliasLogger = require('pelias-logger').get('openstreetmap'); var LOCALIZED_NAME_KEYS = require('../config/localized_name_keys'); var NAME_SCHEMA = require('../schema/name_osm'); -var ADDRESS_SCHEMA = merge( true, false, +var ADDRESS_SCHEMA = _.merge( {}, require('../schema/address_tiger'), require('../schema/address_osm'), require('../schema/address_naptan'),