Merge branch 'dev' of github.com:Dragory/modmailbot into dev

cshd
Dragory 2020-08-16 19:22:57 +03:00
commit a57a088317
No known key found for this signature in database
GPG Key ID: 5F387BA66DF8AAC1
2 changed files with 18 additions and 18 deletions

32
package-lock.json generated
View File

@ -761,9 +761,9 @@
"dev": true "dev": true
}, },
"defer-to-connect": { "defer-to-connect": {
"version": "1.1.0", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.0.tgz", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
"integrity": "sha512-WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ==" "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
}, },
"define-property": { "define-property": {
"version": "2.0.2", "version": "2.0.2",
@ -837,9 +837,9 @@
} }
}, },
"dns-socket": { "dns-socket": {
"version": "4.2.0", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.0.tgz", "resolved": "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.1.tgz",
"integrity": "sha512-4XuD3z28jht3jvHbiom6fAipgG5LkjYeDLrX5OH8cbl0AtzTyUUAxGckcW8T7z0pLfBBV5qOiuC4wUEohk6FrQ==", "integrity": "sha512-fNvDq86lS522+zMbh31X8cQzYQd6xumCNlxsuZF5TKxQThF/e+rJbVM6K8mmlsdcSm6yNjKJQq3Sf38viAJj8g==",
"requires": { "requires": {
"dns-packet": "^5.1.2" "dns-packet": "^5.1.2"
} }
@ -916,9 +916,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "7.6.0", "version": "7.7.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz",
"integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==", "integrity": "sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -1698,9 +1698,9 @@
} }
}, },
"http-cache-semantics": { "http-cache-semantics": {
"version": "4.0.3", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
"integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==" "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
}, },
"http-signature": { "http-signature": {
"version": "1.2.0", "version": "1.2.0",
@ -3382,11 +3382,11 @@
"optional": true "optional": true
}, },
"public-ip": { "public-ip": {
"version": "4.0.0", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/public-ip/-/public-ip-4.0.0.tgz", "resolved": "https://registry.npmjs.org/public-ip/-/public-ip-4.0.2.tgz",
"integrity": "sha512-Q5dcQ5qLPpMSyj0iEqucTfeINHVeEhuSjjaPVEU24+6RGlvCrEM6AXwOlWW4iIn10yyWROASRuS3rgbUZIE/5g==", "integrity": "sha512-ZHqUjaYT/+FuSiy5/o2gBxvj0PF7M3MXGnaLJBsJNMCyXI4jzuXXHJKrk0gDxx1apiF/jYsBwjTQOM9V8G6oCQ==",
"requires": { "requires": {
"dns-socket": "^4.2.0", "dns-socket": "^4.2.1",
"got": "^9.6.0", "got": "^9.6.0",
"is-ip": "^3.1.0" "is-ip": "^3.1.0"
} }

View File

@ -30,14 +30,14 @@
"moment": "^2.27.0", "moment": "^2.27.0",
"mv": "^2.1.1", "mv": "^2.1.1",
"mysql2": "^2.1.0", "mysql2": "^2.1.0",
"public-ip": "^4.0.0", "public-ip": "^4.0.2",
"sqlite3": "^5.0.0", "sqlite3": "^5.0.0",
"tmp": "^0.1.0", "tmp": "^0.1.0",
"transliteration": "^2.1.11", "transliteration": "^2.1.11",
"uuid": "^8.3.0" "uuid": "^8.3.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^7.6.0", "eslint": "^7.7.0",
"husky": "^4.2.5", "husky": "^4.2.5",
"lint-staged": "^10.2.11", "lint-staged": "^10.2.11",
"supervisor": "^0.12.0" "supervisor": "^0.12.0"