From 84c1835cc010d436dc523520ee63f8447cdd7e77 Mon Sep 17 00:00:00 2001 From: Neil McLaughlin Date: Thu, 5 Nov 2020 17:23:15 +0000 Subject: [PATCH] FIS-724 Upgrade hapi (#148) * FIS-724 Upgrade hapi to v20 * Upgrade hapi to 20 --- package-lock.json | 137 +++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 83 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index d671cac96..0d35e90d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "flood-app", - "version": "3.0.0", + "version": "3.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1427,34 +1427,23 @@ "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==" }, "@hapi/call": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@hapi/call/-/call-8.0.0.tgz", - "integrity": "sha512-4xHIWWqaIDQlVU88XAnomACSoC7iWUfaLfdu2T7I0y+HFFwZUrKKGfwn6ik4kwKsJRMnOliG3UXsF8V/94+Lkg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@hapi/call/-/call-8.0.1.tgz", + "integrity": "sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==", "requires": { - "@hapi/address": "4.x.x", "@hapi/boom": "9.x.x", "@hapi/hoek": "9.x.x" - }, - "dependencies": { - "@hapi/address": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.0.1.tgz", - "integrity": "sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw==", - "requires": { - "@hapi/hoek": "^9.0.0" - } - } } }, "@hapi/catbox": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-11.1.0.tgz", - "integrity": "sha512-FDEjfn26RZRyOEPeZdaAL7dRiAK5FOGuwTnTw0gxK30csAlKeOHsEnoIxnLIXx7QOS17eUaOk6+MiweWQM6Keg==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-11.1.1.tgz", + "integrity": "sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ==", "requires": { "@hapi/boom": "9.x.x", "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x", - "@hapi/podium": "4.x.x" + "@hapi/podium": "4.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/catbox-memory": { @@ -1560,30 +1549,49 @@ } }, "@hapi/hapi": { - "version": "19.1.1", - "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-19.1.1.tgz", - "integrity": "sha512-rpQzSs0XsHSF7usM4qdJJ0Bcmhs9stWhUW3OiamW33bw4qL8q3uEgUKB9KH8ODmluCAkkXOQ0X0Dh9t94E5VIw==", + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-20.0.1.tgz", + "integrity": "sha512-v8NapLf5vkKWIJoBCUBIOk6ZdH9vrxZco4GZbjdM3ROQBDl4eXwW3pySTBL7xWANYp3Nzdn+fiFWjDwdgsSoQg==", "requires": { "@hapi/accept": "^5.0.1", "@hapi/ammo": "^5.0.1", "@hapi/boom": "9.x.x", "@hapi/bounce": "2.x.x", "@hapi/call": "8.x.x", - "@hapi/catbox": "11.x.x", + "@hapi/catbox": "^11.1.1", "@hapi/catbox-memory": "5.x.x", - "@hapi/heavy": "7.x.x", + "@hapi/heavy": "^7.0.1", "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x", "@hapi/mimos": "5.x.x", - "@hapi/podium": "4.x.x", - "@hapi/shot": "5.x.x", + "@hapi/podium": "^4.1.1", + "@hapi/shot": "^5.0.1", "@hapi/somever": "3.x.x", - "@hapi/statehood": "^7.0.2", + "@hapi/statehood": "^7.0.3", "@hapi/subtext": "^7.0.3", - "@hapi/teamwork": "4.x.x", - "@hapi/topo": "5.x.x" + "@hapi/teamwork": "5.x.x", + "@hapi/topo": "5.x.x", + "@hapi/validate": "^1.1.0" }, "dependencies": { + "@hapi/bourne": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.0.0.tgz", + "integrity": "sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg==" + }, + "@hapi/statehood": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@hapi/statehood/-/statehood-7.0.3.tgz", + "integrity": "sha512-pYB+pyCHkf2Amh67QAXz7e/DN9jcMplIL7Z6N8h0K+ZTy0b404JKPEYkbWHSnDtxLjJB/OtgElxocr2fMH4G7w==", + "requires": { + "@hapi/boom": "9.x.x", + "@hapi/bounce": "2.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/cryptiles": "5.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/iron": "6.x.x", + "@hapi/validate": "1.x.x" + } + }, "@hapi/topo": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", @@ -1595,13 +1603,13 @@ } }, "@hapi/heavy": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-7.0.0.tgz", - "integrity": "sha512-n/nheUG6zNleWkjY+3fzV3VJIAumUCaa/WoTmurjqlYY5JgC5ZKOpvP7tWi8rXmKZhbcXgjH3fHFoM55LoBT7g==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-7.0.1.tgz", + "integrity": "sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA==", "requires": { "@hapi/boom": "9.x.x", "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x" + "@hapi/validate": "1.x.x" } }, "@hapi/hoek": { @@ -1726,12 +1734,12 @@ } }, "@hapi/nigel": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-4.0.0.tgz", - "integrity": "sha512-Bqs1pjcDnDQo/XGoiCCNHWTFcMzPbz3L4KU04njeFQMzzEmsojMRX7TX+PezQYCMKtHJOtMg0bHxZyMGqYtbSA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-4.0.2.tgz", + "integrity": "sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw==", "requires": { - "@hapi/hoek": "9.x.x", - "@hapi/vise": "4.x.x" + "@hapi/hoek": "^9.0.4", + "@hapi/vise": "^4.0.0" } }, "@hapi/oppsy": { @@ -1743,9 +1751,9 @@ } }, "@hapi/pez": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-5.0.2.tgz", - "integrity": "sha512-jr1lAm8mE7J2IBxvDIuDI1qy2aAsoaD2jxOUd/7JRg/Vmrzco8HdKhtz4fKk6KHU6zbbsAp5m5aSWWVTUrag7g==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-5.0.3.tgz", + "integrity": "sha512-mpikYRJjtrbJgdDHG/H9ySqYqwJ+QU/D7FXsYciS9P7NYBXE2ayKDAy3H0ou6CohOCaxPuTV4SZ0D936+VomHA==", "requires": { "@hapi/b64": "5.x.x", "@hapi/boom": "9.x.x", @@ -1760,13 +1768,13 @@ "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==" }, "@hapi/podium": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-4.1.0.tgz", - "integrity": "sha512-k/n0McAu8PvonfQRLyKKUvvdb+Gh/O5iAeIwv535Hpxw9B1qZcrYdZyWtHZ8O5PkA9/b/Kk+BdvtgcxeKMB/2g==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-4.1.1.tgz", + "integrity": "sha512-jh7a6+5Z4FUWzx8fgmxjaAa1DTBu+Qfg+NbVdo0f++rE5DgsVidUYrLDp3db65+QjDLleA2MfKQXkpT8ylBDXA==", "requires": { "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x", - "@hapi/teamwork": "4.x.x" + "@hapi/teamwork": "5.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/rule-capitalize-modules": { @@ -1795,12 +1803,12 @@ "integrity": "sha512-n0adld0osaYNXlus/64dCN0GlkMvmwuJfkpM0OtrA2U7x2Iu1XoHV6Lmne3C+9gM8X/xLUviYLoTCOC7IW8RYg==" }, "@hapi/shot": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-5.0.0.tgz", - "integrity": "sha512-JXddnJkRh3Xhv9lY1tA+TSIUaoODKbdNIPL/M8WFvFQKOttmGaDeqTW5e8Gf01LtLI7L5DraLMULHjrK1+YNFg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-5.0.4.tgz", + "integrity": "sha512-PcEz0WJgFDA3xNSMeONgQmothFr7jhbbRRSAKaDh7chN7zOXBlhl13bvKZW6CMb2xVfJUmt34CW3e/oExMgBhQ==", "requires": { "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x" + "@hapi/validate": "1.x.x" } }, "@hapi/somever": { @@ -1855,9 +1863,9 @@ } }, "@hapi/teamwork": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-4.0.0.tgz", - "integrity": "sha512-V6xYOrr5aFv/IJqNPneaYCu8vuGTKisamqHVRS3JJnbZr18TrpXdsJOYk9pjPhFti+M2YETPebQLUr820N5NoQ==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-5.1.0.tgz", + "integrity": "sha512-llqoQTrAJDTXxG3c4Kz/uzhBS1TsmSBa/XG5SPcVXgmffHE1nFtyLIK0hNJHCB3EuBKT84adzd1hZNY9GJLWtg==" }, "@hapi/topo": { "version": "3.1.3", @@ -1874,6 +1882,25 @@ } } }, + "@hapi/validate": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@hapi/validate/-/validate-1.1.3.tgz", + "integrity": "sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==", + "requires": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0" + }, + "dependencies": { + "@hapi/topo": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", + "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + } + } + }, "@hapi/vise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@hapi/vise/-/vise-4.0.0.tgz", diff --git a/package.json b/package.json index 91d02a738..709573588 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@hapi/good-console": "^9.0.0", "@hapi/good-squeeze": "^6.0.0", "@hapi/h2o2": "^9.0.1", - "@hapi/hapi": "^19.1.1", + "@hapi/hapi": "^20.0.1", "@hapi/hoek": "^9.0.4", "@hapi/inert": "^6.0.1", "@hapi/joi": "^17.1.1",