diff --git a/package-lock.json b/package-lock.json index 5b771c4d3..d329fa50d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,71 +29,18 @@ "through2": "2.0.3" } }, - "@types/accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==", - "dev": true, - "requires": { - "@types/node": "9.4.6" - } - }, - "@types/body-parser": { - "version": "1.16.8", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz", - "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==", - "dev": true, - "requires": { - "@types/express": "4.11.1", - "@types/node": "9.4.6" - } - }, - "@types/boom": { - "version": "4.3.9", - "resolved": "https://registry.npmjs.org/@types/boom/-/boom-4.3.9.tgz", - "integrity": "sha512-hOMq8gOURXfWAoPCGkAcQVRV1JitzZylAGvNJeu5wkSWIErWK22ZPGaHlScF+OQZqBKVpEunJA3pzBl0qaM9PQ==", - "dev": true - }, "@types/builtin-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/builtin-modules/-/builtin-modules-2.0.0.tgz", "integrity": "sha512-PqWStSS9WSjbJwG62v3AG+hjBdd1zDbQsclXOL+9CRV8nvXwRWv48cZDlSj/mR05Nk/69LV7Ca2onJBi3z2/wA==", "dev": true }, - "@types/bunyan": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.4.tgz", - "integrity": "sha512-bxOF3fsm69ezKxdcJ7Oo/PsZMOJ+JIV/QJO2IADfScmR3sLulR88dpSnz6+q+9JJ1kD7dXFFgUrGRSKHLkOX7w==", - "dev": true, - "requires": { - "@types/events": "1.2.0", - "@types/node": "9.4.6" - } - }, "@types/caseless": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==", "dev": true }, - "@types/catbox": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@types/catbox/-/catbox-7.1.6.tgz", - "integrity": "sha512-xcLIJdHkkqB6dyclgvFee8GjfeVYzTJAoFiOZlAnZ9R5mv/8VCnUuaQ4z/v3GrlKUL4j9YEbhOimtFawGBe4ng==", - "dev": true, - "requires": { - "@types/boom": "4.3.9" - } - }, - "@types/connect": { - "version": "3.4.31", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", - "dev": true, - "requires": { - "@types/node": "9.4.6" - } - }, "@types/continuation-local-storage": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/@types/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz", @@ -103,45 +50,12 @@ "@types/node": "9.4.6" } }, - "@types/cookies": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.1.tgz", - "integrity": "sha512-ku6IvbucEyuC6i4zAVK/KnuzWNXdbFd1HkXlNLg/zhWDGTtQT5VhumiPruB/BHW34PWVFwyfwGftDQHfWNxu3Q==", - "dev": true, - "requires": { - "@types/connect": "3.4.31", - "@types/express": "4.11.1", - "@types/keygrip": "1.0.1", - "@types/node": "9.4.6" - } - }, "@types/events": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==", "dev": true }, - "@types/express": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.11.1.tgz", - "integrity": "sha512-ttWle8cnPA5rAelauSWeWJimtY2RsUf2aspYZs7xPHiWgOlPn6nnUfBMtrkcnjFJuIHJF4gNOdVvpLK2Zmvh6g==", - "dev": true, - "requires": { - "@types/body-parser": "1.16.8", - "@types/express-serve-static-core": "4.11.1", - "@types/serve-static": "1.13.1" - } - }, - "@types/express-serve-static-core": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz", - "integrity": "sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw==", - "dev": true, - "requires": { - "@types/events": "1.2.0", - "@types/node": "9.4.6" - } - }, "@types/extend": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.0.tgz", @@ -168,65 +82,10 @@ "@types/node": "9.4.6" } }, - "@types/hapi": { - "version": "16.1.14", - "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-16.1.14.tgz", - "integrity": "sha512-VeWocvlYrFINg4ZloxSPkg9qtd9aHMkH1Lt4bPqguSLSTrd51D67tcz8+crhsWsClViTylB6deRatxZzOnly7g==", - "dev": true, - "requires": { - "@types/boom": "4.3.9", - "@types/catbox": "7.1.6", - "@types/events": "1.2.0", - "@types/joi": "13.0.5", - "@types/mimos": "3.0.1", - "@types/node": "9.4.6", - "@types/podium": "1.0.0", - "@types/shot": "3.4.0" - } - }, - "@types/http-assert": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.2.2.tgz", - "integrity": "sha512-x1553BFcgBVOD6y3tC/2SOVcNaf6b9eH3BvqniAZZwmHWYhyr8ffXTYygQC/hQxNI4Yfc3q0gGUvyiAHV4tRNg==", - "dev": true - }, "@types/is": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@types/is/-/is-0.0.18.tgz", - "integrity": "sha512-A7PSzJyDwKbkJ3kvM0gfs9daFyiCwvrSmzA5ToFW1rporicAKgrpZsZJifQQob/QvMwEbwi3zF2o/Lw8K3frxw==", - "dev": true - }, - "@types/joi": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@types/joi/-/joi-13.0.5.tgz", - "integrity": "sha512-xhGKDKk8qEK35GFYIkpQXdS03PnL+1eXt8VOHnuvuMOjNCztmTpqiDk2vlDy3GbSctSTBJCkY0PXkaRVJpl2xA==", - "dev": true - }, - "@types/keygrip": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz", - "integrity": "sha1-/1QEYtL7TQqIRBzq8n0oewHD2Hg=", - "dev": true - }, - "@types/koa": { - "version": "2.0.44", - "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.0.44.tgz", - "integrity": "sha512-xOg6XLJdKmYriExAF0pV+HYhzftNJbpxplJgjyCwEM2LNLQPMgW4uSHXjgsqSPKsaAgM8CiR31vIeocRibFSjw==", - "dev": true, - "requires": { - "@types/accepts": "1.3.5", - "@types/cookies": "0.7.1", - "@types/events": "1.2.0", - "@types/http-assert": "1.2.2", - "@types/keygrip": "1.0.1", - "@types/koa-compose": "3.2.2", - "@types/node": "9.4.6" - } - }, - "@types/koa-compose": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.2.tgz", - "integrity": "sha1-3BBuAAu/kqOskA91bfRzRIh+6Ec=", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/@types/is/-/is-0.0.19.tgz", + "integrity": "sha512-OfsDEdzuxfkNXIlAd55eBFCag+I82Ex4jt5s4mOdVS1DHeXaB/zMdgbllTt62qRNCpdypkP36ROj4tUXJTvbZQ==", "dev": true }, "@types/methods": { @@ -235,27 +94,6 @@ "integrity": "sha512-ROomEm+QHlUmcQoDr3CBo3GRm0w4PVoFYjVT9YcfyBha/Per4deb1IpvHU7KTK7YBZCIvOYbSADoEyDnFgaWLA==", "dev": true }, - "@types/mime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", - "dev": true - }, - "@types/mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-m8AUof0f30dknBpUxt15ZrgoR5I=", - "dev": true - }, - "@types/mimos": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.1.tgz", - "integrity": "sha512-MATIRH4VMIJki8lcYUZdNQEHuAG7iQ1FWwoLgxV+4fUOly2xZYdhHtGgvQyWiTeJqq2tZbE0nOOgZD6pR0FpNQ==", - "dev": true, - "requires": { - "@types/mime-db": "1.27.0" - } - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -298,38 +136,12 @@ "integrity": "sha512-cnEvTAVVRqF6OQg/4SLnbxQ0slZJHqZQDve5BzGhcIQtuMpPv8T5QNS2cBPa/W0jTxciqwn7bmJAIGe/bOJ5Kw==", "dev": true }, - "@types/pg": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@types/pg/-/pg-7.4.5.tgz", - "integrity": "sha512-DV9A1X9duAnZrF+ANT9i7Z3k+49Dfl96hJlmpz8KCZtBaB7ck3eaAX/37P/vOtpb1VBS5C7xfYI1oRnAfL71DQ==", - "dev": true, - "requires": { - "@types/events": "1.2.0", - "@types/node": "9.4.6", - "@types/pg-types": "1.11.4" - } - }, - "@types/pg-types": { - "version": "1.11.4", - "resolved": "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.4.tgz", - "integrity": "sha512-WdIiQmE347LGc1Vq3Ki8sk3iyCuLgnccqVzgxek6gEHp2H0p3MQ3jniIHt+bRODXKju4kNQ+mp53lmP5+/9moQ==", - "dev": true, - "requires": { - "moment": "2.21.0" - } - }, "@types/pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/pify/-/pify-3.0.0.tgz", "integrity": "sha512-BIRcpFqRm64rVuuYCFzOF37I2IEP3sXhiCjy8NbzJkxqFY2CLiDLFPhh6Sph/eXPXctg05MayCEDmeKCOIUBFg==", "dev": true }, - "@types/podium": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/podium/-/podium-1.0.0.tgz", - "integrity": "sha1-v6ohUb4rHWEJzGn3+qnawsujuyA=", - "dev": true - }, "@types/proxyquire": { "version": "1.3.28", "resolved": "https://registry.npmjs.org/@types/proxyquire/-/proxyquire-1.3.28.tgz", @@ -348,57 +160,18 @@ "@types/tough-cookie": "2.3.2" } }, - "@types/restify": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/@types/restify/-/restify-5.0.7.tgz", - "integrity": "sha512-0bcMA32Ys6nOQnD4QD6vDvfJg7nx5Dbd+oItNFAad3lwnanm0CqxSZpPQVgVMdD4Vrq/dY7yTaEUwsXOFci2iw==", - "dev": true, - "requires": { - "@types/bunyan": "1.8.4", - "@types/node": "9.4.6", - "@types/spdy": "3.4.4" - } - }, "@types/semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz", "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==", "dev": true }, - "@types/serve-static": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==", - "dev": true, - "requires": { - "@types/express-serve-static-core": "4.11.1", - "@types/mime": "2.0.0" - } - }, "@types/shimmer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.1.tgz", "integrity": "sha512-I9ouuzrWLcjM1wre7f0i780W3KHk5PxFAC5KOpvpOGNaTsaKLN8p7sqRh9THwV9cpdOA/YJC+yMhG1jonQFdRQ==", "dev": true }, - "@types/shot": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@types/shot/-/shot-3.4.0.tgz", - "integrity": "sha1-RZR3xRh9Pr0wNmCrCZ5+ng87ZW8=", - "dev": true, - "requires": { - "@types/node": "9.4.6" - } - }, - "@types/spdy": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/@types/spdy/-/spdy-3.4.4.tgz", - "integrity": "sha512-N9LBlbVRRYq6HgYpPkqQc3a9HJ/iEtVZToW6xlTtJiMhmRJ7jJdV7TaZQJw/Ve/1ePUsQiCTDc4JMuzzag94GA==", - "dev": true, - "requires": { - "@types/node": "9.4.6" - } - }, "@types/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz", @@ -4247,12 +4020,6 @@ "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=" }, - "moment": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", - "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==", - "dev": true - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", diff --git a/scripts/get-plugin-types.ts b/scripts/get-plugin-types.ts index 0d477af19..7628dae76 100644 --- a/scripts/get-plugin-types.ts +++ b/scripts/get-plugin-types.ts @@ -24,7 +24,6 @@ export async function getPluginTypes() { if (!matches) { continue; } - console.log(matches); const [, packageName, name, version] = matches; const installDir = `${TYPES_DIRECTORY}/${packageName}`; if (await mkdirSafeP(installDir)) { diff --git a/src/plugins/plugin-hapi.ts b/src/plugins/plugin-hapi.ts index 56f8430ab..2ef24f579 100644 --- a/src/plugins/plugin-hapi.ts +++ b/src/plugins/plugin-hapi.ts @@ -26,10 +26,10 @@ import {hapi_16, hapi_17} from './types'; const ORIGINAL = Symbol(); type Hapi16Module = typeof hapi_16; -type Hapi17RequestExecutePrivate = { +interface Hapi17RequestExecutePrivate { (this: hapi_17.Request): Promise; - [ORIGINAL]?: Hapi17RequestExecutePrivate; -}; + [ORIGINAL]?: Hapi17RequestExecutePrivate; +} type Hapi17Request = hapi_17.Request&{ _execute: Hapi17RequestExecutePrivate; };