diff --git a/.editorconfig b/.editorconfig index 5332d2518..7dd300f78 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,6 +22,6 @@ indent_size = 2 indent_style = space indent_size = 2 -[*.{yml,yaml}] +[*.{yml,yaml,json}] indent_style = space indent_size = 2 diff --git a/package-lock.json b/package-lock.json index 90c9744f0..2a6bce24e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4117,6 +4117,12 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-format/-/json-format-1.0.1.tgz", + "integrity": "sha1-FD9n5irxKda//tKIpGJl6iPQ3ww=", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -4449,10 +4455,8 @@ "dev": true }, "node-forge": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", - "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==", - "dev": true + "dev": true, + "version": "0.10.0" }, "node-libs-browser": { "version": "2.2.1", @@ -4511,6 +4515,16 @@ "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", "dev": true }, + "npm-force-resolutions": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/npm-force-resolutions/-/npm-force-resolutions-0.0.3.tgz", + "integrity": "sha512-xbIPAGzD3nrJHDLtnRFt/O83teTA8ju5pWTf8W6OKL4D0XD9EjdRNJhzg4bSXWuucE+l1HGdTpOJR/l1Mi1Ycg==", + "dev": true, + "requires": { + "json-format": "^1.0.1", + "source-map-support": "^0.5.5" + } + }, "nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -4758,7 +4772,7 @@ "json5": "^1.0.1", "micromatch": "^3.0.4", "mkdirp": "^0.5.1", - "node-forge": "^0.7.1", + "node-forge": "0.10.0", "node-libs-browser": "^2.0.0", "opn": "^5.1.0", "postcss": "^7.0.11", @@ -4774,6 +4788,11 @@ "terser": "^3.7.3", "v8-compile-cache": "^2.0.0", "ws": "^5.1.1" + }, + "dependencies": { + "node-forge": { + "version": "0.10.0" + } } }, "parse-asn1": { @@ -7012,4 +7031,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 2baa4a8ba..ee2bb7e9a 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,15 @@ "scripts": { "dev": "rimraf dist; parcel watch assets/index.html --public-url /dist/", "build": "rimraf dist; parcel build assets/index.html --public-url /dist/", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "fix-audit": "npm-force-resolutions" }, "author": "", "license": "MIT", "devDependencies": { "parcel-bundler": "^1.12.4", - "rimraf": "^3.0.2" + "rimraf": "^3.0.2", + "npm-force-resolutions": "0.0.3" }, "engines": { "npm": "^6.0.0", @@ -29,5 +31,8 @@ "popper.js": "^1.16.1", "vue": "^2.6.12", "vue-router": "^3.4.7" + }, + "resolutions": { + "node-forge": "0.10.0" } }