diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3e05b68f605..8fc3f1a4e93 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -128,7 +128,7 @@ "eslint-plugin-sort-destructure-keys": "^1.3.5", "fast-glob": "^3.2.7", "form-data": "^4.0.0", - "got": "^11.8.1", + "got": "^11.8.6", "graphviz": "^0.0.9", "husky": "^8.0.0", "ini": "^2.0.0", @@ -5680,9 +5680,9 @@ "dev": true }, "node_modules/@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "15.0.15", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz", + "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==", "dependencies": { "@types/yargs-parser": "*" } @@ -8343,11 +8343,11 @@ } }, "node_modules/cli-progress": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.10.0.tgz", - "integrity": "sha512-kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==", + "version": "3.11.2", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz", + "integrity": "sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA==", "dependencies": { - "string-width": "^4.2.0" + "string-width": "^4.2.3" }, "engines": { "node": ">=4" @@ -13695,9 +13695,9 @@ } }, "node_modules/got": { - "version": "11.8.5", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", - "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==", + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, "dependencies": { "@sindresorhus/is": "^4.0.0", @@ -28264,9 +28264,9 @@ "dev": true }, "@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "15.0.15", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz", + "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==", "requires": { "@types/yargs-parser": "*" } @@ -30204,11 +30204,11 @@ } }, "cli-progress": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.10.0.tgz", - "integrity": "sha512-kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==", + "version": "3.11.2", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz", + "integrity": "sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA==", "requires": { - "string-width": "^4.2.0" + "string-width": "^4.2.3" } }, "cli-spinners": { @@ -34338,9 +34338,9 @@ } }, "got": { - "version": "11.8.5", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", - "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==", + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, "requires": { "@sindresorhus/is": "^4.0.0", diff --git a/package.json b/package.json index d7b0e232f59..835347d0f93 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "eslint-plugin-sort-destructure-keys": "^1.3.5", "fast-glob": "^3.2.7", "form-data": "^4.0.0", - "got": "^11.8.1", + "got": "^11.8.6", "graphviz": "^0.0.9", "husky": "^8.0.0", "ini": "^2.0.0", diff --git a/tests/integration/utils/got.cjs b/tests/integration/utils/got.cjs index 9afa3c2a562..fe71ffda415 100644 --- a/tests/integration/utils/got.cjs +++ b/tests/integration/utils/got.cjs @@ -1,15 +1,5 @@ const got = require('got') -const STATUS_CODE_LIMIT_OK = 299 -const STATUS_CODE_LIMIT_REDIRECT = 399 - -const isResponseOk = (response) => { - const { statusCode } = response - const limitStatusCode = response.request.options.followRedirect ? STATUS_CODE_LIMIT_OK : STATUS_CODE_LIMIT_REDIRECT - - return (statusCode >= 200 && statusCode <= limitStatusCode) || statusCode === 304 -} - const TIMEOUT = 3e5 // Default got retry status code with the addition of 403 @@ -20,19 +10,6 @@ const extendedGot = got.extend({ statusCodes: STATUS_CODE, }, timeout: TIMEOUT, - // TODO: remove when https://github.com/sindresorhus/got/issues/1489 is fixed - // see https://github.com/sindresorhus/got/issues/1489#issuecomment-805485731 - hooks: { - afterResponse: [ - (response) => { - if (isResponseOk(response)) { - response.request.destroy() - } - - return response - }, - ], - }, }) module.exports = extendedGot