diff --git a/.changeset/dependabot-0c71dee.md b/.changeset/dependabot-0c71dee.md new file mode 100644 index 0000000000..adae011546 --- /dev/null +++ b/.changeset/dependabot-0c71dee.md @@ -0,0 +1,5 @@ +--- +'@backstage/backend-common': patch +--- + +build(deps-dev): bump `http-errors` from 1.8.0 to 2.0.0 \ No newline at end of file diff --git a/.changeset/dependabot-2af4c1d.md b/.changeset/dependabot-2af4c1d.md new file mode 100644 index 0000000000..93dc1d1e21 --- /dev/null +++ b/.changeset/dependabot-2af4c1d.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-bazaar': patch +'@backstage/plugin-ilert': patch +--- + +build(deps): bump `@date-io/luxon` from 1.3.13 to 2.11.1 diff --git a/.changeset/itchy-walls-count.md b/.changeset/itchy-walls-count.md new file mode 100644 index 0000000000..46a8709573 --- /dev/null +++ b/.changeset/itchy-walls-count.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-sonarqube': patch +--- + +Enhance token description by highlighting that the trailing colon is required. diff --git a/.changeset/nervous-taxis-grin.md b/.changeset/nervous-taxis-grin.md new file mode 100644 index 0000000000..76deaa2d5c --- /dev/null +++ b/.changeset/nervous-taxis-grin.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-tech-insights-backend': patch +--- + +Modify queries to perform better by filtering on sub-queries as well diff --git a/.changeset/seven-swans-glow.md b/.changeset/seven-swans-glow.md new file mode 100644 index 0000000000..2d41b94082 --- /dev/null +++ b/.changeset/seven-swans-glow.md @@ -0,0 +1,8 @@ +--- +'@backstage/plugin-tech-insights': patch +'@backstage/plugin-tech-insights-backend': patch +'@backstage/plugin-tech-insights-common': patch +'@backstage/plugin-tech-insights-backend-module-jsonfc': patch +--- + +adding new operation to run checks for multiple entities in one request diff --git a/.github/workflows/dependabot-changeset-maker.yml b/.github/workflows/dependabot-changeset-maker.yml index 1387892489..dcf9f47a54 100644 --- a/.github/workflows/dependabot-changeset-maker.yml +++ b/.github/workflows/dependabot-changeset-maker.yml @@ -34,7 +34,7 @@ jobs: async function createChangeset(fileName, commitMessage, packages) { const pkgs = packages.map(pkg => `'${pkg}': patch`).join('\n'); - const message = commitMessage.replace(/(b|B)ump ([a-z-]+)/, 'Bump `$2`'); + const message = commitMessage.replace(/([bB])ump ([\S]+)/, '$1ump `$2`'); const body = `---\n${pkgs}\n---\n\n${message}`; await fs.writeFile(fileName, body); } diff --git a/ADOPTERS.md b/ADOPTERS.md index 1c19fe559e..dc2a6476ba 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -81,3 +81,4 @@ | [Hotmart](https://www.hotmart.com) | [@fabioviana-hotmart](https://github.com/fabioviana-hotmart) | The main Developers Portal to centralize docs, applications and technical metrics. | | [EF Education First](https://www.ef.com) | [Daan Boerlage](https://github.com/runebaas), [Rafał Nowosielski](https://github.com/rnowosielski) | Our developer portal - primarily used for cataloging and scaffolding with the ambition to expand with more feature adoptions over time | | [Power Home Remodeling](https://www.techatpower.com) | [Ben Langfeld](https://github.com/benlangfeld) | Developer portal to our internal services, build on open-source software (including Kubernetes) in our own datacenters. Our Portal allows our team members to navigate inherant complexity and standardise. | +| [Livspace](https://www.livspace.com) | [Praveen Kumar](https://github.com/praveen-livspace) | Developer portal, service catalog, tech docs, API docs and plugins | diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index 04a4971e00..dae5804583 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -99,7 +99,7 @@ "@types/webpack-env": "^1.15.2", "aws-sdk-mock": "^5.2.1", "get-port": "^5.1.1", - "http-errors": "^1.7.3", + "http-errors": "^2.0.0", "jest": "^26.0.1", "mock-fs": "^5.1.0", "msw": "^0.35.0", diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json index 144569885d..03d6090f01 100644 --- a/plugins/bazaar/package.json +++ b/plugins/bazaar/package.json @@ -27,7 +27,7 @@ "@backstage/core-plugin-api": "^0.4.1", "@backstage/plugin-catalog": "^0.7.7", "@backstage/plugin-catalog-react": "^0.6.10", - "@date-io/luxon": "1.x", + "@date-io/luxon": "2.x", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json index 7a31632049..0a7b69b6f9 100644 --- a/plugins/ilert/package.json +++ b/plugins/ilert/package.json @@ -27,7 +27,7 @@ "@backstage/errors": "^0.1.3", "@backstage/plugin-catalog-react": "^0.6.10", "@backstage/theme": "^0.2.14", - "@date-io/luxon": "1.x", + "@date-io/luxon": "2.x", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", diff --git a/plugins/sonarqube/README.md b/plugins/sonarqube/README.md index 87242f6788..2652e156f8 100644 --- a/plugins/sonarqube/README.md +++ b/plugins/sonarqube/README.md @@ -36,7 +36,8 @@ yarn add @backstage/plugin-sonarqube 3. Add the proxy config: - Provide a method for your Backstage backend to get to your SonarQube API end point. Add configuration to your `app-config.yaml` file depending on the product you use. + Provide a method for your Backstage backend to get to your SonarQube API end point. Add configuration to your `app-config.yaml` file depending on the product you use. Make sure to keep the trailing colon after the `SONARQUBE_TOKEN`, it is required to call + the Web API (see [docs](https://docs.sonarqube.org/latest/extend/web-api/)). **SonarCloud** @@ -45,6 +46,7 @@ proxy: '/sonarqube': target: https://sonarcloud.io/api allowedMethods: ['GET'] + # note that the colon after the token is required auth: '${SONARQUBE_TOKEN}:' # Environmental variable: SONARQUBE_TOKEN # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/ @@ -57,6 +59,7 @@ proxy: '/sonarqube': target: https://your.sonarqube.instance.com/api allowedMethods: ['GET'] + # note that the colon after the token is required auth: '${SONARQUBE_TOKEN}:' # Environmental variable: SONARQUBE_TOKEN # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/ @@ -65,7 +68,7 @@ sonarQube: baseUrl: https://your.sonarqube.instance.com ``` -4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/) +4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/). 5. Run the following commands in the root folder of the project to install and compile the changes. diff --git a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts index aef09d5434..8866b5badb 100644 --- a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts +++ b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts @@ -35,6 +35,7 @@ import { pick } from 'lodash'; import Ajv, { SchemaObject } from 'ajv'; import * as validationSchema from './validation-schema.json'; import { JSON_RULE_ENGINE_CHECK_TYPE } from '../constants'; +import { isError } from '@backstage/errors'; const noopEvent = { type: 'noop', @@ -117,7 +118,7 @@ export class JsonRulesEngineFactChecker if (hasAllFacts) { engine.addRule({ ...techInsightCheck.rule, event: noopEvent }); } else { - this.logger.warn( + this.logger.debug( `Skipping ${ rule.name } due to missing facts: ${techInsightCheck.factIds @@ -139,7 +140,10 @@ export class JsonRulesEngineFactChecker Object.values(facts), ); } catch (e) { - throw new Error(`Failed to run rules engine, ${e.message}`); + if (isError(e)) { + throw new Error(`Failed to run rules engine, ${e.message}`); + } + throw e; } } diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts index 31a2997af5..7cbf5671c2 100644 --- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts +++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts @@ -112,6 +112,8 @@ export class TechInsightsDatabase implements TechInsightsStore { this.db('facts') .max('timestamp') .column('id as subId') + .where({ entity: entityTriplet }) + .and.whereIn('id', ids) .groupBy('id') .as('subQ'), 'facts.id', diff --git a/plugins/tech-insights-backend/src/service/router.ts b/plugins/tech-insights-backend/src/service/router.ts index 80902c307c..22a80c2d79 100644 --- a/plugins/tech-insights-backend/src/service/router.ts +++ b/plugins/tech-insights-backend/src/service/router.ts @@ -27,10 +27,12 @@ import { Logger } from 'winston'; import { DateTime } from 'luxon'; import { PersistenceContext } from './persistence/persistenceContext'; import { + EntityName, EntityRef, parseEntityName, stringifyEntityRef, } from '@backstage/catalog-model'; +import { errorHandler } from '@backstage/backend-common'; /** * @public @@ -91,14 +93,26 @@ export async function createRouter< router.post('/checks/run/:namespace/:kind/:name', async (req, res) => { const { namespace, kind, name } = req.params; - try { - const { checks }: { checks: string[] } = req.body; - const entityTriplet = stringifyEntityRef({ namespace, kind, name }); - const checkResult = await factChecker.runChecks(entityTriplet, checks); - return res.send(checkResult); - } catch (e) { - return res.status(500).json({ message: e.message }).send(); - } + const { checks }: { checks: string[] } = req.body; + const entityTriplet = stringifyEntityRef({ namespace, kind, name }); + const checkResult = await factChecker.runChecks(entityTriplet, checks); + return res.send(checkResult); + }); + + router.post('/checks/run', async (req, res) => { + const { checks, entities }: { checks: string[]; entities: EntityName[] } = + req.body; + const tasks = entities.map(async entity => { + const entityTriplet = + typeof entity === 'string' ? entity : stringifyEntityRef(entity); + const results = await factChecker.runChecks(entityTriplet, checks); + return { + entity: entityTriplet, + results, + }; + }); + const results = await Promise.all(tasks); + return res.send(results); }); } else { logger.info( @@ -153,5 +167,7 @@ export async function createRouter< ), ); }); + + router.use(errorHandler()); return router; } diff --git a/plugins/tech-insights-common/api-report.md b/plugins/tech-insights-common/api-report.md index 8618f6266b..0236c0619a 100644 --- a/plugins/tech-insights-common/api-report.md +++ b/plugins/tech-insights-common/api-report.md @@ -12,6 +12,12 @@ export interface BooleanCheckResult extends CheckResult { result: boolean; } +// @public +export type BulkCheckResponse = Array<{ + entity: string; + results: CheckResult[]; +}>; + // @public export interface CheckResponse { description: string; diff --git a/plugins/tech-insights-common/src/index.ts b/plugins/tech-insights-common/src/index.ts index ecdaa298c1..66af5c2f93 100644 --- a/plugins/tech-insights-common/src/index.ts +++ b/plugins/tech-insights-common/src/index.ts @@ -124,3 +124,13 @@ export type CheckResult = { export interface BooleanCheckResult extends CheckResult { result: boolean; } + +/** + * Response type for bulk check opretation. Contains a list of entities and their respective check results. + * + * @public + */ +export type BulkCheckResponse = Array<{ + entity: string; + results: CheckResult[]; +}>; diff --git a/plugins/tech-insights/api-report.md b/plugins/tech-insights/api-report.md index 52712b14a4..79854e505f 100644 --- a/plugins/tech-insights/api-report.md +++ b/plugins/tech-insights/api-report.md @@ -7,6 +7,7 @@ import { ApiRef } from '@backstage/core-plugin-api'; import { BackstagePlugin } from '@backstage/core-plugin-api'; +import { BulkCheckResponse } from '@backstage/plugin-tech-insights-common'; import { CheckResult } from '@backstage/plugin-tech-insights-common'; import { EntityName } from '@backstage/catalog-model'; import { default as React_2 } from 'react'; @@ -50,6 +51,11 @@ export interface TechInsightsApi { description?: string, ) => CheckResultRenderer | undefined; // (undocumented) + runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise; + // (undocumented) runChecks(entityParams: EntityName, checks?: Check[]): Promise; } diff --git a/plugins/tech-insights/src/api/TechInsightsApi.ts b/plugins/tech-insights/src/api/TechInsightsApi.ts index 9f2d4f14c4..b1287a62dc 100644 --- a/plugins/tech-insights/src/api/TechInsightsApi.ts +++ b/plugins/tech-insights/src/api/TechInsightsApi.ts @@ -15,7 +15,10 @@ */ import { createApiRef } from '@backstage/core-plugin-api'; -import { CheckResult } from '@backstage/plugin-tech-insights-common'; +import { + CheckResult, + BulkCheckResponse, +} from '@backstage/plugin-tech-insights-common'; import { Check } from './types'; import { CheckResultRenderer } from '../components/CheckResultRenderer'; import { EntityName } from '@backstage/catalog-model'; @@ -43,4 +46,8 @@ export interface TechInsightsApi { ) => CheckResultRenderer | undefined; getAllChecks(): Promise; runChecks(entityParams: EntityName, checks?: Check[]): Promise; + runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise; } diff --git a/plugins/tech-insights/src/api/TechInsightsClient.ts b/plugins/tech-insights/src/api/TechInsightsClient.ts index 8678ec13c8..692169e80e 100644 --- a/plugins/tech-insights/src/api/TechInsightsClient.ts +++ b/plugins/tech-insights/src/api/TechInsightsClient.ts @@ -15,7 +15,10 @@ */ import { TechInsightsApi } from './TechInsightsApi'; -import { CheckResult } from '@backstage/plugin-tech-insights-common'; +import { + BulkCheckResponse, + CheckResult, +} from '@backstage/plugin-tech-insights-common'; import { Check } from './types'; import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api'; import { ResponseError } from '@backstage/errors'; @@ -97,4 +100,29 @@ export class TechInsightsClient implements TechInsightsApi { } return await response.json(); } + + async runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise { + const url = await this.discoveryApi.getBaseUrl('tech-insights'); + const token = await this.identityApi.getIdToken(); + const checkIds = checks ? checks.map(check => check.id) : []; + const requestBody = { + entities, + checks: checkIds.length > 0 ? checkIds : undefined, + }; + const response = await fetch(`${url}/checks/run`, { + method: 'POST', + body: JSON.stringify(requestBody), + headers: { + 'Content-Type': 'application/json', + ...(token && { Authorization: `Bearer ${token}` }), + }, + }); + if (!response.ok) { + throw await ResponseError.fromResponse(response); + } + return await response.json(); + } } diff --git a/yarn.lock b/yarn.lock index 533e5406e1..2646c9e85e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2181,14 +2181,7 @@ core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.16.3" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" - integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.16.3": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.14.8", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.16.7" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== @@ -2654,6 +2647,11 @@ resolved "https://registry.npmjs.org/@date-io/core/-/core-2.10.7.tgz#0fe1fa0ef02c827919e23c2802a4b25589ac522d" integrity sha512-EG/1qDiQvd12RoNJ6H+sZcHVswC/3uMx/ySvfaJ24vB30rLjkgHggEXbgMbfgki7wMuiQ/zXI8QlmF1k3kWRGQ== +"@date-io/core@^2.11.0": + version "2.11.0" + resolved "https://registry.npmjs.org/@date-io/core/-/core-2.11.0.tgz#28580cda1c8228ab2c7ed6aee673ef0495f913e6" + integrity sha512-DvPBnNoeuLaoSJZaxgpu54qzRhRKjSYVyQjhznTFrllKuDpm0sDFjHo6lvNLCM/cfMx2gb2PM2zY2kc9C8nmuw== + "@date-io/date-fns@^1.3.13": version "1.3.13" resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735" @@ -2661,12 +2659,12 @@ dependencies: "@date-io/core" "^1.3.13" -"@date-io/luxon@1.x": - version "1.3.13" - resolved "https://registry.npmjs.org/@date-io/luxon/-/luxon-1.3.13.tgz#68f0134bb38ef486b2ed6df01981f814c633e28a" - integrity sha512-9wUrJCNSMZJeYAiH+dbb45oGpnHeFP7TOH/Lt26If47gjFCkjvyINzWx+K5AGsnlP0Qosxc7hkF1yLi6ecutxw== +"@date-io/luxon@2.x": + version "2.11.1" + resolved "https://registry.npmjs.org/@date-io/luxon/-/luxon-2.11.1.tgz#31a72f7b5e163c74e8a3b29d8f16c4c30de6ed43" + integrity sha512-JUXo01kdPQxLORxqdENrgdUhooKgDUggsNRSdi2BcUhASIY2KGwwWXu8ikVHHGkw+DUF4FOEKGfkQd0RHSvX6g== dependencies: - "@date-io/core" "^1.3.13" + "@date-io/core" "^2.11.0" "@discoveryjs/json-ext@^0.5.3": version "0.5.5" @@ -7712,15 +7710,10 @@ dependencies: "@types/node" "*" -"@types/lodash@^4.14.151": - version "4.14.168" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" - integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== - -"@types/lodash@^4.14.165": - version "4.14.175" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45" - integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw== +"@types/lodash@^4.14.151", "@types/lodash@^4.14.175": + version "4.14.178" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" + integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== "@types/long@^4.0.0", "@types/long@^4.0.1": version "4.0.1" @@ -13105,16 +13098,16 @@ denque@^2.0.1: resolved "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a" integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ== +depd@2.0.0, depd@~2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -depd@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" @@ -16659,7 +16652,7 @@ http-errors@1.7.3: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@1.8.1: +http-errors@1.8.1, http-errors@^1.7.3: version "1.8.1" resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== @@ -16670,16 +16663,16 @@ http-errors@1.8.1: statuses ">= 1.5.0 < 2" toidentifier "1.0.1" -http-errors@^1.7.3: - version "1.8.0" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" - integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== +http-errors@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" + depd "2.0.0" inherits "2.0.4" setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + statuses "2.0.1" + toidentifier "1.0.1" http-errors@~1.6.2: version "1.6.3" @@ -19574,7 +19567,7 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.15: +lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -26441,16 +26434,16 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" +statuses@2.0.1, statuses@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -statuses@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.0.tgz#aa7b107e018eb33e08e8aee2e7337e762dda1028" - integrity sha512-w9jNUUQdpuVoYqXxnyOakhckBbOxRaoYqJscyIBYCS5ixyCnO7nQn7zBZvP9zf5QOPZcz2DLUpE3KsNPbJBOFA== - stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -29698,14 +29691,14 @@ yocto-queue@^0.1.0: integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== yup@^0.32.9: - version "0.32.9" - resolved "https://registry.npmjs.org/yup/-/yup-0.32.9.tgz#9367bec6b1b0e39211ecbca598702e106019d872" - integrity sha512-Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg== + version "0.32.11" + resolved "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5" + integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg== dependencies: - "@babel/runtime" "^7.10.5" - "@types/lodash" "^4.14.165" - lodash "^4.17.20" - lodash-es "^4.17.15" + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" nanoclone "^0.2.1" property-expr "^2.0.4" toposort "^2.0.2"