Merge pull request #23 from axa-group/poveden/npmupdate

Poveden/npmupdate
axa-group · Apr 6, 2020 · 4020bf9 · 4020bf9
2 parents 57b388b + dca0a5b
commit 4020bf9
Show file tree

Hide file tree

Showing 5 changed files with 1,763 additions and 1,014 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [1.1.5](https:/axa-group/arm-template-merge/compare/v1.1.4...v1.1.5) — 2020-04-06
+
+### Security
+
+- Update `npm` dependencies to fix:
+ - [CVE-2020-7598](https:/advisories/GHSA-vh95-rmgr-6w4m)
+ - [CVE-2019-20149](https:/advisories/GHSA-6c8f-qphg-qjgp)
+
 ## [1.1.4](https:/axa-group/arm-template-merge/compare/v1.1.3...v1.1.4) — 2019-10-10
 
 ### Security

diff --git a/bin/arm-template-merge b/bin/arm-template-merge
@@ -19,7 +19,7 @@ const fs = require('fs');
 const path = require('path');
 const util = require('util');
 const fg = require('fast-glob');
-const mergeARMTemplates = require('../');
+const mergeARMTemplates = require('..');
 
 const readFile = util.promisify(fs.readFile);
 const writeFile = util.promisify(fs.writeFile);