Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into devel-v6

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-05-24 20:06:53 +02:00
parent 96730e6a8b eac964511d
commit 756190b65a
4 changed files with 338 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

546
package-lock.json generated
View File

@@ -14,7 +14,7 @@
"postcss": "^8.4.23", "postcss": "^8.4.23",
"postcss-cli": "^10.1.0", "postcss-cli": "^10.1.0",
"prettier": "2.8.8", "prettier": "2.8.8",
"xo": "^0.53.1" "xo": "^0.54.0"
} }
}, },
"node_modules/@babel/code-frame": { "node_modules/@babel/code-frame": {
@@ -123,6 +123,30 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
"dev": true,
"dependencies": {
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"peerDependencies": {
"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
}
},
"node_modules/@eslint-community/regexpp": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
"integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
"dev": true,
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/@eslint/eslintrc": { "node_modules/@eslint/eslintrc": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
@@ -146,6 +170,15 @@
"url": "https://opencollective.com/eslint" "url": "https://opencollective.com/eslint"
} }
}, },
"node_modules/@eslint/js": {
"version": "8.38.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
"integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
"node_modules/@humanwhocodes/config-array": { "node_modules/@humanwhocodes/config-array": {
"version": "0.11.8", "version": "0.11.8",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -291,9 +324,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/eslint": { "node_modules/@types/eslint": {
"version": "7.29.0", "version": "8.37.0",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz",
"integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==", "integrity": "sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/estree": "*", "@types/estree": "*",
@@ -348,12 +381,6 @@
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
"dev": true "dev": true
}, },
"node_modules/@types/parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -699,6 +726,24 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/array.prototype.flatmap": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
"integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
"es-abstract": "^1.20.4",
"es-shim-unscopables": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/arrify": { "node_modules/arrify": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz", "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz",
@@ -1008,9 +1053,9 @@
} }
}, },
"node_modules/ci-info": { "node_modules/ci-info": {
"version": "3.7.1", "version": "3.8.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
"integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -1101,28 +1146,21 @@
"dev": true "dev": true
}, },
"node_modules/cosmiconfig": { "node_modules/cosmiconfig": {
"version": "7.1.0", "version": "8.1.3",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/parse-json": "^4.0.0",
"import-fresh": "^3.2.1", "import-fresh": "^3.2.1",
"js-yaml": "^4.1.0",
"parse-json": "^5.0.0", "parse-json": "^5.0.0",
"path-type": "^4.0.0", "path-type": "^4.0.0"
"yaml": "^1.10.0"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=14"
} },
}, "funding": {
"node_modules/cosmiconfig/node_modules/yaml": { "url": "https://github.com/sponsors/d-fischer"
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"dev": true,
"engines": {
"node": ">= 6"
} }
}, },
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
@@ -1443,12 +1481,15 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.31.0", "version": "8.38.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
"integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==", "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.4.1", "@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.4.0",
"@eslint/eslintrc": "^2.0.2",
"@eslint/js": "8.38.0",
"@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/config-array": "^0.11.8",
"@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8", "@nodelib/fs.walk": "^1.2.8",
@@ -1459,10 +1500,9 @@
"doctrine": "^3.0.0", "doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.1", "eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.4.0",
"eslint-visitor-keys": "^3.3.0", "espree": "^9.5.1",
"espree": "^9.4.0", "esquery": "^1.4.2",
"esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1", "file-entry-cache": "^6.0.1",
@@ -1483,7 +1523,6 @@
"minimatch": "^3.1.2", "minimatch": "^3.1.2",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
"regexpp": "^3.2.0",
"strip-ansi": "^6.0.1", "strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0", "strip-json-comments": "^3.1.0",
"text-table": "^0.2.0" "text-table": "^0.2.0"
@@ -1499,9 +1538,9 @@
} }
}, },
"node_modules/eslint-config-prettier": { "node_modules/eslint-config-prettier": {
"version": "8.6.0", "version": "8.8.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",
"integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==",
"dev": true, "dev": true,
"bin": { "bin": {
"eslint-config-prettier": "bin/cli.js" "eslint-config-prettier": "bin/cli.js"
@@ -1529,35 +1568,36 @@
} }
}, },
"node_modules/eslint-formatter-pretty": { "node_modules/eslint-formatter-pretty": {
"version": "4.1.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz", "resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-5.0.0.tgz",
"integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==", "integrity": "sha512-Uick451FoL22/wXqyScX3inW8ZlD/GQO7eFXj3bqb6N/ZtuuF00/CwSNIKLbFCJPrX5V4EdQBSgJ/UVnmLRnug==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint": "^7.2.13", "@types/eslint": "^8.0.0",
"ansi-escapes": "^4.2.1", "ansi-escapes": "^4.2.1",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"eslint-rule-docs": "^1.1.5", "eslint-rule-docs": "^1.1.235",
"log-symbols": "^4.0.0", "log-symbols": "^4.0.0",
"plur": "^4.0.0", "plur": "^4.0.0",
"string-width": "^4.2.0", "string-width": "^4.2.0",
"supports-hyperlinks": "^2.0.0" "supports-hyperlinks": "^2.0.0"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=14.16"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/eslint-import-resolver-node": { "node_modules/eslint-import-resolver-node": {
"version": "0.3.6", "version": "0.3.7",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"debug": "^3.2.7", "debug": "^3.2.7",
"resolve": "^1.20.0" "is-core-module": "^2.11.0",
"resolve": "^1.22.1"
} }
}, },
"node_modules/eslint-import-resolver-node/node_modules/debug": { "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -1640,9 +1680,9 @@
} }
}, },
"node_modules/eslint-plugin-ava": { "node_modules/eslint-plugin-ava": {
"version": "13.2.0", "version": "14.0.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-ava/-/eslint-plugin-ava-13.2.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-ava/-/eslint-plugin-ava-14.0.0.tgz",
"integrity": "sha512-i5B5izsEdERKQLruk1nIWzTTE7C26/ju8qQf7JeyRv32XT2lRMW0zMFZNhIrEf5/5VvpSz2rqrV7UcjClGbKsw==", "integrity": "sha512-XmKT6hppaipwwnLVwwvQliSU6AF1QMHiNoLD5JQfzhUhf0jY7CO0O624fQrE+Y/fTb9vbW8r77nKf7M/oHulxw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"enhance-visitors": "^1.0.0", "enhance-visitors": "^1.0.0",
@@ -1655,10 +1695,10 @@
"resolve-from": "^5.0.0" "resolve-from": "^5.0.0"
}, },
"engines": { "engines": {
"node": ">=12.22 <13 || >=14.17 <15 || >=16.4" "node": ">=14.17 <15 || >=16.4"
}, },
"peerDependencies": { "peerDependencies": {
"eslint": ">=7.22.0" "eslint": ">=8.26.0"
} }
}, },
"node_modules/eslint-plugin-ava/node_modules/resolve-from": { "node_modules/eslint-plugin-ava/node_modules/resolve-from": {
@@ -1764,23 +1804,25 @@
} }
}, },
"node_modules/eslint-plugin-import": { "node_modules/eslint-plugin-import": {
"version": "2.26.0", "version": "2.27.5",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
"integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"array-includes": "^3.1.4", "array-includes": "^3.1.6",
"array.prototype.flat": "^1.2.5", "array.prototype.flat": "^1.3.1",
"debug": "^2.6.9", "array.prototype.flatmap": "^1.3.1",
"debug": "^3.2.7",
"doctrine": "^2.1.0", "doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-node": "^0.3.7",
"eslint-module-utils": "^2.7.3", "eslint-module-utils": "^2.7.4",
"has": "^1.0.3", "has": "^1.0.3",
"is-core-module": "^2.8.1", "is-core-module": "^2.11.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
"minimatch": "^3.1.2", "minimatch": "^3.1.2",
"object.values": "^1.1.5", "object.values": "^1.1.6",
"resolve": "^1.22.0", "resolve": "^1.22.1",
"semver": "^6.3.0",
"tsconfig-paths": "^3.14.1" "tsconfig-paths": "^3.14.1"
}, },
"engines": { "engines": {
@@ -1791,12 +1833,12 @@
} }
}, },
"node_modules/eslint-plugin-import/node_modules/debug": { "node_modules/eslint-plugin-import/node_modules/debug": {
"version": "2.6.9", "version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"ms": "2.0.0" "ms": "^2.1.1"
} }
}, },
"node_modules/eslint-plugin-import/node_modules/doctrine": { "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -1811,16 +1853,19 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/eslint-plugin-import/node_modules/ms": { "node_modules/eslint-plugin-import/node_modules/semver": {
"version": "2.0.0", "version": "6.3.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true "dev": true,
"bin": {
"semver": "bin/semver.js"
}
}, },
"node_modules/eslint-plugin-n": { "node_modules/eslint-plugin-n": {
"version": "15.6.0", "version": "15.7.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
"integrity": "sha512-Hd/F7wz4Mj44Jp0H6Jtty13NcE69GNTY0rVlgTIj1XBnGGVI6UTdDrpE6vqu3AHo07bygq/N+7OH/lgz1emUJw==", "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"builtins": "^5.0.1", "builtins": "^5.0.1",
@@ -1879,24 +1924,26 @@
} }
}, },
"node_modules/eslint-plugin-unicorn": { "node_modules/eslint-plugin-unicorn": {
"version": "44.0.2", "version": "46.0.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-44.0.2.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-46.0.0.tgz",
"integrity": "sha512-GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w==", "integrity": "sha512-j07WkC+PFZwk8J33LYp6JMoHa1lXc1u6R45pbSAipjpfpb7KIGr17VE2D685zCxR5VL4cjrl65kTJflziQWMDA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/helper-validator-identifier": "^7.19.1", "@babel/helper-validator-identifier": "^7.19.1",
"ci-info": "^3.4.0", "@eslint-community/eslint-utils": "^4.1.2",
"ci-info": "^3.6.1",
"clean-regexp": "^1.0.0", "clean-regexp": "^1.0.0",
"eslint-utils": "^3.0.0",
"esquery": "^1.4.0", "esquery": "^1.4.0",
"indent-string": "^4.0.0", "indent-string": "^4.0.0",
"is-builtin-module": "^3.2.0", "is-builtin-module": "^3.2.0",
"jsesc": "^3.0.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"read-pkg-up": "^7.0.1", "read-pkg-up": "^7.0.1",
"regexp-tree": "^0.1.24", "regexp-tree": "^0.1.24",
"regjsparser": "^0.9.1",
"safe-regex": "^2.1.1", "safe-regex": "^2.1.1",
"semver": "^7.3.7", "semver": "^7.3.8",
"strip-indent": "^3.0.0" "strip-indent": "^3.0.0"
}, },
"engines": { "engines": {
@@ -1906,7 +1953,7 @@
"url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1" "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
}, },
"peerDependencies": { "peerDependencies": {
"eslint": ">=8.23.1" "eslint": ">=8.28.0"
} }
}, },
"node_modules/eslint-rule-docs": { "node_modules/eslint-rule-docs": {
@@ -1956,21 +2003,47 @@
} }
}, },
"node_modules/eslint-visitor-keys": { "node_modules/eslint-visitor-keys": {
"version": "3.3.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"funding": {
"url": "https://opencollective.com/eslint"
}
},
"node_modules/eslint/node_modules/@eslint/eslintrc": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
"integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
"espree": "^9.5.1",
"globals": "^13.19.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
"js-yaml": "^4.1.0",
"minimatch": "^3.1.2",
"strip-json-comments": "^3.1.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"funding": {
"url": "https://opencollective.com/eslint"
} }
}, },
"node_modules/esm-utils": { "node_modules/esm-utils": {
"version": "4.1.1", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/esm-utils/-/esm-utils-4.1.1.tgz", "resolved": "https://registry.npmjs.org/esm-utils/-/esm-utils-4.1.2.tgz",
"integrity": "sha512-cTy4OQgEP/yc7RY3s6EgwMGZ10gAPhCLE9FcrQ6/5bhf37o9PZCFSjzQR1tYb4GaKAEMaW1UmDcMZR13H4p6LQ==", "integrity": "sha512-hYKPzOCkAU11rMIiH6gvvReARaSLiRhJkGWPcwJB/S4zg7em//YKAcRxwZYw4sW5mRmI6lhV59wWWTdWKwOXvQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"import-meta-resolve": "2.2.0", "import-meta-resolve": "2.2.2",
"url-or-path": "2.1.0" "url-or-path": "2.1.0"
}, },
"funding": { "funding": {
@@ -1978,14 +2051,14 @@
} }
}, },
"node_modules/espree": { "node_modules/espree": {
"version": "9.4.1", "version": "9.5.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
"integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"acorn": "^8.8.0", "acorn": "^8.8.0",
"acorn-jsx": "^5.3.2", "acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.4.0"
}, },
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2001,9 +2074,9 @@
"dev": true "dev": true
}, },
"node_modules/esquery": { "node_modules/esquery": {
"version": "1.4.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"estraverse": "^5.1.0" "estraverse": "^5.1.0"
@@ -2475,6 +2548,15 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/get-tsconfig": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.5.0.tgz",
"integrity": "sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==",
"dev": true,
"funding": {
"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
}
},
"node_modules/glob": { "node_modules/glob": {
"version": "7.2.3", "version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -2745,9 +2827,9 @@
} }
}, },
"node_modules/import-meta-resolve": { "node_modules/import-meta-resolve": {
"version": "2.2.0", "version": "2.2.2",
"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.0.tgz", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.2.tgz",
"integrity": "sha512-CpPOtiCHxP9HdtDM5F45tNiAe66Cqlv3f5uHoJjt+KlaLrUh9/Wz9vepADZ78SlqEo62aDWZtj9ydMGXV+CPnw==", "integrity": "sha512-f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA==",
"dev": true, "dev": true,
"funding": { "funding": {
"type": "github", "type": "github",
@@ -2824,9 +2906,9 @@
} }
}, },
"node_modules/irregular-plurals": { "node_modules/irregular-plurals": {
"version": "3.3.0", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz", "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==", "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=8" "node": ">=8"
@@ -2906,9 +2988,9 @@
} }
}, },
"node_modules/is-builtin-module": { "node_modules/is-builtin-module": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
"integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"builtin-modules": "^3.3.0" "builtin-modules": "^3.3.0"
@@ -3338,6 +3420,18 @@
"js-yaml": "bin/js-yaml.js" "js-yaml": "bin/js-yaml.js"
} }
}, },
"node_modules/jsesc": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
"integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
"dev": true,
"bin": {
"jsesc": "bin/jsesc"
},
"engines": {
"node": ">=6"
}
},
"node_modules/json-parse-even-better-errors": { "node_modules/json-parse-even-better-errors": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -3356,18 +3450,6 @@
"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
"dev": true "dev": true
}, },
"node_modules/json5": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
"dev": true,
"bin": {
"json5": "lib/cli.js"
},
"engines": {
"node": ">=6"
}
},
"node_modules/jsonfile": { "node_modules/jsonfile": {
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -4730,6 +4812,27 @@
"url": "https://github.com/sponsors/mysticatea" "url": "https://github.com/sponsors/mysticatea"
} }
}, },
"node_modules/regjsparser": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
"dev": true,
"dependencies": {
"jsesc": "~0.5.0"
},
"bin": {
"regjsparser": "bin/parser"
}
},
"node_modules/regjsparser/node_modules/jsesc": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
"dev": true,
"bin": {
"jsesc": "bin/jsesc"
}
},
"node_modules/require-directory": { "node_modules/require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5225,9 +5328,9 @@
"dev": true "dev": true
}, },
"node_modules/to-absolute-glob": { "node_modules/to-absolute-glob": {
"version": "2.0.2", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-3.0.0.tgz",
"integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==", "integrity": "sha512-loO/XEWTRqpfcpI7+Jr2RR2Umaaozx1t6OSVWtMi0oy5F/Fxg3IC+D/TToDnxyAGs7uZBGT/6XmyDUxgsObJXA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"is-absolute": "^1.0.0", "is-absolute": "^1.0.0",
@@ -5324,16 +5427,16 @@
} }
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "4.9.4", "version": "5.0.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
"integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
"dev": true, "dev": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
}, },
"engines": { "engines": {
"node": ">=4.2.0" "node": ">=12.20"
} }
}, },
"node_modules/unbox-primitive": { "node_modules/unbox-primitive": {
@@ -5634,9 +5737,9 @@
"dev": true "dev": true
}, },
"node_modules/xo": { "node_modules/xo": {
"version": "0.53.1", "version": "0.54.0",
"resolved": "https://registry.npmjs.org/xo/-/xo-0.53.1.tgz", "resolved": "https://registry.npmjs.org/xo/-/xo-0.54.0.tgz",
"integrity": "sha512-/2R8SPehv1UhiIqJ9uSvrAjslcoygICNsUlEb/Zf2V6rMtr7YCoggc6hlt6b/kbncpR989Roqt6AvEO779dFxw==", "integrity": "sha512-2YAVQqGOTZ+/ZthvfEdFjp1MoFy0i94s5QgVOhLuXnvvy7u+H1QO4KwecvSBNr5MuoG9WM2LRDkBabAwtCauSA==",
"bundleDependencies": [ "bundleDependencies": [
"@typescript-eslint/eslint-plugin", "@typescript-eslint/eslint-plugin",
"@typescript-eslint/parser", "@typescript-eslint/parser",
@@ -5645,41 +5748,41 @@
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.3.3", "@eslint/eslintrc": "^1.3.3",
"@typescript-eslint/eslint-plugin": "^5.43.0", "@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.43.0", "@typescript-eslint/parser": "^5.57.1",
"arrify": "^3.0.0", "arrify": "^3.0.0",
"cosmiconfig": "^7.1.0", "cosmiconfig": "^8.1.3",
"define-lazy-prop": "^3.0.0", "define-lazy-prop": "^3.0.0",
"eslint": "^8.27.0", "eslint": "^8.37.0",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.8.0",
"eslint-config-xo": "^0.43.1", "eslint-config-xo": "^0.43.1",
"eslint-config-xo-typescript": "^0.55.0", "eslint-config-xo-typescript": "^0.57.0",
"eslint-formatter-pretty": "^4.1.0", "eslint-formatter-pretty": "^5.0.0",
"eslint-import-resolver-webpack": "^0.13.2", "eslint-import-resolver-webpack": "^0.13.2",
"eslint-plugin-ava": "^13.2.0", "eslint-plugin-ava": "^14.0.0",
"eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^15.5.1", "eslint-plugin-n": "^15.7.0",
"eslint-plugin-no-use-extend-native": "^0.5.0", "eslint-plugin-no-use-extend-native": "^0.5.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-unicorn": "^44.0.2", "eslint-plugin-unicorn": "^46.0.0",
"esm-utils": "^4.1.0", "esm-utils": "^4.1.2",
"find-cache-dir": "^4.0.0", "find-cache-dir": "^4.0.0",
"find-up": "^6.3.0", "find-up": "^6.3.0",
"get-stdin": "^9.0.0", "get-stdin": "^9.0.0",
"get-tsconfig": "^4.5.0",
"globby": "^13.1.2", "globby": "^13.1.2",
"imurmurhash": "^0.1.4", "imurmurhash": "^0.1.4",
"json-stable-stringify-without-jsonify": "^1.0.1", "json-stable-stringify-without-jsonify": "^1.0.1",
"json5": "^2.2.1",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"meow": "^11.0.0", "meow": "^11.0.0",
"micromatch": "^4.0.5", "micromatch": "^4.0.5",
"open-editor": "^4.0.0", "open-editor": "^4.0.0",
"prettier": "^2.7.1", "prettier": "^2.8.7",
"semver": "^7.3.8", "semver": "^7.3.8",
"slash": "^5.0.0", "slash": "^5.0.0",
"to-absolute-glob": "^2.0.2", "to-absolute-glob": "^3.0.0",
"typescript": "^4.9.3" "typescript": "^5.0.3"
}, },
"bin": { "bin": {
"xo": "cli.js" "xo": "cli.js"
@@ -5691,6 +5794,30 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/xo/node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"dev": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"peerDependencies": {
"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
}
},
"node_modules/xo/node_modules/@eslint-community/regexpp": {
"version": "4.5.0",
"dev": true,
"inBundle": true,
"license": "MIT",
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
"node_modules/xo/node_modules/@nodelib/fs.scandir": { "node_modules/xo/node_modules/@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"dev": true, "dev": true,
@@ -5739,18 +5866,19 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/xo/node_modules/@typescript-eslint/eslint-plugin": { "node_modules/xo/node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.43.0", "@eslint-community/regexpp": "^4.4.0",
"@typescript-eslint/type-utils": "5.43.0", "@typescript-eslint/scope-manager": "5.57.1",
"@typescript-eslint/utils": "5.43.0", "@typescript-eslint/type-utils": "5.57.1",
"@typescript-eslint/utils": "5.57.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0", "ignore": "^5.2.0",
"natural-compare-lite": "^1.4.0", "natural-compare-lite": "^1.4.0",
"regexpp": "^3.2.0",
"semver": "^7.3.7", "semver": "^7.3.7",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
}, },
@@ -5772,14 +5900,14 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/parser": { "node_modules/xo/node_modules/@typescript-eslint/parser": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.43.0", "@typescript-eslint/scope-manager": "5.57.1",
"@typescript-eslint/types": "5.43.0", "@typescript-eslint/types": "5.57.1",
"@typescript-eslint/typescript-estree": "5.43.0", "@typescript-eslint/typescript-estree": "5.57.1",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@@ -5799,13 +5927,13 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/scope-manager": { "node_modules/xo/node_modules/@typescript-eslint/scope-manager": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.43.0", "@typescript-eslint/types": "5.57.1",
"@typescript-eslint/visitor-keys": "5.43.0" "@typescript-eslint/visitor-keys": "5.57.1"
}, },
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5816,13 +5944,13 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/type-utils": { "node_modules/xo/node_modules/@typescript-eslint/type-utils": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@typescript-eslint/typescript-estree": "5.43.0", "@typescript-eslint/typescript-estree": "5.57.1",
"@typescript-eslint/utils": "5.43.0", "@typescript-eslint/utils": "5.57.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
}, },
@@ -5843,7 +5971,7 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/types": { "node_modules/xo/node_modules/@typescript-eslint/types": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
@@ -5856,13 +5984,13 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/typescript-estree": { "node_modules/xo/node_modules/@typescript-eslint/typescript-estree": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.43.0", "@typescript-eslint/types": "5.57.1",
"@typescript-eslint/visitor-keys": "5.43.0", "@typescript-eslint/visitor-keys": "5.57.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@@ -5912,18 +6040,18 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/utils": { "node_modules/xo/node_modules/@typescript-eslint/utils": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12", "@types/semver": "^7.3.12",
"@typescript-eslint/scope-manager": "5.43.0", "@typescript-eslint/scope-manager": "5.57.1",
"@typescript-eslint/types": "5.43.0", "@typescript-eslint/types": "5.57.1",
"@typescript-eslint/typescript-estree": "5.43.0", "@typescript-eslint/typescript-estree": "5.57.1",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0",
"semver": "^7.3.7" "semver": "^7.3.7"
}, },
"engines": { "engines": {
@@ -5938,12 +6066,12 @@
} }
}, },
"node_modules/xo/node_modules/@typescript-eslint/visitor-keys": { "node_modules/xo/node_modules/@typescript-eslint/visitor-keys": {
"version": "5.43.0", "version": "5.57.1",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.43.0", "@typescript-eslint/types": "5.57.1",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"engines": { "engines": {
@@ -6011,7 +6139,7 @@
} }
}, },
"node_modules/xo/node_modules/eslint-config-xo-typescript": { "node_modules/xo/node_modules/eslint-config-xo-typescript": {
"version": "0.55.0", "version": "0.57.0",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
@@ -6022,8 +6150,8 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
}, },
"peerDependencies": { "peerDependencies": {
"@typescript-eslint/eslint-plugin": ">=5.43.0", "@typescript-eslint/eslint-plugin": ">=5.57.0",
"@typescript-eslint/parser": ">=5.43.0", "@typescript-eslint/parser": ">=5.57.0",
"eslint": ">=8.0.0", "eslint": ">=8.0.0",
"typescript": ">=4.4" "typescript": ">=4.4"
} }
@@ -6050,40 +6178,16 @@
"node": ">=4.0" "node": ">=4.0"
} }
}, },
"node_modules/xo/node_modules/eslint-utils": {
"version": "3.0.0",
"dev": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
"eslint-visitor-keys": "^2.0.0"
},
"engines": {
"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
},
"funding": {
"url": "https://github.com/sponsors/mysticatea"
},
"peerDependencies": {
"eslint": ">=5"
}
},
"node_modules/xo/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
"version": "2.1.0",
"dev": true,
"inBundle": true,
"license": "Apache-2.0",
"engines": {
"node": ">=10"
}
},
"node_modules/xo/node_modules/eslint-visitor-keys": { "node_modules/xo/node_modules/eslint-visitor-keys": {
"version": "3.3.0", "version": "3.4.0",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"funding": {
"url": "https://opencollective.com/eslint"
} }
}, },
"node_modules/xo/node_modules/esrecurse": { "node_modules/xo/node_modules/esrecurse": {
@@ -6124,7 +6228,7 @@
} }
}, },
"node_modules/xo/node_modules/fastq": { "node_modules/xo/node_modules/fastq": {
"version": "1.13.0", "version": "1.15.0",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
@@ -6172,8 +6276,14 @@
"node": ">= 6" "node": ">= 6"
} }
}, },
"node_modules/xo/node_modules/grapheme-splitter": {
"version": "1.0.4",
"dev": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/xo/node_modules/ignore": { "node_modules/xo/node_modules/ignore": {
"version": "5.2.0", "version": "5.2.4",
"dev": true, "dev": true,
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
@@ -6334,18 +6444,6 @@
"inBundle": true, "inBundle": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/xo/node_modules/regexpp": {
"version": "3.2.0",
"dev": true,
"inBundle": true,
"license": "MIT",
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/mysticatea"
}
},
"node_modules/xo/node_modules/reusify": { "node_modules/xo/node_modules/reusify": {
"version": "1.0.4", "version": "1.0.4",
"dev": true, "dev": true,
@@ -6406,6 +6504,12 @@
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/xo/node_modules/semver/node_modules/yallist": {
"version": "4.0.0",
"dev": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/xo/node_modules/to-regex-range": { "node_modules/xo/node_modules/to-regex-range": {
"version": "5.0.1", "version": "5.0.1",
"dev": true, "dev": true,
@@ -6439,12 +6543,6 @@
"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
} }
}, },
"node_modules/xo/node_modules/yallist": {
"version": "4.0.0",
"dev": true,
"inBundle": true,
"license": "ISC"
},
"node_modules/xo/node_modules/yocto-queue": { "node_modules/xo/node_modules/yocto-queue": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",

5
package.json
View File

@@ -30,7 +30,7 @@
"postcss": "^8.4.23", "postcss": "^8.4.23",
"postcss-cli": "^10.1.0", "postcss-cli": "^10.1.0",
"prettier": "2.8.8", "prettier": "2.8.8",
"xo": "^0.53.1" "xo": "^0.54.0"
}, },
"browserslist": [ "browserslist": [
"defaults", "defaults",
@@ -102,7 +102,8 @@
"unicorn/prefer-string-slice": "off", "unicorn/prefer-string-slice": "off",
"unicorn/prevent-abbreviations": "off", "unicorn/prevent-abbreviations": "off",
"unicorn/prefer-logical-operator-over-ternary": "off", "unicorn/prefer-logical-operator-over-ternary": "off",
"unicorn/switch-case-braces": "off" "unicorn/switch-case-braces": "off",
"unicorn/no-negated-condition": "off"
} }
}, },
"dependencies": {} "dependencies": {}

