diff --git a/.gitignore b/.gitignore index 5d06997f1..4752b758a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Node.js /node_modules +# NPM +package-lock.json + # yarn yarn.lock diff --git a/.npmrc b/.npmrc index 6b5f38e89..1dab4ed4c 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ save-exact = true -package-lock = false diff --git a/package.json b/package.json index b6615ed5b..413a6c9b3 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,10 @@ "test": "gulp test", "format": "gulp format" }, + "resolutions": { + "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1", + "video-thumbnail-generator/lodash": "^4.17.11" + }, "dependencies": { "@elastic/elasticsearch": "7.0.0-rc.2", "@fortawesome/fontawesome-svg-core": "1.2.15", @@ -169,6 +173,7 @@ "nested-property": "0.0.7", "node-fetch": "2.5.0", "nodemailer": "6.1.1", + "npm-force-resolutions": "0.0.2", "nprogress": "0.2.0", "object-assign-deep": "0.4.0", "os-utils": "0.0.14",