This commit is contained in:
Mark Cheret 2021-05-11 20:49:28 +02:00
parent 6ac52e4325
commit bae3b0b377
No known key found for this signature in database
GPG key ID: C0779E8358FE7CA4
2 changed files with 22 additions and 6 deletions

27
package-lock.json generated
View file

@ -18,6 +18,7 @@
"husky": "^4.3.8", "husky": "^4.3.8",
"lint-staged": "^10.5.4", "lint-staged": "^10.5.4",
"markdownlint-cli": "^0.27.1", "markdownlint-cli": "^0.27.1",
"merge": "^2.1.1",
"minify": "^7.0.1", "minify": "^7.0.1",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
"prettier": "^2.2.1", "prettier": "^2.2.1",
@ -3879,6 +3880,12 @@
"merge": "^1.2.1" "merge": "^1.2.1"
} }
}, },
"node_modules/find-node-modules/node_modules/merge": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
"integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
"dev": true
},
"node_modules/find-root": { "node_modules/find-root": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@ -6398,9 +6405,9 @@
} }
}, },
"node_modules/merge": { "node_modules/merge": {
"version": "1.2.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
"integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
"dev": true "dev": true
}, },
"node_modules/merge-stream": { "node_modules/merge-stream": {
@ -18264,6 +18271,14 @@
"requires": { "requires": {
"findup-sync": "^3.0.0", "findup-sync": "^3.0.0",
"merge": "^1.2.1" "merge": "^1.2.1"
},
"dependencies": {
"merge": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
"integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
"dev": true
}
} }
}, },
"find-root": { "find-root": {
@ -20167,9 +20182,9 @@
} }
}, },
"merge": { "merge": {
"version": "1.2.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
"integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==",
"dev": true "dev": true
}, },
"merge-stream": { "merge-stream": {

View file

@ -60,6 +60,7 @@
"husky": "^4.3.8", "husky": "^4.3.8",
"lint-staged": "^10.5.4", "lint-staged": "^10.5.4",
"markdownlint-cli": "^0.27.1", "markdownlint-cli": "^0.27.1",
"merge": "^2.1.1",
"minify": "^7.0.1", "minify": "^7.0.1",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
"prettier": "^2.2.1", "prettier": "^2.2.1",