From b5b41988cf4a3d4f53ac17765aa4627d26efdc03 Mon Sep 17 00:00:00 2001 From: Timur Olzhabayev Date: Thu, 1 Sep 2022 18:15:44 +0200 Subject: [PATCH] Docs: Deprecating packages_api and removing it from our pipelines (#54473) --- .drone.yml | 18 +- .github/CODEOWNERS | 10 +- api-extractor.json | 38 --- .../architecture/frontend-data-requests.md | 6 +- docs/Makefile | 2 +- .../add-support-for-explore-queries.md | 2 +- .../developers/plugins/migration-guide.md | 4 +- docs/sources/explore/trace-integration.md | 2 +- docs/sources/whatsnew/whats-new-in-v7-0.md | 2 +- package.json | 5 - packages/grafana-data/api-extractor.json | 3 - packages/grafana-data/package.json | 1 - .../grafana-e2e-selectors/api-extractor.json | 3 - packages/grafana-e2e-selectors/package.json | 1 - packages/grafana-e2e/api-extractor.json | 3 - packages/grafana-e2e/package.json | 1 - packages/grafana-runtime/api-extractor.json | 3 - packages/grafana-runtime/package.json | 1 - packages/grafana-schema/api-extractor.json | 3 - packages/grafana-schema/package.json | 1 - packages/grafana-ui/api-extractor.json | 3 - packages/grafana-ui/package.json | 1 - .../src/components/BigValue/BigValue.mdx | 2 +- pkg/services/ngalert/models/alert_rule.go | 3 +- pkg/services/ngalert/schedule/registry.go | 1 + pkg/services/ngalert/schedule/schedule.go | 4 +- scripts/ci-reference-docs-build.sh | 23 -- scripts/ci-reference-docs-lint.sh | 44 --- scripts/drone/pipelines/docs.star | 2 - scripts/drone/steps/lib.star | 16 -- yarn.lock | 254 +----------------- 31 files changed, 33 insertions(+), 429 deletions(-) delete mode 100644 api-extractor.json delete mode 100644 packages/grafana-data/api-extractor.json delete mode 100644 packages/grafana-e2e-selectors/api-extractor.json delete mode 100644 packages/grafana-e2e/api-extractor.json delete mode 100644 packages/grafana-runtime/api-extractor.json delete mode 100644 packages/grafana-schema/api-extractor.json delete mode 100644 packages/grafana-ui/api-extractor.json delete mode 100755 scripts/ci-reference-docs-build.sh delete mode 100755 scripts/ci-reference-docs-lint.sh diff --git a/.drone.yml b/.drone.yml index 2d15d87280c..f583acbeb37 100644 --- a/.drone.yml +++ b/.drone.yml @@ -650,18 +650,10 @@ steps: NODE_OPTIONS: --max_old_space_size=8192 image: grafana/build-container:1.5.9 name: build-frontend-packages -- commands: - - ./scripts/ci-reference-docs-lint.sh ci - depends_on: - - build-frontend-packages - image: grafana/build-container:1.5.9 - name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana - cp -r docs/sources/* /hugo/content/docs/grafana/latest/ - cd /hugo && make prod - depends_on: - - build-frontend-docs image: grafana/docs-base:latest name: build-docs-website - commands: @@ -742,18 +734,10 @@ steps: NODE_OPTIONS: --max_old_space_size=8192 image: grafana/build-container:1.5.9 name: build-frontend-packages -- commands: - - ./scripts/ci-reference-docs-lint.sh ci - depends_on: - - build-frontend-packages - image: grafana/build-container:1.5.9 - name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana - cp -r docs/sources/* /hugo/content/docs/grafana/latest/ - cd /hugo && make prod - depends_on: - - build-frontend-docs image: grafana/docs-base:latest name: build-docs-website - commands: @@ -5108,6 +5092,6 @@ kind: secret name: packages_secret_access_key --- kind: signature -hmac: 40c8c66094bd5928aff25edef47082ff5686a0ca8c57e7d08f76eb5857103e72 +hmac: 93835e0362c0a924e8da207d3c89296a1d68f3997f86ac4859b356a872bc9f4a ... diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ce774d58455..b14a6ceadc4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,9 +13,9 @@ # Documentation owner: Jita Chatterjee /docs/ @grafana/docs-squad -/contribute/ @marcusolsson @grafana/docs-squad -/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad @grafana/plugins-platform-frontend @grafana/plugins-platform-backend -/docs/sources/developers/plugins/backend @marcusolsson @grafana/docs-squad @grafana/plugins-platform-backend +/contribute/ @grafana/docs-squad +/docs/sources/developers/plugins/ @grafana/docs-squad @grafana/plugins-platform-frontend @grafana/plugins-platform-backend +/docs/sources/developers/plugins/backend @grafana/docs-squad @grafana/plugins-platform-backend /docs/sources/enterprise/ @osg-grafana @grafana/docs-squad # Backend code @@ -136,8 +136,6 @@ pkg/tsdb/testdatasource/sims/ @grafana/grafana-edge-squad /scripts/build/release-packages.sh @grafana/plugins-platform-frontend /scripts/circle-release-next-packages.sh @grafana/plugins-platform-frontend /scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad -/scripts/ci-reference-docs-build.sh @grafana/plugins-platform-frontend -/scripts/ci-reference-docs-lint.sh @grafana/plugins-platform-frontend /scripts/grunt @grafana/frontend-ops /scripts/webpack @grafana/frontend-ops /scripts/generate-a11y-report.sh @grafana/user-essentials @@ -152,7 +150,7 @@ lerna.json @grafana/frontend-ops .betterer.results @joshhunt # @grafana/ui component documentation -*.mdx @marcusolsson @jessover9000 @grafana/plugins-platform-frontend +*.mdx @jessover9000 @grafana/plugins-platform-frontend # Core datasources /public/app/plugins/datasource/cloudwatch @grafana/aws-plugins diff --git a/api-extractor.json b/api-extractor.json deleted file mode 100644 index af1049c5a08..00000000000 --- a/api-extractor.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", - "mainEntryPointFilePath": "/dist/index.d.ts", - "bundledPackages": [], - "compiler": {}, - "apiReport": { - "enabled": false - }, - "docModel": { - "enabled": true, - "apiJsonFilePath": "/../../reports/docs/.api.json" - }, - "dtsRollup": { - "enabled": false - }, - "tsdocMetadata": {}, - "messages": { - "compilerMessageReporting": { - "default": { - "logLevel": "warning" - } - }, - "extractorMessageReporting": { - "default": { - "logLevel": "warning" - }, - "ae-internal-missing-underscore": { - "logLevel": "none", - "addToApiReportFile": false - } - }, - "tsdocMessageReporting": { - "default": { - "logLevel": "warning" - } - } - } -} diff --git a/contribute/architecture/frontend-data-requests.md b/contribute/architecture/frontend-data-requests.md index 81e611fae5f..ee6890ed440 100644 --- a/contribute/architecture/frontend-data-requests.md +++ b/contribute/architecture/frontend-data-requests.md @@ -1,6 +1,6 @@ # Data requests -[BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`. +[BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`. ## Canceling requests @@ -14,7 +14,7 @@ Grafana uses a concept called _request cancellation_ to cancel any ongoing reque #### Before Grafana 7.2 -Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/main/docs/sources/packages_api/runtime/backendsrvrequest.md) when you use [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv). +Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts#L47) when you use [BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts). The cancellation logic is as follows: @@ -23,7 +23,7 @@ The cancellation logic is as follows: #### After Grafana 7.2 -Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv). +Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts). Migrating the core data sources to the new `fetch` function [is an ongoing process that you can read about in this issue.](https://github.com/grafana/grafana/issues/27222) diff --git a/docs/Makefile b/docs/Makefile index 78c12ffc424..db800ce9240 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -12,7 +12,7 @@ docs: pull docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server" docs-quick: pull - docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "ln -s /frontend-docs/packages_api /hugo/content/docs/grafana/next/packages_api && make server-quick" + docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server-quick" docs-no-pull: docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server" diff --git a/docs/sources/developers/plugins/add-support-for-explore-queries.md b/docs/sources/developers/plugins/add-support-for-explore-queries.md index 791c9ffe1f1..26faad99fd2 100644 --- a/docs/sources/developers/plugins/add-support-for-explore-queries.md +++ b/docs/sources/developers/plugins/add-support-for-explore-queries.md @@ -73,4 +73,4 @@ const firstResult = new MutableDataFrame({ }); ``` -For possible options, refer to [PreferredVisualisationType](https://grafana.com/docs/grafana/latest/packages_api/data/preferredvisualisationtype/). +For possible options, refer to [PreferredVisualisationType](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/data.ts#L25). diff --git a/docs/sources/developers/plugins/migration-guide.md b/docs/sources/developers/plugins/migration-guide.md index c36d233a4ff..8b525640f69 100644 --- a/docs/sources/developers/plugins/migration-guide.md +++ b/docs/sources/developers/plugins/migration-guide.md @@ -732,9 +732,9 @@ Before 7.0, data source and panel plugins exchanged data using either time serie Grafana 7.0 is backward compatible with the old data format used in previous versions. Panels and data sources using the old format will still work with plugins using the new data frame format. -The `DataQueryResponse` returned by the `query` method can be either a [LegacyResponseData](https://grafana.com/docs/grafana/latest/packages_api/data/legacyresponsedata/) or a [DataFrame](https://grafana.com/docs/grafana/latest/packages_api/data/dataframe/). +The `DataQueryResponse` returned by the `query` method can be either a [LegacyResponseData](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/datasource.ts#L419) or a [DataFrame](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/dataFrame.ts#L200). -The [toDataFrame()](https://grafana.com/docs/grafana/latest/packages_api/data/todataframe/) function converts a legacy response, such as `TimeSeries` or `Table`, to a `DataFrame`. Use it to gradually move your code to the new format. +The [toDataFrame()](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/dataframe/processDataFrame.ts#L309) function converts a legacy response, such as `TimeSeries` or `Table`, to a `DataFrame`. Use it to gradually move your code to the new format. ```ts import { toDataFrame } from '@grafana/data'; diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md index da2e813b5b1..b20106944ca 100644 --- a/docs/sources/explore/trace-integration.md +++ b/docs/sources/explore/trace-integration.md @@ -122,4 +122,4 @@ Optional fields: | stackTraces | string[] | List of stack traces associated with the current span. | | errorIconColor | string | Color of the error icon in case span is tagged with `error: true`. | -For details about the types see [TraceSpanRow](https://grafana.com/docs/grafana/latest/packages_api/data/tracespanrow/), [TraceKeyValuePair](https://grafana.com/docs/grafana/latest/packages_api/data/tracekeyvaluepair/) and [TraceLog](https://grafana.com/docs/grafana/latest/packages_api/data/tracelog/) +For details about the types see [TraceSpanRow](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L28), [TraceKeyValuePair](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L4) and [TraceLog](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L12) diff --git a/docs/sources/whatsnew/whats-new-in-v7-0.md b/docs/sources/whatsnew/whats-new-in-v7-0.md index 34210271c5d..6f563c3374a 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-0.md +++ b/docs/sources/whatsnew/whats-new-in-v7-0.md @@ -137,7 +137,7 @@ In Grafana 7.0 we are maturing our panel and front-end datasource plugins platfo Plugins can use the same React components that the Grafana team uses to build Grafana. Using these components means the Grafana team will support and improve them continually and make your plugin as polished as the rest of Grafana’s UI. The new [`@grafana/ui` components library](https://developers.grafana.com/ui) is documented with Storybook (visual documentation) and is available on NPM. -The `@grafana/data`, `@grafana/runtime`, `@grafana/e2e packages` (also available via NPM) aim to simplify the way plugins are developed. We want to deliver a set of [reliable APIs](https://grafana.com/docs/grafana/latest/packages_api/) for plugin developers. +The `@grafana/data`, `@grafana/runtime`, `@grafana/e2e packages` (also available via NPM) aim to simplify the way plugins are developed. We want to deliver a set of [reliable APIs](https://grafana.com/docs/grafana/v7.0/packages_api/) for plugin developers. With [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit) we are delivering a simple CLI that helps plugin authors quickly scaffold, develop and test their plugins without worrying about configuration details. A plugin author no longer needs to be a grunt or webpack expert to build their plugin. diff --git a/package.json b/package.json index 2e895a70c33..d828f845975 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,6 @@ "lint:fix": "yarn lint:ts --fix", "packages:build": "lerna run build --ignore @grafana-plugins/input-datasource", "packages:clean": "lerna run clean --parallel", - "packages:docsExtract": "rm -rf ./reports/docs && lerna run docsExtract", - "packages:docsToMarkdown": "api-documenter markdown --input-folder ./reports/docs/ --output-folder ./docs/sources/packages_api/ --hugo", "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact", "packages:pack": "lerna exec --no-private -- yarn pack", "packages:publish": "lerna exec --no-private -- npm publish package.tgz", @@ -94,14 +92,12 @@ "@betterer/eslint": "5.4.0", "@betterer/regexp": "5.4.0", "@emotion/eslint-plugin": "11.7.0", - "@grafana/api-documenter": "7.11.2", "@grafana/e2e": "workspace:*", "@grafana/eslint-config": "5.0.0", "@grafana/toolkit": "workspace:*", "@grafana/tsconfig": "^1.2.0-rc1", "@lingui/cli": "3.14.0", "@lingui/macro": "3.14.0", - "@microsoft/api-extractor": "7.29.5", "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", "@react-types/button": "3.5.1", "@react-types/menu": "3.6.1", @@ -405,7 +401,6 @@ "resolutions": { "underscore": "1.13.4", "@types/slate": "0.47.2", - "@microsoft/api-extractor-model": "7.23.3", "@rushstack/node-core-library": "3.49.0", "@rushstack/rig-package": "0.3.13", "@rushstack/ts-command-line": "4.12.1", diff --git a/packages/grafana-data/api-extractor.json b/packages/grafana-data/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-data/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 4e198466fbe..c1c0fbc78bd 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -29,7 +29,6 @@ "scripts": { "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { diff --git a/packages/grafana-e2e-selectors/api-extractor.json b/packages/grafana-e2e-selectors/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-e2e-selectors/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 99679a04141..1f6f18decba 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -33,7 +33,6 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "devDependencies": { diff --git a/packages/grafana-e2e/api-extractor.json b/packages/grafana-e2e/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-e2e/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index c31669b55b7..87c3ebac15c 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -38,7 +38,6 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "open": "cypress open", "start": "cypress run --browser=chrome", "start-benchmark": "CYPRESS_NO_COMMAND_LOG=1 yarn start", diff --git a/packages/grafana-runtime/api-extractor.json b/packages/grafana-runtime/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-runtime/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 9e2f8bdc21e..a0e66199824 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -31,7 +31,6 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { diff --git a/packages/grafana-schema/api-extractor.json b/packages/grafana-schema/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-schema/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index aeb429ffacc..1925fc42726 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -30,7 +30,6 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "devDependencies": { diff --git a/packages/grafana-ui/api-extractor.json b/packages/grafana-ui/api-extractor.json deleted file mode 100644 index 5e96b3b0b3c..00000000000 --- a/packages/grafana-ui/api-extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../api-extractor.json" -} diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 9d1aec7129a..333d5b4aeb7 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -33,7 +33,6 @@ "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts", "bundle": "rollup -c rollup.config.ts", "clean": "rimraf ./dist ./compiled ./package.tgz", - "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "storybook": "start-storybook -p 9001 -c .storybook", "storybook:build": "build-storybook -o ./dist/storybook -c .storybook", "typecheck": "tsc --emitDeclarationOnly false --noEmit", diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.mdx b/packages/grafana-ui/src/components/BigValue/BigValue.mdx index 673b4e7b649..06ec7d88e9f 100644 --- a/packages/grafana-ui/src/components/BigValue/BigValue.mdx +++ b/packages/grafana-ui/src/components/BigValue/BigValue.mdx @@ -5,7 +5,7 @@ import { BigValue } from './BigValue'; # BigValue -Component for showing a value based on a [DisplayValue](https://grafana.com/docs/grafana/latest/packages_api/data/displayvalue/#displayvalue-interface). +Component for showing a value based on a [DisplayValue](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/displayValue.ts#L5). ### Display properties diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go index ad9fa817f2f..a25b6be156d 100644 --- a/pkg/services/ngalert/models/alert_rule.go +++ b/pkg/services/ngalert/models/alert_rule.go @@ -401,7 +401,8 @@ func (c Condition) IsValid() bool { // There are several exceptions: // 1. Following fields are not patched and therefore will be ignored: AlertRule.ID, AlertRule.OrgID, AlertRule.Updated, AlertRule.Version, AlertRule.UID, AlertRule.DashboardUID, AlertRule.PanelID, AlertRule.Annotations and AlertRule.Labels // 2. There are fields that are patched together: -// - AlertRule.Condition and AlertRule.Data +// - AlertRule.Condition and AlertRule.Data +// // If either of the pair is specified, neither is patched. func PatchPartialAlertRule(existingRule *AlertRule, ruleToPatch *AlertRule) { if ruleToPatch.Title == "" { diff --git a/pkg/services/ngalert/schedule/registry.go b/pkg/services/ngalert/schedule/registry.go index f2c310fb839..e07ee458d0d 100644 --- a/pkg/services/ngalert/schedule/registry.go +++ b/pkg/services/ngalert/schedule/registry.go @@ -95,6 +95,7 @@ func newAlertRuleInfo(parent context.Context) *alertRuleInfo { // Returns a tuple where first element is // - true when message was sent // - false when the send operation is stopped +// // the second element contains a dropped message that was sent by a concurrent sender. func (a *alertRuleInfo) eval(eval *evaluation) (bool, *evaluation) { // read the channel in unblocking manner to make sure that there is no concurrent send operation. diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go index 78dbb7b5bfc..5928071c171 100644 --- a/pkg/services/ngalert/schedule/schedule.go +++ b/pkg/services/ngalert/schedule/schedule.go @@ -25,6 +25,7 @@ import ( // ScheduleService is an interface for a service that schedules the evaluation // of alert rules. +// //go:generate mockery --name ScheduleService --structname FakeScheduleService --inpackage --filename schedule_mock.go --unroll-variadic=False type ScheduleService interface { // Run the scheduler until the context is canceled or the scheduler returns @@ -40,8 +41,9 @@ type ScheduleService interface { overrideCfg(cfg SchedulerCfg) } -//go:generate mockery --name AlertsSender --structname AlertsSenderMock --inpackage --filename alerts_sender_mock.go --with-expecter // AlertsSender is an interface for a service that is responsible for sending notifications to the end-user. +// +//go:generate mockery --name AlertsSender --structname AlertsSenderMock --inpackage --filename alerts_sender_mock.go --with-expecter type AlertsSender interface { Send(key ngmodels.AlertRuleKey, alerts definitions.PostableAlerts) } diff --git a/scripts/ci-reference-docs-build.sh b/scripts/ci-reference-docs-build.sh deleted file mode 100755 index 56d2e9054ea..00000000000 --- a/scripts/ci-reference-docs-build.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# abort if we get any error -set -eo pipefail - -BUILD_MODE="${1-local}" - -if [ "local" == "$BUILD_MODE" ] - then - # building grafana packages - echo "building grafana packages..." - yarn packages:build - else - echo "skip building grafana packages since it already built in previous steps..." -fi - -# extract packages api documentation json -echo "extracting packages documentation data..." -yarn packages:docsExtract - -# generating api documentation markdown -echo "generating markdown from documentation data..." -yarn packages:docsToMarkdown diff --git a/scripts/ci-reference-docs-lint.sh b/scripts/ci-reference-docs-lint.sh deleted file mode 100755 index 1d792d62da2..00000000000 --- a/scripts/ci-reference-docs-lint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# abort if we get any error -set -eo pipefail - -pretty_print_result_of_report() { - # $1 = result of current report - - echo -e "\n\n" - echo -e "-----------------------------------------------------\n" - echo -e "$1\n" - echo "-----------------------------------------------------" -} - -BUILD_MODE="${1-local}" -BUILD_SCRIPT_PATH="$(realpath "$(dirname "$0")/ci-reference-docs-build.sh")" - -if [ ! -d "$(realpath "$(dirname "$0")/../reports/docs/")" ]; then - echo "reports/docs directory doesn't exist. creating..." - # this script needs to be run after the packages have been built and the api-extractor has completed. - # shellcheck source=/scripts/ci-reference-docs-build.sh - if ! . "$BUILD_SCRIPT_PATH" "$BUILD_MODE"; - then - echo "Failed to build packages and extract docs" >&2 - exit 1 - else - echo "Successfully built packages and extracted docs" - fi -fi - -REPORT_PATH="$(realpath "$(dirname "$0")/../reports/docs/")" -WARNINGS_COUNT="$(find "$REPORT_PATH" -type f -name \*.log -print0 | xargs -0 grep -o "Warning:.*(ae-\|Warning:.*(tsdoc-" | wc -l | xargs)" -WARNINGS_COUNT_LIMIT=1212 - -if [ "$WARNINGS_COUNT" -gt $WARNINGS_COUNT_LIMIT ]; then - echo -e "API Extractor warnings/errors $WARNINGS_COUNT exceeded $WARNINGS_COUNT_LIMIT so failing build.\n" - echo "Please go to: https://github.com/grafana/grafana/blob/main/contribute/style-guides/code-comments.md for more information on how to add code comments." -fi - -if [ "$WARNINGS_COUNT" -lt $WARNINGS_COUNT_LIMIT ]; then - pretty_print_result_of_report "Wohoo! Fewer warnings compared to last build 🎉🎈🍾✨\n\nYou can lower the threshold from $WARNINGS_COUNT_LIMIT to $WARNINGS_COUNT in the:\nscripts/ci-reference-docs-metrics.sh" -fi - -pretty_print_result_of_report "API Extractor total warnings: $WARNINGS_COUNT" diff --git a/scripts/drone/pipelines/docs.star b/scripts/drone/pipelines/docs.star index 8854e29b4c0..d7050365a90 100644 --- a/scripts/drone/pipelines/docs.star +++ b/scripts/drone/pipelines/docs.star @@ -8,7 +8,6 @@ load( 'codespell_step', 'test_frontend_step', 'build_storybook_step', - 'build_frontend_docs_step', 'build_frontend_package_step', 'build_docs_website_step', 'compile_build_cmd', @@ -42,7 +41,6 @@ def docs_pipelines(edition, ver_mode, trigger): codespell_step(), lint_docs(), build_frontend_package_step(edition=edition, ver_mode=ver_mode), - build_frontend_docs_step(edition=edition), build_docs_website_step(), compile_build_cmd(), ] diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index b7b3701c5cd..5ef0d314def 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -437,19 +437,6 @@ def build_frontend_package_step(edition, ver_mode): } -def build_frontend_docs_step(edition): - return { - 'name': 'build-frontend-docs', - 'image': build_image, - 'depends_on': [ - 'build-frontend-packages' - ], - 'commands': [ - './scripts/ci-reference-docs-lint.sh ci', - ] - } - - def build_plugins_step(edition, ver_mode): if ver_mode!='pr': env = { @@ -751,9 +738,6 @@ def build_docs_website_step(): 'name': 'build-docs-website', # Use latest revision here, since we want to catch if it breaks 'image': 'grafana/docs-base:latest', - 'depends_on': [ - 'build-frontend-docs', - ], 'commands': [ 'mkdir -p /hugo/content/docs/grafana', 'cp -r docs/sources/* /hugo/content/docs/grafana/latest/', diff --git a/yarn.lock b/yarn.lock index a1581756d53..9b89c3514cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4776,23 +4776,6 @@ __metadata: languageName: node linkType: hard -"@grafana/api-documenter@npm:7.11.2": - version: 7.11.2 - resolution: "@grafana/api-documenter@npm:7.11.2" - dependencies: - "@microsoft/api-extractor-model": "workspace:*" - "@microsoft/tsdoc": 0.12.19 - "@rushstack/node-core-library": "workspace:*" - "@rushstack/ts-command-line": "workspace:*" - colors: ~1.2.1 - js-yaml: ~3.13.1 - resolve: ~1.17.0 - bin: - api-documenter: bin/api-documenter - checksum: cb692372a6ceff4f500caf5a6b7fa42d7caa6d0ce226b44d249b2b4f7f939d7a7321f62175b4053d5a8a4b8114e8dad2476267235487b4a1aee3ac4dab1df4b4 - languageName: node - linkType: hard - "@grafana/aws-sdk@npm:0.0.37": version: 0.0.37 resolution: "@grafana/aws-sdk@npm:0.0.37" @@ -7233,65 +7216,6 @@ __metadata: languageName: node linkType: hard -"@microsoft/api-extractor-model@npm:7.23.3": - version: 7.23.3 - resolution: "@microsoft/api-extractor-model@npm:7.23.3" - dependencies: - "@microsoft/tsdoc": 0.14.1 - "@microsoft/tsdoc-config": ~0.16.1 - "@rushstack/node-core-library": 3.51.1 - checksum: 00ec7a31d1f6d1583c3fcd97b16130bf8570e27cd3be2ecd07cf601b0c91ef63885a55bf068932c5d9278f8a9ab2046dc8305c0047158e6df5e86f5e56e35b77 - languageName: node - linkType: hard - -"@microsoft/api-extractor@npm:7.29.5": - version: 7.29.5 - resolution: "@microsoft/api-extractor@npm:7.29.5" - dependencies: - "@microsoft/api-extractor-model": 7.23.3 - "@microsoft/tsdoc": 0.14.1 - "@microsoft/tsdoc-config": ~0.16.1 - "@rushstack/node-core-library": 3.51.1 - "@rushstack/rig-package": 0.3.14 - "@rushstack/ts-command-line": 4.12.2 - colors: ~1.2.1 - lodash: ~4.17.15 - resolve: ~1.17.0 - semver: ~7.3.0 - source-map: ~0.6.1 - typescript: ~4.7.4 - bin: - api-extractor: bin/api-extractor - checksum: f80f5963591384029f71c8db2f3cd32eb098ce4f622e420b695ac947c104612a5a483126428aade638d5d751e840f79e4f36cb0c8e59c363663cf72971937b73 - languageName: node - linkType: hard - -"@microsoft/tsdoc-config@npm:~0.16.1": - version: 0.16.1 - resolution: "@microsoft/tsdoc-config@npm:0.16.1" - dependencies: - "@microsoft/tsdoc": 0.14.1 - ajv: ~6.12.6 - jju: ~1.4.0 - resolve: ~1.19.0 - checksum: 2b2121803caf6584fe0264ad16f8fa10de68438c0b82bd25f918606052af5312050f38b6abd4bcf3d40f120713aab144762a7a280fa22dd12e5571cd08e348e1 - languageName: node - linkType: hard - -"@microsoft/tsdoc@npm:0.12.19": - version: 0.12.19 - resolution: "@microsoft/tsdoc@npm:0.12.19" - checksum: b19f996a3b1b3145592badec6c408518ef88d5835a6958bae7bc5a741194ece13c5a9e7f5b815319b3873a089f1b03dcea7fd2987aa55771f0fc6f9acff08718 - languageName: node - linkType: hard - -"@microsoft/tsdoc@npm:0.14.1": - version: 0.14.1 - resolution: "@microsoft/tsdoc@npm:0.14.1" - checksum: e4ad038ccff2cd96e0d53ee42e2136f0f5a925b16cfda14261f1c2eb55ba0088a0e3b08ff819b476ddc69b2242a391925fab7f6ae2afabb19b96f87e19c114fc - languageName: node - linkType: hard - "@mochajs/json-file-reporter@npm:^1.2.0": version: 1.3.0 resolution: "@mochajs/json-file-reporter@npm:1.3.0" @@ -8640,45 +8564,6 @@ __metadata: languageName: node linkType: hard -"@rushstack/node-core-library@npm:3.49.0": - version: 3.49.0 - resolution: "@rushstack/node-core-library@npm:3.49.0" - dependencies: - "@types/node": 12.20.24 - colors: ~1.2.1 - fs-extra: ~7.0.1 - import-lazy: ~4.0.0 - jju: ~1.4.0 - resolve: ~1.17.0 - semver: ~7.3.0 - timsort: ~0.3.0 - z-schema: ~5.0.2 - checksum: 6ac8247a466faebc242cf8ca6a9960d78dee305482358cca15e9a9ba22f775c18d4f857a9dfcad4c03853d4a6fde768d142a794b6af2baa6aecd5f8faee989a2 - languageName: node - linkType: hard - -"@rushstack/rig-package@npm:0.3.13": - version: 0.3.13 - resolution: "@rushstack/rig-package@npm:0.3.13" - dependencies: - resolve: ~1.17.0 - strip-json-comments: ~3.1.1 - checksum: 98c0b7dbefe6ae169745d065d696fbef5d07e71bae5146e070a2e37de82c5625752865c54f12bba6b002868fcb27a1d2d098a19b0a5d20a1dfacaa002c81c13d - languageName: node - linkType: hard - -"@rushstack/ts-command-line@npm:4.12.1": - version: 4.12.1 - resolution: "@rushstack/ts-command-line@npm:4.12.1" - dependencies: - "@types/argparse": 1.0.38 - argparse: ~1.0.9 - colors: ~1.2.1 - string-argv: ~0.3.1 - checksum: e9479bd001f4f206d207c867ec7b91444727cf8a1c685dac7589c6a33b54f47200deabc450d6831a1cc38501f0322eb7003c1f78f1fa43230541c4b7ddc4718d - languageName: node - linkType: hard - "@scena/dragscroll@npm:^1.1.1": version: 1.1.1 resolution: "@scena/dragscroll@npm:1.1.1" @@ -10482,13 +10367,6 @@ __metadata: languageName: node linkType: hard -"@types/argparse@npm:1.0.38": - version: 1.0.38 - resolution: "@types/argparse@npm:1.0.38" - checksum: 26ed7e3f1e3595efdb883a852f5205f971b798e4c28b7e30a32c5298eee596e8b45834ce831f014d250b9730819ab05acff5b31229666d3af4ba465b4697d0eb - languageName: node - linkType: hard - "@types/aria-query@npm:^4.2.0": version: 4.2.2 resolution: "@types/aria-query@npm:4.2.2" @@ -11524,13 +11402,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:12.20.24": - version: 12.20.24 - resolution: "@types/node@npm:12.20.24" - checksum: e7a13460e2f5b0b5a32c0f3af7daf1a05201552a66d542d3cc3b1ea8b52d4730250f9eb1961d755e31cfe5d03c78340911a6242657a0a9a17d6f7e341fc9f366 - languageName: node - linkType: hard - "@types/node@npm:16.11.26": version: 16.11.26 resolution: "@types/node@npm:16.11.26" @@ -13534,7 +13405,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:~6.12.6": +"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -13808,7 +13679,7 @@ __metadata: languageName: node linkType: hard -"argparse@npm:^1.0.7, argparse@npm:~1.0.9": +"argparse@npm:^1.0.7": version: 1.0.10 resolution: "argparse@npm:1.0.10" dependencies: @@ -16149,13 +16020,6 @@ __metadata: languageName: node linkType: hard -"colors@npm:~1.2.1": - version: 1.2.5 - resolution: "colors@npm:1.2.5" - checksum: b6e23de735f68b72d5cdf6fd854ca43d1b66d82dcf54bda0b788083b910164a040f2c4edf23c670d36a7a2d8f1b7d6e62e3292703e4642691e6ccaa1c62d8f74 - languageName: node - linkType: hard - "columnify@npm:^1.6.0": version: 1.6.0 resolution: "columnify@npm:1.6.0" @@ -16217,7 +16081,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:2, commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.7.1, commander@npm:^2.9.0": +"commander@npm:2, commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.9.0": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e @@ -21054,17 +20918,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:~7.0.1": - version: 7.0.1 - resolution: "fs-extra@npm:7.0.1" - dependencies: - graceful-fs: ^4.1.2 - jsonfile: ^4.0.0 - universalify: ^0.1.0 - checksum: 141b9dccb23b66a66cefdd81f4cda959ff89282b1d721b98cea19ba08db3dcbe6f862f28841f3cf24bb299e0b7e6c42303908f65093cb7e201708e86ea5a8dcf - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -21759,7 +21612,6 @@ __metadata: "@emotion/react": 11.9.3 "@grafana/agent-core": 0.4.0 "@grafana/agent-web": 0.4.0 - "@grafana/api-documenter": 7.11.2 "@grafana/aws-sdk": 0.0.37 "@grafana/data": "workspace:*" "@grafana/e2e": "workspace:*" @@ -21783,7 +21635,6 @@ __metadata: "@lingui/core": 3.14.0 "@lingui/macro": 3.14.0 "@lingui/react": 3.14.0 - "@microsoft/api-extractor": 7.29.5 "@opentelemetry/api": 1.1.0 "@opentelemetry/exporter-collector": 0.25.0 "@opentelemetry/semantic-conventions": 1.6.0 @@ -23059,7 +22910,7 @@ __metadata: languageName: node linkType: hard -"import-lazy@npm:^4.0.0, import-lazy@npm:~4.0.0": +"import-lazy@npm:^4.0.0": version: 4.0.0 resolution: "import-lazy@npm:4.0.0" checksum: 22f5e51702134aef78890156738454f620e5fe7044b204ebc057c614888a1dd6fdf2ede0fdcca44d5c173fd64f65c985f19a51775b06967ef58cc3d26898df07 @@ -23463,7 +23314,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.1.0, is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0": +"is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0": version: 2.8.0 resolution: "is-core-module@npm:2.8.0" dependencies: @@ -25364,13 +25215,6 @@ __metadata: languageName: node linkType: hard -"jju@npm:~1.4.0": - version: 1.4.0 - resolution: "jju@npm:1.4.0" - checksum: 3790481bd2b7827dd6336e6e3dc2dcc6d425679ba7ebde7b679f61dceb4457ea0cda330972494de608571f4973c6dfb5f70fab6f3c5037dbab19ac449a60424f - languageName: node - linkType: hard - "joi@npm:^17.6.0": version: 17.6.0 resolution: "joi@npm:17.6.0" @@ -25449,18 +25293,6 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:~3.13.1": - version: 3.13.1 - resolution: "js-yaml@npm:3.13.1" - dependencies: - argparse: ^1.0.7 - esprima: ^4.0.0 - bin: - js-yaml: bin/js-yaml.js - checksum: 7511b764abb66d8aa963379f7d2a404f078457d106552d05a7b556d204f7932384e8477513c124749fa2de52eb328961834562bd09924902c6432e40daa408bc - languageName: node - linkType: hard - "jsbn@npm:~0.1.0": version: 0.1.1 resolution: "jsbn@npm:0.1.1" @@ -26379,7 +26211,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0, lodash@npm:~4.17.15": +"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -33403,25 +33235,6 @@ __metadata: languageName: node linkType: hard -"resolve@npm:~1.17.0": - version: 1.17.0 - resolution: "resolve@npm:1.17.0" - dependencies: - path-parse: ^1.0.6 - checksum: 9ceaf83b3429f2d7ff5d0281b8d8f18a1f05b6ca86efea7633e76b8f76547f33800799dfdd24434942dec4fbd9e651ed3aef577d9a6b5ec87ad89c1060e24759 - languageName: node - linkType: hard - -"resolve@npm:~1.19.0": - version: 1.19.0 - resolution: "resolve@npm:1.19.0" - dependencies: - is-core-module: ^2.1.0 - path-parse: ^1.0.6 - checksum: a05b356e47b85ad3613d9e2a39a824f3c27f4fcad9c9ff6c7cc71a2e314c5904a90ab37481ad0069d03cab9eaaac6eb68aca1bc3355fdb05f1045cd50e2aacea - languageName: node - linkType: hard - "resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.20.0 resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b" @@ -33455,25 +33268,6 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@~1.17.0#~builtin": - version: 1.17.0 - resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin::version=1.17.0&hash=07638b" - dependencies: - path-parse: ^1.0.6 - checksum: 6fd799f282ddf078c4bc20ce863e3af01fa8cb218f0658d9162c57161a2dbafe092b13015b9a4c58d0e1e801cf7aa7a4f13115fea9db98c3f9a0c43e429bad6f - languageName: node - linkType: hard - -"resolve@patch:resolve@~1.19.0#~builtin": - version: 1.19.0 - resolution: "resolve@patch:resolve@npm%3A1.19.0#~builtin::version=1.19.0&hash=07638b" - dependencies: - is-core-module: ^2.1.0 - path-parse: ^1.0.6 - checksum: 2443b94d347e6946c87c85faf13071f605e609e0b54784829b0ed2b917d050bfc1cbaf4ecc6453f224cfa7d0c5dcd97cbb273454cd210bee68e4af15c1a5abc9 - languageName: node - linkType: hard - "restore-cursor@npm:^3.1.0": version: 3.1.0 resolution: "restore-cursor@npm:3.1.0" @@ -34095,7 +33889,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:~7.3.0": +"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": version: 7.3.5 resolution: "semver@npm:7.3.5" dependencies: @@ -35209,7 +35003,7 @@ __metadata: languageName: node linkType: hard -"string-argv@npm:^0.3.1, string-argv@npm:~0.3.1": +"string-argv@npm:^0.3.1": version: 0.3.1 resolution: "string-argv@npm:0.3.1" checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf @@ -35489,7 +35283,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1, strip-json-comments@npm:~3.1.1": +"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 @@ -36183,7 +35977,7 @@ __metadata: languageName: node linkType: hard -"timsort@npm:^0.3.0, timsort@npm:~0.3.0": +"timsort@npm:^0.3.0": version: 0.3.0 resolution: "timsort@npm:0.3.0" checksum: 1a66cb897dacabd7dd7c91b7e2301498ca9e224de2edb9e42d19f5b17c4b6dc62a8d4cbc64f28be82aaf1541cb5a78ab49aa818f42a2989ebe049a64af731e2a @@ -36898,7 +36692,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.7.4, typescript@npm:>=2.7, typescript@npm:~4.7.4": +"typescript@npm:4.7.4, typescript@npm:>=2.7": version: 4.7.4 resolution: "typescript@npm:4.7.4" bin: @@ -36918,7 +36712,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4.7.4#~builtin, typescript@patch:typescript@>=2.7#~builtin, typescript@patch:typescript@~4.7.4#~builtin": +"typescript@patch:typescript@4.7.4#~builtin, typescript@patch:typescript@>=2.7#~builtin": version: 4.7.4 resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=f456af" bin: @@ -37511,13 +37305,6 @@ __metadata: languageName: node linkType: hard -"validator@npm:^13.7.0": - version: 13.7.0 - resolution: "validator@npm:13.7.0" - checksum: 2b83283de1222ca549a7ef57f46e8d49c6669213348db78b7045bce36a3b5843ff1e9f709ebf74574e06223461ee1f264f8cc9a26a0060a79a27de079d8286ef - languageName: node - linkType: hard - "value-equal@npm:^1.0.1": version: 1.0.1 resolution: "value-equal@npm:1.0.1" @@ -38735,23 +38522,6 @@ __metadata: languageName: node linkType: hard -"z-schema@npm:~5.0.2": - version: 5.0.2 - resolution: "z-schema@npm:5.0.2" - dependencies: - commander: ^2.7.1 - lodash.get: ^4.4.2 - lodash.isequal: ^4.5.0 - validator: ^13.7.0 - dependenciesMeta: - commander: - optional: true - bin: - z-schema: bin/z-schema - checksum: 084b2f16043ac0a892914ee29cc0b4fafd9338133eec0345cd6ced25e814f647fa67be1090ad5f606759c2c1f2f8c28127960ba187f437f1caf6fb8cd45d7336 - languageName: node - linkType: hard - "zwitch@npm:^1.0.0": version: 1.0.5 resolution: "zwitch@npm:1.0.5"