Skip to content

Commit 61a1c09

Browse files
authored
Merge pull request #1 from JohnKis/master
Remove dependency on merge to fix npm audit vulnerability
2 parents 9d469e2 + 6b51cc2 commit 61a1c09

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"app-root-path": "^2.2.1",
1313
"cheerio": "^1.0.0-rc.2",
1414
"clean-css": "^4.2.1",
15-
"glob": "^7.1.3",
16-
"merge": "^1.2.1"
15+
"glob": "^7.1.3"
1716
},
1817
"directories": {
1918
"test": "test"

src/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const cheerio = require('cheerio');
22
const fs = require('fs');
33
const path = require('path');
44
const glob = require('glob');
5-
const merge = require('merge');
65
const cleanCSS = require('clean-css');
76
var appRoot = require('app-root-path');
87

@@ -28,7 +27,7 @@ module.exports = function (options) {
2827

2928
let appRootPath = appRoot.path;
3029

31-
let opts = merge(defaultOpts, options);
30+
let opts = Object.assign(defaultOpts, options);
3231
let root = path.resolve(appRootPath, opts.coverageDir);
3332
let globPattern = root + opts.pattern;
3433
// console.log(globPattern);

0 commit comments

Comments
 (0)