6
scripts/pi-hole/js/network.js
View File

@@ -16,10 +16,10 @@ const DAY_IN_SECONDS = 24 * 60 * 60;
function handleAjaxError(xhr, textStatus) { function handleAjaxError(xhr, textStatus) {
if (textStatus === "timeout") { if (textStatus === "timeout") {
alert("The server took too long to send the data."); alert("The server took too long to send the data.");
} else if (xhr.responseText.indexOf("Connection refused") !== -1) { } else if (xhr.responseText.indexOf("Connection refused") === -1) {
alert("An error occurred while loading the data: Connection refused. Is FTL running?");
} else {
alert("An unknown error occurred while loading the data.\n" + xhr.responseText); alert("An unknown error occurred while loading the data.\n" + xhr.responseText);
} else {
alert("An error occurred while loading the data: Connection refused. Is FTL running?");
} }
$("#network-entries_processing").hide(); $("#network-entries_processing").hide();

20
scripts/pi-hole/js/utils.js
View File

@@ -247,7 +247,7 @@ function stateLoadCallback(itemName) {
// Receive previous state from client's local storage area // Receive previous state from client's local storage area
if (localStorage === null) { if (localStorage === null) {
var item = backupStorage[itemName]; var item = backupStorage[itemName];
data = typeof item === "undefined" ? null : item; data = item === "undefined" ? null : item;
} else { } else {
data = localStorage.getItem(itemName); data = localStorage.getItem(itemName);
} }
@@ -314,15 +314,7 @@ function addFromQueryLog(domain, list) {
}, },
success: function (response) { success: function (response) {
alProcessing.hide(); alProcessing.hide();
if (!response.success) { if (response.success) {
// Failure
alNetworkErr.hide();
alCustomErr.html(response.message);
alFailure.fadeIn(1000);
setTimeout(function () {
alertModal.modal("hide");
}, 10000);
} else {
// Success // Success
alSuccess.children(alDomain).text(domain); alSuccess.children(alDomain).text(domain);
alSuccess.children(alList).text(listtype); alSuccess.children(alList).text(listtype);
@@ -330,6 +322,14 @@ function addFromQueryLog(domain, list) {
setTimeout(function () { setTimeout(function () {
alertModal.modal("hide"); alertModal.modal("hide");
}, 2000); }, 2000);
} else {
// Failure
alNetworkErr.hide();
alCustomErr.html(response.message);
alFailure.fadeIn(1000);
setTimeout(function () {
alertModal.modal("hide");
}, 10000);
} }
}, },
error: function () { error: function () {