+
);
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 46d8b03cbb..2037bd240a 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -185,10 +185,7 @@ export class CatalogIdentityClient {
// Warning: (ae-forgotten-export) The symbol "UserQuery" needs to be exported by the entry point index.d.ts
findUser(query: UserQuery): Promise
;
// Warning: (ae-forgotten-export) The symbol "MemberClaimQuery" needs to be exported by the entry point index.d.ts
- resolveCatalogMembership({
- entityRefs,
- logger,
- }: MemberClaimQuery): Promise;
+ resolveCatalogMembership(query: MemberClaimQuery): Promise;
}
// Warning: (ae-missing-release-tag) "createAtlassianProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -270,13 +267,7 @@ export function createOriginFilter(config: Config): (origin: string) => boolean;
// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export function createRouter({
- logger,
- config,
- discovery,
- database,
- providerFactories,
-}: RouterOptions): Promise;
+export function createRouter(options: RouterOptions): Promise;
// @public (undocumented)
export const createSamlProvider: (
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
index 02fe9818cb..a1f915d152 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
@@ -84,10 +84,8 @@ export class CatalogIdentityClient {
*
* Returns a superset of the entity names that can be passed directly to `issueToken` as `ent`.
*/
- async resolveCatalogMembership({
- entityRefs,
- logger,
- }: MemberClaimQuery): Promise {
+ async resolveCatalogMembership(query: MemberClaimQuery): Promise {
+ const { entityRefs, logger } = query;
const resolvedEntityRefs = entityRefs
.map((ref: string) => {
try {
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index 1160ad19c9..2f9c739860 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -59,6 +59,7 @@ export type OAuth2AuthProviderOptions = OAuthProviderOptions & {
tokenUrl: string;
scope?: string;
logger: Logger;
+ includeBasicAuth?: boolean;
};
export class OAuth2AuthProvider implements OAuthHandlers {
@@ -85,12 +86,14 @@ export class OAuth2AuthProvider implements OAuthHandlers {
tokenURL: options.tokenUrl,
passReqToCallback: false as true,
scope: options.scope,
- customHeaders: {
- Authorization: `Basic ${this.encodeClientCredentials(
- options.clientId,
- options.clientSecret,
- )}`,
- },
+ customHeaders: options.includeBasicAuth
+ ? {
+ Authorization: `Basic ${this.encodeClientCredentials(
+ options.clientId,
+ options.clientSecret,
+ )}`,
+ }
+ : undefined,
},
(
accessToken: any,
@@ -244,6 +247,7 @@ export const createOAuth2Provider = (
const authorizationUrl = envConfig.getString('authorizationUrl');
const tokenUrl = envConfig.getString('tokenUrl');
const scope = envConfig.getOptionalString('scope');
+ const includeBasicAuth = envConfig.getOptionalBoolean('includeBasicAuth');
const disableRefresh =
envConfig.getOptionalBoolean('disableRefresh') ?? false;
@@ -280,6 +284,7 @@ export const createOAuth2Provider = (
tokenUrl,
scope,
logger,
+ includeBasicAuth,
});
return OAuthAdapter.fromConfig(globalConfig, provider, {
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index 4aa9ed8778..6a96d421da 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -44,13 +44,10 @@ export interface RouterOptions {
providerFactories?: ProviderFactories;
}
-export async function createRouter({
- logger,
- config,
- discovery,
- database,
- providerFactories,
-}: RouterOptions): Promise {
+export async function createRouter(
+ options: RouterOptions,
+): Promise {
+ const { logger, config, discovery, database, providerFactories } = options;
const router = Router();
const appUrl = config.getString('app.baseUrl');
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index 29f133ab5b..05c64c9b76 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -39,11 +39,12 @@
"@material-ui/lab": "4.0.0-alpha.57",
"humanize-duration": "^3.27.0",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 7c478c0a26..a75f3c3b85 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -36,11 +36,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index 2defba5cca..9cefc6c2dd 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -34,12 +34,13 @@
"@material-ui/pickers": "^3.3.10",
"@testing-library/jest-dom": "^5.10.1",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-hook-form": "^7.13.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/dev-utils": "^0.2.13",
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index b036610f0a..71af8abf83 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -33,11 +33,12 @@
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"qs": "^6.9.6",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4",
"recharts": "^1.8.5"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index 43eb8d61b7..f773905ca0 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -752,13 +752,7 @@ export type DbPageInfo =
//
// @public (undocumented)
export class DefaultCatalogCollator implements DocumentCollator {
- constructor({
- discovery,
- locationTemplate,
- filter,
- catalogClient,
- tokenManager,
- }: {
+ constructor(options: {
discovery: PluginEndpointDiscovery;
tokenManager: TokenManager;
locationTemplate?: string;
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 4c6342c6c6..ebad95e72f 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -56,19 +56,16 @@ export class DefaultCatalogCollator implements DocumentCollator {
});
}
- constructor({
- discovery,
- locationTemplate,
- filter,
- catalogClient,
- tokenManager,
- }: {
+ constructor(options: {
discovery: PluginEndpointDiscovery;
tokenManager: TokenManager;
locationTemplate?: string;
filter?: CatalogEntitiesRequest['filter'];
catalogClient?: CatalogApi;
}) {
+ const { discovery, locationTemplate, filter, catalogClient, tokenManager } =
+ options;
+
this.discovery = discovery;
this.locationTemplate =
locationTemplate || '/catalog/:namespace/:kind/:name';
diff --git a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
index c9ebc8f723..1618ef8d7b 100644
--- a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts
@@ -336,7 +336,10 @@ export class NextCatalogBuilder {
const parser = this.parser || defaultEntityDataParser;
const dbClient = await database.getClient();
- await applyDatabaseMigrations(dbClient);
+ if (!database.migrations?.skip) {
+ logger.info('Performing database migration');
+ await applyDatabaseMigrations(dbClient);
+ }
const db = new CommonDatabase(dbClient, logger);
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 2a44593a4a..edd187eddb 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -30,16 +30,17 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"classnames": "^2.3.1",
"lodash": "^4.17.15",
"p-limit": "^3.1.0",
"qs": "^6.9.4",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index b370c9fa33..cadb50a6af 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -43,17 +43,18 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@octokit/rest": "^18.5.3",
- "@types/react": "*",
"git-url-parse": "^11.6.0",
"js-base64": "^3.6.0",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-hook-form": "^7.12.2",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4",
"yaml": "^1.10.0"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index c65f9144e5..d100e03dde 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -15,7 +15,7 @@
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
- "directory": "plugins/plugin-catalog-common-react"
+ "directory": "plugins/catalog-react"
},
"keywords": [
"backstage"
@@ -41,15 +41,17 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"jwt-decode": "^3.1.0",
"lodash": "^4.17.21",
"qs": "^6.9.4",
- "react": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4",
"zen-observable": "^0.8.15"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/test-utils": "^0.1.22",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 6caadb7b42..6fd875249e 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -42,15 +42,16 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"history": "^5.0.0",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-helmet": "6.1.0",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
index 3f3fc804e1..a45afe6e02 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
@@ -31,9 +31,8 @@ import {
renderInTestApp,
TestApiRegistry,
} from '@backstage/test-utils';
-import { fireEvent } from '@testing-library/react';
+import { act, fireEvent } from '@testing-library/react';
import React from 'react';
-import { act } from 'react-dom/test-utils';
import { Route, Routes } from 'react-router';
import { EntityLayout } from './EntityLayout';
diff --git a/plugins/catalog/src/components/EntityPageLayout/Tabbed/Tabbed.test.tsx b/plugins/catalog/src/components/EntityPageLayout/Tabbed/Tabbed.test.tsx
index 9681420e1c..ad111380f8 100644
--- a/plugins/catalog/src/components/EntityPageLayout/Tabbed/Tabbed.test.tsx
+++ b/plugins/catalog/src/components/EntityPageLayout/Tabbed/Tabbed.test.tsx
@@ -16,8 +16,7 @@
import React from 'react';
import { Tabbed } from './Tabbed';
import { renderInTestApp } from '@backstage/test-utils';
-import { fireEvent } from '@testing-library/react';
-import { act } from 'react-dom/test-utils';
+import { act, fireEvent } from '@testing-library/react';
import { Routes, Route } from 'react-router';
describe('Tabbed layout', () => {
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 45579ab82b..9d94d61dcd 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -44,13 +44,14 @@
"humanize-duration": "^3.27.0",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-lazylog": "^4.5.2",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 3c9e14c9e7..6fab2b8d35 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -41,13 +41,14 @@
"@material-ui/lab": "4.0.0-alpha.57",
"luxon": "^2.0.2",
"qs": "^6.9.4",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-lazylog": "^4.5.3",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 907a0abcd7..d1a7d019bb 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -34,13 +34,14 @@
"@material-ui/styles": "^4.11.0",
"highlight.js": "^10.6.0",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4",
"recharts": "^1.8.5"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/config-schema/api-report.md b/plugins/config-schema/api-report.md
index efeb1646eb..f3b620738f 100644
--- a/plugins/config-schema/api-report.md
+++ b/plugins/config-schema/api-report.md
@@ -41,11 +41,9 @@ export const configSchemaPlugin: BackstagePlugin<
{}
>;
-// Warning: (ae-missing-release-tag) "StaticSchemaLoader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
// @public
export class StaticSchemaLoader implements ConfigSchemaApi {
- constructor({ url }?: { url?: string });
+ constructor(options?: { url?: string });
// (undocumented)
schema$(): Observable;
}
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 6b79c5493c..be9fb7fb12 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -31,11 +31,12 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"jsonschema": "^1.2.6",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4",
"zen-observable": "^0.8.15"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/config-schema/src/api/StaticSchemaLoader.ts b/plugins/config-schema/src/api/StaticSchemaLoader.ts
index 71eae63376..5fc979b76d 100644
--- a/plugins/config-schema/src/api/StaticSchemaLoader.ts
+++ b/plugins/config-schema/src/api/StaticSchemaLoader.ts
@@ -24,12 +24,14 @@ const DEFAULT_URL = 'config-schema.json';
/**
* A ConfigSchemaApi implementation that loads the configuration from a URL.
+ *
+ * @public
*/
export class StaticSchemaLoader implements ConfigSchemaApi {
private readonly url: string;
- constructor({ url = DEFAULT_URL }: { url?: string } = {}) {
- this.url = url;
+ constructor(options: { url?: string } = {}) {
+ this.url = options?.url ?? DEFAULT_URL;
}
schema$(): Observable {
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 6a2d582d63..6e196fffcb 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -39,21 +39,22 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@material-ui/styles": "^4.9.6",
- "@types/react": "*",
"@types/recharts": "^1.8.14",
"classnames": "^2.2.6",
"history": "^5.0.0",
"luxon": "^2.0.2",
"pluralize": "^8.0.0",
"qs": "^6.9.4",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4",
"recharts": "^1.8.5",
"regression": "^2.0.1",
"yup": "^0.32.9"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index b4e08a526f..62a7aae2dc 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -40,14 +40,15 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"classnames": "^2.2.6",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 2b3bf05b1e..e6cb9e8375 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -30,10 +30,11 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"luxon": "^1.27.0",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 7d56fdc333..9c79b14685 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -44,10 +44,11 @@
"cross-fetch": "^3.0.6",
"luxon": "^2.0.2",
"p-limit": "^3.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index a3a53b317e..17d43de3d2 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -37,11 +37,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "^6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index c5ef82ac16..0c19efc211 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -29,15 +29,16 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@octokit/rest": "^18.5.3",
- "@types/react": "*",
"luxon": "^2.0.2",
"qs": "^6.10.1",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4",
"recharts": "^1.8.5"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index b0fa469a50..0ea8bbe9f2 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -44,13 +44,14 @@
"@material-ui/lab": "4.0.0-alpha.57",
"@octokit/rest": "^18.5.3",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-lazylog": "^4.5.3",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/github-deployments/api-report.md b/plugins/github-deployments/api-report.md
index a8fca185e5..36680cb020 100644
--- a/plugins/github-deployments/api-report.md
+++ b/plugins/github-deployments/api-report.md
@@ -38,11 +38,7 @@ function createStatusColumn(): TableColumn;
// Warning: (ae-missing-release-tag) "EntityGithubDeploymentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export const EntityGithubDeploymentsCard: ({
- last,
- lastStatuses,
- columns,
-}: {
+export const EntityGithubDeploymentsCard: (props: {
last?: number | undefined;
lastStatuses?: number | undefined;
columns?: TableColumn[] | undefined;
@@ -58,12 +54,9 @@ export const githubDeploymentsPlugin: BackstagePlugin<{}, {}>;
// Warning: (ae-missing-release-tag) "GithubDeploymentsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export function GithubDeploymentsTable({
- deployments,
- isLoading,
- reload,
- columns,
-}: GithubDeploymentsTableProps): JSX.Element;
+export function GithubDeploymentsTable(
+ props: GithubDeploymentsTableProps,
+): JSX.Element;
// @public (undocumented)
export namespace GithubDeploymentsTable {
@@ -78,7 +71,7 @@ export namespace GithubDeploymentsTable {
// Warning: (ae-missing-release-tag) "GithubStateIndicator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-const GithubStateIndicator: ({ state }: { state: string }) => JSX.Element;
+const GithubStateIndicator: (props: { state: string }) => JSX.Element;
// Warning: (ae-missing-release-tag) "isGithubDeploymentsAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index a1dad4ecca..4836568a1f 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -34,10 +34,11 @@
"@material-ui/lab": "4.0.0-alpha.57",
"@octokit/graphql": "^4.5.8",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx b/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
index c01cd98a45..c1c33607a1 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
@@ -80,15 +80,12 @@ const GithubDeploymentsComponent = ({
);
};
-export const GithubDeploymentsCard = ({
- last,
- lastStatuses,
- columns,
-}: {
+export const GithubDeploymentsCard = (props: {
last?: number;
lastStatuses?: number;
columns?: TableColumn[];
}) => {
+ const { last, lastStatuses, columns } = props;
const { entity } = useEntity();
const [host] = [
entity?.metadata.annotations?.[SOURCE_LOCATION_ANNOTATION],
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsTable/GithubDeploymentsTable.tsx b/plugins/github-deployments/src/components/GithubDeploymentsTable/GithubDeploymentsTable.tsx
index 2de7cdf419..2c48f3eef1 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsTable/GithubDeploymentsTable.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsTable/GithubDeploymentsTable.tsx
@@ -36,12 +36,8 @@ type GithubDeploymentsTableProps = {
columns: TableColumn[];
};
-export function GithubDeploymentsTable({
- deployments,
- isLoading,
- reload,
- columns,
-}: GithubDeploymentsTableProps) {
+export function GithubDeploymentsTable(props: GithubDeploymentsTableProps) {
+ const { deployments, isLoading, reload, columns } = props;
const classes = useStyles();
return (
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx b/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
index e892b12427..9a720c0e75 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
@@ -27,8 +27,8 @@ import {
Link,
} from '@backstage/core-components';
-export const GithubStateIndicator = ({ state }: { state: string }) => {
- switch (state) {
+export const GithubStateIndicator = (props: { state: string }) => {
+ switch (props.state) {
case 'PENDING':
return ;
case 'IN_PROGRESS':
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 6b211f59ed..5cc63e43df 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -38,11 +38,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index 4fbf6b0dab..571024eaec 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,11 @@
# @backstage/plugin-graphiql
+## 0.2.23
+
+### Patch Changes
+
+- dde1681f33: chore(dependencies): bump `graphiql` package to latest
+
## 0.2.22
### Patch Changes
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 49c4d9952c..06dd85aeee 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-graphiql",
"description": "Backstage plugin for browsing GraphQL APIs",
- "version": "0.2.22",
+ "version": "0.2.23",
"private": false,
"publishConfig": {
"access": "public",
@@ -37,12 +37,13 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "graphiql": "^1.0.0-alpha.10",
- "graphql": "15.5.0",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
+ "graphiql": "^1.5.12",
+ "graphql": "^16.0.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.test.tsx b/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.test.tsx
index ae84b549ec..90f8edd4ad 100644
--- a/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.test.tsx
+++ b/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.test.tsx
@@ -18,7 +18,7 @@ import React from 'react';
import { GraphiQLPage } from './GraphiQLPage';
import { ThemeProvider } from '@material-ui/core';
import { lightTheme } from '@backstage/theme';
-import { act } from 'react-dom/test-utils';
+import { act } from '@testing-library/react';
import { renderWithEffects, TestApiProvider } from '@backstage/test-utils';
import { GraphQLBrowseApi, graphQlBrowseApiRef } from '../../lib/api';
import { configApiRef } from '@backstage/core-plugin-api';
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 97ec5fdfc2..6d8df2e7a8 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -27,13 +27,14 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 2e477b2f06..4d7cfd9bfb 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -34,10 +34,11 @@
"@material-ui/pickers": "^3.3.10",
"humanize-duration": "^3.26.0",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index e879d13a88..cc23fe1265 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -41,12 +41,13 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 41d677aece..0e0bff24dc 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -29,11 +29,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 5e7a5bdf8d..1997da237a 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -46,11 +46,12 @@
"js-yaml": "^4.0.0",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index cbd5db27b4..9942747d64 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -41,11 +41,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
@@ -57,7 +58,7 @@
"@testing-library/user-event": "^13.1.8",
"@types/jest": "^26.0.7",
"@types/node": "^14.14.32",
- "@types/react": "*",
+ "@types/react": "^16.13.1 || ^17.0.0",
"cross-fetch": "^3.0.6",
"msw": "^0.35.0"
},
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 6676547a85..b064e94bcc 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -38,10 +38,11 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 2adb6c5d18..2e324513ef 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -30,12 +30,13 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"qs": "^6.10.1",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/pagerduty/api-report.md b/plugins/pagerduty/api-report.md
index 689edae1e0..bd26531da6 100644
--- a/plugins/pagerduty/api-report.md
+++ b/plugins/pagerduty/api-report.md
@@ -10,7 +10,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
import { ConfigApi } from '@backstage/core-plugin-api';
import { DiscoveryApi } from '@backstage/core-plugin-api';
import { Entity } from '@backstage/catalog-model';
-import { PropsWithChildren } from 'react';
+import { ReactNode } from 'react';
// Warning: (ae-missing-release-tag) "EntityPagerDutyCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -65,12 +65,7 @@ export class PagerDutyClient implements PagerDutyApi {
// Warning: (ae-forgotten-export) The symbol "TriggerAlarmRequest" needs to be exported by the entry point index.d.ts
//
// (undocumented)
- triggerAlarm({
- integrationKey,
- source,
- description,
- userName,
- }: TriggerAlarmRequest): Promise;
+ triggerAlarm(request: TriggerAlarmRequest): Promise;
}
// Warning: (ae-missing-release-tag) "pagerDutyPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -84,9 +79,7 @@ export { pagerDutyPlugin as plugin };
// Warning: (ae-missing-release-tag) "TriggerButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export function TriggerButton({
- children,
-}: PropsWithChildren): JSX.Element;
+export function TriggerButton(props: TriggerButtonProps): JSX.Element;
// Warning: (ae-missing-release-tag) "UnauthorizedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 13cb8854ae..632875a043 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -39,14 +39,15 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"classnames": "^2.2.6",
"luxon": "2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/pagerduty/src/api/client.ts b/plugins/pagerduty/src/api/client.ts
index c006403fe7..65ff83e7ba 100644
--- a/plugins/pagerduty/src/api/client.ts
+++ b/plugins/pagerduty/src/api/client.ts
@@ -91,12 +91,9 @@ export class PagerDutyClient implements PagerDutyApi {
return oncalls;
}
- triggerAlarm({
- integrationKey,
- source,
- description,
- userName,
- }: TriggerAlarmRequest): Promise {
+ triggerAlarm(request: TriggerAlarmRequest): Promise {
+ const { integrationKey, source, description, userName } = request;
+
const body = JSON.stringify({
event_action: 'trigger',
routing_key: integrationKey,
diff --git a/plugins/pagerduty/src/components/TriggerButton/index.tsx b/plugins/pagerduty/src/components/TriggerButton/index.tsx
index 93897c77be..6f83effcf4 100644
--- a/plugins/pagerduty/src/components/TriggerButton/index.tsx
+++ b/plugins/pagerduty/src/components/TriggerButton/index.tsx
@@ -13,14 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import React, { useCallback, PropsWithChildren, useState } from 'react';
+import React, { useCallback, ReactNode, useState } from 'react';
import { makeStyles, Button } from '@material-ui/core';
import { BackstageTheme } from '@backstage/theme';
import { usePagerdutyEntity } from '../../hooks';
import { TriggerDialog } from '../TriggerDialog';
-export type TriggerButtonProps = {};
+export type TriggerButtonProps = {
+ children?: ReactNode;
+};
const useStyles = makeStyles(theme => ({
buttonStyle: {
@@ -32,9 +34,7 @@ const useStyles = makeStyles(theme => ({
},
}));
-export function TriggerButton({
- children,
-}: PropsWithChildren) {
+export function TriggerButton(props: TriggerButtonProps) {
const { buttonStyle } = useStyles();
const { integrationKey } = usePagerdutyEntity();
const [dialogShown, setDialogShown] = useState(false);
@@ -56,7 +56,7 @@ export function TriggerButton({
disabled={disabled}
>
{integrationKey
- ? children ?? 'Create Incident'
+ ? props.children ?? 'Create Incident'
: 'Missing integration key'}
{integrationKey && (
diff --git a/plugins/permission-node/api-report.md b/plugins/permission-node/api-report.md
index 75c45a9250..adc1cbc3c6 100644
--- a/plugins/permission-node/api-report.md
+++ b/plugins/permission-node/api-report.md
@@ -83,11 +83,7 @@ export const createConditionTransformer: <
) => ConditionTransformer;
// @public
-export const createPermissionIntegrationRouter: ({
- resourceType,
- rules,
- getResource,
-}: {
+export const createPermissionIntegrationRouter: (options: {
resourceType: string;
rules: PermissionRule[];
getResource: (resourceRef: string) => Promise;
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
index 70b72fef7e..b8d3e02a81 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
@@ -116,17 +116,15 @@ const applyConditions = (
* This is used to construct the `createPermissionIntegrationRouter`, a function to add an
* authorization route to your backend plugin. This route will be called by the `permission-backend`
* when authorization conditions relating to this plugin need to be evaluated.
+ *
* @public
*/
-export const createPermissionIntegrationRouter = ({
- resourceType,
- rules,
- getResource,
-}: {
+export const createPermissionIntegrationRouter = (options: {
resourceType: string;
rules: PermissionRule[];
getResource: (resourceRef: string) => Promise;
}): Router => {
+ const { resourceType, rules, getResource } = options;
const router = Router();
const getRule = createGetRule(rules);
diff --git a/plugins/permission-react/api-report.md b/plugins/permission-react/api-report.md
index 65f93de8a0..c10317495a 100644
--- a/plugins/permission-react/api-report.md
+++ b/plugins/permission-react/api-report.md
@@ -6,12 +6,13 @@
import { ApiRef } from '@backstage/core-plugin-api';
import { AuthorizeRequest } from '@backstage/plugin-permission-common';
import { AuthorizeResponse } from '@backstage/plugin-permission-common';
+import { ComponentProps } from 'react';
import { Config } from '@backstage/config';
import { DiscoveryApi } from '@backstage/core-plugin-api';
import { IdentityApi } from '@backstage/core-plugin-api';
import { Permission } from '@backstage/plugin-permission-common';
-import { default as React_2 } from 'react';
-import { RouteProps } from 'react-router';
+import { ReactElement } from 'react';
+import { Route } from 'react-router';
// @public (undocumented)
export type AsyncPermissionResult = {
@@ -25,11 +26,7 @@ export class IdentityPermissionApi implements PermissionApi {
// (undocumented)
authorize(request: AuthorizeRequest): Promise;
// (undocumented)
- static create({
- configApi,
- discoveryApi,
- identityApi,
- }: {
+ static create(options: {
configApi: Config;
discoveryApi: DiscoveryApi;
identityApi: IdentityApi;
@@ -45,19 +42,13 @@ export type PermissionApi = {
export const permissionApiRef: ApiRef;
// @public
-export const PermissionedRoute: ({
- permission,
- resourceRef,
- errorComponent,
- ...props
-}: RouteProps & {
- permission: Permission;
- resourceRef?: string | undefined;
- errorComponent?:
- | React_2.ReactElement>
- | null
- | undefined;
-}) => JSX.Element;
+export const PermissionedRoute: (
+ props: ComponentProps & {
+ permission: Permission;
+ resourceRef?: string;
+ errorComponent?: ReactElement | null;
+ },
+) => JSX.Element;
// @public
export const usePermission: (
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index 26c5f71da0..4055e5f2ae 100644
--- a/plugins/permission-react/package.json
+++ b/plugins/permission-react/package.json
@@ -30,12 +30,14 @@
"@backstage/config": "^0.1.11",
"@backstage/core-plugin-api": "^0.2.2",
"@backstage/plugin-permission-common": "^0.2.0",
- "@types/react": "*",
"cross-fetch": "^3.0.6",
- "react": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/test-utils": "^0.1.22",
diff --git a/plugins/permission-react/src/apis/IdentityPermissionApi.ts b/plugins/permission-react/src/apis/IdentityPermissionApi.ts
index a68060a61d..19de564f84 100644
--- a/plugins/permission-react/src/apis/IdentityPermissionApi.ts
+++ b/plugins/permission-react/src/apis/IdentityPermissionApi.ts
@@ -34,15 +34,12 @@ export class IdentityPermissionApi implements PermissionApi {
private readonly identityApi: IdentityApi,
) {}
- static create({
- configApi,
- discoveryApi,
- identityApi,
- }: {
+ static create(options: {
configApi: Config;
discoveryApi: DiscoveryApi;
identityApi: IdentityApi;
}) {
+ const { configApi, discoveryApi, identityApi } = options;
const permissionClient = new PermissionClient({ discoveryApi, configApi });
return new IdentityPermissionApi(permissionClient, identityApi);
}
diff --git a/plugins/permission-react/src/components/PermissionedRoute.tsx b/plugins/permission-react/src/components/PermissionedRoute.tsx
index 1a3668205b..76017308aa 100644
--- a/plugins/permission-react/src/components/PermissionedRoute.tsx
+++ b/plugins/permission-react/src/components/PermissionedRoute.tsx
@@ -21,20 +21,19 @@ import { usePermission } from '../hooks';
import { Permission } from '@backstage/plugin-permission-common';
/**
- * Returns a React Router Route which only renders the element when authorized. If unathorized, the Route will render a
+ * Returns a React Router Route which only renders the element when authorized. If unauthorized, the Route will render a
* NotFoundErrorPage (see {@link @backstage/core-app-api#AppComponents}).
+ *
* @public
*/
-export const PermissionedRoute = ({
- permission,
- resourceRef,
- errorComponent,
- ...props
-}: ComponentProps & {
- permission: Permission;
- resourceRef?: string;
- errorComponent?: ReactElement | null;
-}) => {
+export const PermissionedRoute = (
+ props: ComponentProps & {
+ permission: Permission;
+ resourceRef?: string;
+ errorComponent?: ReactElement | null;
+ },
+) => {
+ const { permission, resourceRef, errorComponent, ...otherProps } = props;
const permissionResult = usePermission(permission, resourceRef);
const app = useApp();
const { NotFoundErrorPage } = app.getComponents();
@@ -48,5 +47,5 @@ export const PermissionedRoute = ({
shownElement = props.element;
}
- return ;
+ return ;
};
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index d71c5e1cfe..4d265b05b3 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -41,13 +41,14 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-sparklines": "^1.7.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
@@ -59,7 +60,7 @@
"@testing-library/user-event": "^13.1.8",
"@types/jest": "^26.0.7",
"@types/node": "^14.14.32",
- "@types/react": "*",
+ "@types/react": "^16.13.1 || ^17.0.0",
"cross-fetch": "^3.0.6",
"msw": "^0.35.0"
},
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index cac3d7ea9b..51810a2c80 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -8,12 +8,12 @@
"private": false,
"publishConfig": {
"access": "public",
- "main": "dist/index.esm.js",
+ "main": "dist/index.cjs.js",
"types": "dist/index.d.ts"
},
"scripts": {
- "build": "backstage-cli plugin:build",
- "start": "backstage-cli plugin:serve",
+ "build": "backstage-cli backend:build",
+ "start": "backstage-cli backend:dev",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"prepack": "backstage-cli prepack",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 404bfcd387..35b14dffa1 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -47,7 +47,6 @@
"@material-ui/lab": "4.0.0-alpha.57",
"@rjsf/core": "^3.2.1",
"@rjsf/material-ui": "^3.2.1",
- "@types/react": "*",
"classnames": "^2.2.6",
"git-url-parse": "^11.6.0",
"humanize-duration": "^3.25.1",
@@ -56,8 +55,6 @@
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"qs": "^6.9.4",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-lazylog": "^4.5.2",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
@@ -65,6 +62,10 @@
"use-immer": "^0.6.0",
"zen-observable": "^0.8.15"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
index 60e9ee8840..7ca65fff25 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
@@ -20,9 +20,8 @@ import {
} from '@backstage/test-utils';
import { lightTheme } from '@backstage/theme';
import { ThemeProvider } from '@material-ui/core';
-import { fireEvent, within } from '@testing-library/react';
+import { act, fireEvent, within } from '@testing-library/react';
import React from 'react';
-import { act } from 'react-dom/test-utils';
import { MemoryRouter, Route } from 'react-router';
import { ScaffolderApi, scaffolderApiRef } from '../../api';
import { rootRouteRef } from '../../routes';
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index da1f7d4804..1e798119c3 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -11,8 +11,6 @@ import { SearchEngine } from '@backstage/search-common';
import { SearchQuery } from '@backstage/search-common';
import { SearchResultSet } from '@backstage/search-common';
-// Warning: (ae-missing-release-tag) "ElasticSearchSearchEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
// @public (undocumented)
export class ElasticSearchSearchEngine implements SearchEngine {
constructor(
@@ -24,12 +22,9 @@ export class ElasticSearchSearchEngine implements SearchEngine {
// Warning: (ae-forgotten-export) The symbol "ElasticSearchOptions" needs to be exported by the entry point index.d.ts
//
// (undocumented)
- static fromConfig({
- logger,
- config,
- aliasPostfix,
- indexPrefix,
- }: ElasticSearchOptions): Promise;
+ static fromConfig(
+ options: ElasticSearchOptions,
+ ): Promise;
// (undocumented)
index(type: string, documents: IndexableDocument[]): Promise;
// (undocumented)
@@ -41,11 +36,6 @@ export class ElasticSearchSearchEngine implements SearchEngine {
// Warning: (ae-forgotten-export) The symbol "ConcreteElasticSearchQuery" needs to be exported by the entry point index.d.ts
//
// (undocumented)
- protected translator({
- term,
- filters,
- types,
- pageCursor,
- }: SearchQuery): ConcreteElasticSearchQuery;
+ protected translator(query: SearchQuery): ConcreteElasticSearchQuery;
}
```
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 1a41099c9c..7912c691b3 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -64,6 +64,9 @@ function isBlank(str: string) {
return (isEmpty(str) && !isNumber(str)) || nan(str);
}
+/**
+ * @public
+ */
export class ElasticSearchSearchEngine implements SearchEngine {
constructor(
private readonly elasticSearchClient: Client,
@@ -72,12 +75,14 @@ export class ElasticSearchSearchEngine implements SearchEngine {
private readonly logger: Logger,
) {}
- static async fromConfig({
- logger,
- config,
- aliasPostfix = `search`,
- indexPrefix = ``,
- }: ElasticSearchOptions) {
+ static async fromConfig(options: ElasticSearchOptions) {
+ const {
+ logger,
+ config,
+ aliasPostfix = `search`,
+ indexPrefix = ``,
+ } = options;
+
return new ElasticSearchSearchEngine(
await ElasticSearchSearchEngine.constructElasticSearchClient(
logger,
@@ -164,12 +169,9 @@ export class ElasticSearchSearchEngine implements SearchEngine {
});
}
- protected translator({
- term,
- filters = {},
- types,
- pageCursor,
- }: SearchQuery): ConcreteElasticSearchQuery {
+ protected translator(query: SearchQuery): ConcreteElasticSearchQuery {
+ const { term, filters = {}, types, pageCursor } = query;
+
const filter = Object.entries(filters)
.filter(([_, value]) => Boolean(value))
.map(([key, value]: [key: string, value: any]) => {
@@ -190,7 +192,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
'Failed to add filters to query. Unrecognized filter type',
);
});
- const query = isBlank(term)
+ const esbQuery = isBlank(term)
? esb.matchAllQuery()
: esb
.multiMatchQuery(['*'], term)
@@ -202,7 +204,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
return {
elasticSearchQuery: esb
.requestBodySearch()
- .query(esb.boolQuery().filter(filter).must([query]))
+ .query(esb.boolQuery().filter(filter).must([esbQuery]))
.from(page * pageSize)
.size(pageSize)
.toJSON(),
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
index 7a171127a3..e2edfc291a 100644
--- a/plugins/search-backend-module-pg/api-report.md
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -77,9 +77,7 @@ export interface DatabaseStore {
export class PgSearchEngine implements SearchEngine {
constructor(databaseStore: DatabaseStore);
// (undocumented)
- static from({
- database,
- }: {
+ static from(options: {
database: PluginDatabaseManager;
}): Promise;
// (undocumented)
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index a032dd783e..6fd6c571a8 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -35,13 +35,11 @@ export type ConcretePgSearchQuery = {
export class PgSearchEngine implements SearchEngine {
constructor(private readonly databaseStore: DatabaseStore) {}
- static async from({
- database,
- }: {
+ static async from(options: {
database: PluginDatabaseManager;
}): Promise {
return new PgSearchEngine(
- await DatabaseDocumentStore.create(await database.getClient()),
+ await DatabaseDocumentStore.create(await options.database.getClient()),
);
}
diff --git a/plugins/search-backend/api-report.md b/plugins/search-backend/api-report.md
index f2479610fe..cac97bd725 100644
--- a/plugins/search-backend/api-report.md
+++ b/plugins/search-backend/api-report.md
@@ -7,12 +7,16 @@ import express from 'express';
import { Logger as Logger_2 } from 'winston';
import { SearchEngine } from '@backstage/plugin-search-backend-node';
-// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export function createRouter({
- engine,
- logger,
-}: RouterOptions): Promise;
+export function createRouter(options: RouterOptions): Promise;
+
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type RouterOptions = {
+ engine: SearchEngine;
+ logger: Logger_2;
+};
```
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 6df39ca1eb..5bd99988a7 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -20,15 +20,15 @@ import { Logger } from 'winston';
import { SearchQuery, SearchResultSet } from '@backstage/search-common';
import { SearchEngine } from '@backstage/plugin-search-backend-node';
-type RouterOptions = {
+export type RouterOptions = {
engine: SearchEngine;
logger: Logger;
};
-export async function createRouter({
- engine,
- logger,
-}: RouterOptions): Promise {
+export async function createRouter(
+ options: RouterOptions,
+): Promise {
+ const { engine, logger } = options;
const router = Router();
router.get(
'/query',
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 1804a7aca8..e301a2e452 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -42,14 +42,15 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "@types/react": "*",
"qs": "^6.9.4",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/search/src/components/util.test.tsx b/plugins/search/src/components/util.test.tsx
index a5b82370e3..1b452a205e 100644
--- a/plugins/search/src/components/util.test.tsx
+++ b/plugins/search/src/components/util.test.tsx
@@ -16,11 +16,10 @@
import React from 'react';
import { wrapInTestApp } from '@backstage/test-utils';
-import { render } from '@testing-library/react';
+import { act, render } from '@testing-library/react';
import { useNavigateToQuery } from './util';
import { Routes, Route } from 'react-router-dom';
import { rootRouteRef } from '../plugin';
-import { act } from 'react-dom/test-utils';
const navigate = jest.fn();
jest.mock('react-router-dom', () => ({
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index bb99225479..a82cb205b6 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -41,12 +41,13 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-sparklines": "^1.7.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
@@ -58,7 +59,7 @@
"@types/jest": "^26.0.7",
"@types/luxon": "^2.0.4",
"@types/node": "^14.14.32",
- "@types/react": "*",
+ "@types/react": "^16.13.1 || ^17.0.0",
"cross-fetch": "^3.0.6",
"msw": "^0.35.0"
},
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index f1f41854ef..352cae13be 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -29,14 +29,15 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@types/zen-observable": "^0.8.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-hook-form": "^7.12.2",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4",
"uuid": "^8.3.2",
"zen-observable": "^0.8.15"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 36c903701f..34d206846f 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -44,10 +44,11 @@
"@material-ui/styles": "^4.10.0",
"cross-fetch": "^3.0.6",
"rc-progress": "^3.0.0",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 28ce356d9c..757f8d6dc9 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -41,11 +41,12 @@
"@material-ui/lab": "4.0.0-alpha.57",
"classnames": "^2.2.6",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index a55a0ce904..a5d8f87232 100644
--- a/plugins/tech-insights/package.json
+++ b/plugins/tech-insights/package.json
@@ -26,8 +26,6 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4",
"react-router-dom": "6.0.0-beta.0",
"@backstage/plugin-catalog-react": "^0.6.4",
@@ -36,6 +34,9 @@
"@backstage/errors": "^0.1.4",
"@backstage/types": "^0.1.1"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index d377318e4b..6746e2188d 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -40,10 +40,11 @@
"color": "^4.0.1",
"d3-force": "^2.0.1",
"prop-types": "^15.7.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
@@ -56,7 +57,7 @@
"@types/d3-force": "^2.1.1",
"@types/jest": "^26.0.7",
"@types/node": "^14.14.32",
- "@types/react": "*",
+ "@types/react": "^16.13.1 || ^17.0.0",
"cross-fetch": "^3.0.6",
"msw": "^0.35.0"
},
diff --git a/plugins/tech-radar/src/components/RadarComponent.test.tsx b/plugins/tech-radar/src/components/RadarComponent.test.tsx
index 2b237c8d83..aeced1a2da 100644
--- a/plugins/tech-radar/src/components/RadarComponent.test.tsx
+++ b/plugins/tech-radar/src/components/RadarComponent.test.tsx
@@ -15,10 +15,9 @@
*/
import React from 'react';
-import { render, waitForElement } from '@testing-library/react';
+import { act, render, waitForElement } from '@testing-library/react';
import { ThemeProvider } from '@material-ui/core';
import { lightTheme } from '@backstage/theme';
-import { act } from 'react-dom/test-utils';
import { TestApiProvider, withLogCollector } from '@backstage/test-utils';
import GetBBoxPolyfill from '../utils/polyfills/getBBox';
diff --git a/plugins/tech-radar/src/components/RadarPage.test.tsx b/plugins/tech-radar/src/components/RadarPage.test.tsx
index 7f4e69e388..e9bcb3d314 100644
--- a/plugins/tech-radar/src/components/RadarPage.test.tsx
+++ b/plugins/tech-radar/src/components/RadarPage.test.tsx
@@ -22,9 +22,8 @@ import {
} from '@backstage/test-utils';
import { lightTheme } from '@backstage/theme';
import { ThemeProvider } from '@material-ui/core';
-import { render, waitForElement } from '@testing-library/react';
+import { act, render, waitForElement } from '@testing-library/react';
import React from 'react';
-import { act } from 'react-dom/test-utils';
import GetBBoxPolyfill from '../utils/polyfills/getBBox';
import { RadarPage } from './RadarPage';
import { TechRadarLoaderResponse, techRadarApiRef, TechRadarApi } from '../api';
diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md
index 9736555687..b241917bc0 100644
--- a/plugins/techdocs-backend/api-report.md
+++ b/plugins/techdocs-backend/api-report.md
@@ -28,15 +28,7 @@ export function createRouter(options: RouterOptions): Promise;
// @public (undocumented)
export class DefaultTechDocsCollator implements DocumentCollator {
// @deprecated
- constructor({
- discovery,
- locationTemplate,
- logger,
- catalogClient,
- tokenManager,
- parallelismLimit,
- legacyPathCasing,
- }: TechDocsCollatorOptions);
+ constructor(options: TechDocsCollatorOptions);
// (undocumented)
protected applyArgsToFormat(
format: string,
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
index 283d0264e4..fa8a1156fe 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -63,24 +63,17 @@ export class DefaultTechDocsCollator implements DocumentCollator {
/**
* @deprecated use static fromConfig method instead.
*/
- constructor({
- discovery,
- locationTemplate,
- logger,
- catalogClient,
- tokenManager,
- parallelismLimit = 10,
- legacyPathCasing = false,
- }: TechDocsCollatorOptions) {
- this.discovery = discovery;
+ constructor(options: TechDocsCollatorOptions) {
+ this.discovery = options.discovery;
this.locationTemplate =
- locationTemplate || '/docs/:namespace/:kind/:name/:path';
- this.logger = logger;
+ options.locationTemplate || '/docs/:namespace/:kind/:name/:path';
+ this.logger = options.logger;
this.catalogClient =
- catalogClient || new CatalogClient({ discoveryApi: discovery });
- this.parallelismLimit = parallelismLimit;
- this.legacyPathCasing = legacyPathCasing;
- this.tokenManager = tokenManager;
+ options.catalogClient ||
+ new CatalogClient({ discoveryApi: options.discovery });
+ this.parallelismLimit = options.parallelismLimit ?? 10;
+ this.legacyPathCasing = options.legacyPathCasing ?? false;
+ this.tokenManager = options.tokenManager;
}
static fromConfig(config: Config, options: TechDocsCollatorOptions) {
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index c65fba7210..b048761e1c 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -47,19 +47,21 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@material-ui/styles": "^4.10.0",
- "@types/react": "*",
"dompurify": "^2.2.9",
"event-source-polyfill": "^1.0.25",
"git-url-parse": "^11.6.0",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-lazylog": "^4.5.2",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-text-truncate": "^0.16.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "@types/react": "^16.13.1 || ^17.0.0",
+ "react": "^16.13.1 || ^17.0.0",
+ "react-dom": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/techdocs/src/EntityPageDocs.tsx b/plugins/techdocs/src/EntityPageDocs.tsx
index c5356289f0..b10fba6d2e 100644
--- a/plugins/techdocs/src/EntityPageDocs.tsx
+++ b/plugins/techdocs/src/EntityPageDocs.tsx
@@ -17,15 +17,18 @@
import React from 'react';
import { Entity } from '@backstage/catalog-model';
import { Reader } from './reader';
+import { toLowerMaybe } from './helpers';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
export const EntityPageDocs = ({ entity }: { entity: Entity }) => {
+ const config = useApi(configApiRef);
return (
);
diff --git a/plugins/techdocs/src/helpers.ts b/plugins/techdocs/src/helpers.ts
new file mode 100644
index 0000000000..7ff4dec6e7
--- /dev/null
+++ b/plugins/techdocs/src/helpers.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Config } from '@backstage/config';
+
+// Lower-case entity triplets by default, but allow override.
+export function toLowerMaybe(str: string, config: Config) {
+ return config.getOptionalBoolean(
+ 'techdocs.legacyUseCaseSensitiveTripletPaths',
+ )
+ ? str
+ : str.toLocaleLowerCase('en-US');
+}
diff --git a/plugins/techdocs/src/home/components/DocsCardGrid.tsx b/plugins/techdocs/src/home/components/DocsCardGrid.tsx
index 77e69995ae..1aef793bd2 100644
--- a/plugins/techdocs/src/home/components/DocsCardGrid.tsx
+++ b/plugins/techdocs/src/home/components/DocsCardGrid.tsx
@@ -17,7 +17,7 @@
import React from 'react';
import { Entity } from '@backstage/catalog-model';
-import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import { useApi, useRouteRef, configApiRef } from '@backstage/core-plugin-api';
import { Card, CardActions, CardContent, CardMedia } from '@material-ui/core';
import { rootDocsRouteRef } from '../../routes';
@@ -26,6 +26,7 @@ import {
ItemCardGrid,
ItemCardHeader,
} from '@backstage/core-components';
+import { toLowerMaybe } from '../../helpers';
export const DocsCardGrid = ({
entities,
@@ -33,14 +34,7 @@ export const DocsCardGrid = ({
entities: Entity[] | undefined;
}) => {
const getRouteToReaderPageFor = useRouteRef(rootDocsRouteRef);
-
- // Lower-case entity triplets by default, but allow override.
- const toLowerMaybe = useApi(configApiRef).getOptionalBoolean(
- 'techdocs.legacyUseCaseSensitiveTripletPaths',
- )
- ? (str: string) => str
- : (str: string) => str.toLocaleLowerCase('en-US');
-
+ const config = useApi(configApiRef);
if (!entities) return null;
return (
@@ -59,9 +53,10 @@ export const DocsCardGrid = ({
to={getRouteToReaderPageFor({
namespace: toLowerMaybe(
entity.metadata.namespace ?? 'default',
+ config,
),
- kind: toLowerMaybe(entity.kind),
- name: toLowerMaybe(entity.metadata.name),
+ kind: toLowerMaybe(entity.kind, config),
+ name: toLowerMaybe(entity.metadata.name, config),
})}
color="primary"
data-testid="read_docs"
diff --git a/plugins/techdocs/src/home/components/DocsTable.tsx b/plugins/techdocs/src/home/components/DocsTable.tsx
index 0e64c2e2e8..83d6f05788 100644
--- a/plugins/techdocs/src/home/components/DocsTable.tsx
+++ b/plugins/techdocs/src/home/components/DocsTable.tsx
@@ -17,7 +17,7 @@
import React from 'react';
import { useCopyToClipboard } from 'react-use';
-import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import { useRouteRef, useApi, configApiRef } from '@backstage/core-plugin-api';
import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
import {
formatEntityRefTitle,
@@ -34,6 +34,7 @@ import {
import * as actionFactories from './actions';
import * as columnFactories from './columns';
import { DocsTableRow } from './types';
+import { toLowerMaybe } from '../../helpers';
export const DocsTable = ({
entities,
@@ -50,26 +51,21 @@ export const DocsTable = ({
}) => {
const [, copyToClipboard] = useCopyToClipboard();
const getRouteToReaderPageFor = useRouteRef(rootDocsRouteRef);
-
- // Lower-case entity triplets by default, but allow override.
- const toLowerMaybe = useApi(configApiRef).getOptionalBoolean(
- 'techdocs.legacyUseCaseSensitiveTripletPaths',
- )
- ? (str: string) => str
- : (str: string) => str.toLocaleLowerCase('en-US');
-
+ const config = useApi(configApiRef);
if (!entities) return null;
const documents = entities.map(entity => {
const ownedByRelations = getEntityRelations(entity, RELATION_OWNED_BY);
-
return {
entity,
resolved: {
docsUrl: getRouteToReaderPageFor({
- namespace: toLowerMaybe(entity.metadata.namespace ?? 'default'),
- kind: toLowerMaybe(entity.kind),
- name: toLowerMaybe(entity.metadata.name),
+ namespace: toLowerMaybe(
+ entity.metadata.namespace ?? 'default',
+ config,
+ ),
+ kind: toLowerMaybe(entity.kind, config),
+ name: toLowerMaybe(entity.metadata.name, config),
}),
ownedByRelations,
ownedByRelationsTitle: ownedByRelations
diff --git a/plugins/todo-backend/api-report.md b/plugins/todo-backend/api-report.md
index f989755a62..00e243d1a2 100644
--- a/plugins/todo-backend/api-report.md
+++ b/plugins/todo-backend/api-report.md
@@ -112,7 +112,7 @@ export class TodoScmReader implements TodoReader {
options: Omit,
): TodoScmReader;
// (undocumented)
- readTodos({ url }: ReadTodosOptions): Promise;
+ readTodos(options: ReadTodosOptions): Promise;
}
// Warning: (ae-missing-release-tag) "TodoService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
index 8442983637..804dd1146d 100644
--- a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
+++ b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
@@ -76,7 +76,8 @@ export class TodoScmReader implements TodoReader {
this.integrations = options.integrations;
}
- async readTodos({ url }: ReadTodosOptions): Promise {
+ async readTodos(options: ReadTodosOptions): Promise {
+ const { url } = options;
const inFlightRead = this.inFlightReads.get(url);
if (inFlightRead) {
return inFlightRead.then(read => read.result);
@@ -101,9 +102,10 @@ export class TodoScmReader implements TodoReader {
}
private async doReadTodos(
- { url }: ReadTodosOptions,
+ options: ReadTodosOptions,
etag?: string,
): Promise {
+ const { url } = options;
const tree = await this.reader.readTree(url, {
etag,
filter(filePath, info) {
diff --git a/plugins/todo/api-report.md b/plugins/todo/api-report.md
index e0fdb8ba58..0784f5d56e 100644
--- a/plugins/todo/api-report.md
+++ b/plugins/todo/api-report.md
@@ -26,13 +26,7 @@ export const todoApiRef: ApiRef;
export class TodoClient implements TodoApi {
constructor(options: TodoClientOptions);
// (undocumented)
- listTodos({
- entity,
- offset,
- limit,
- orderBy,
- filters,
- }: TodoListOptions): Promise;
+ listTodos(options: TodoListOptions): Promise;
}
// @public
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 1fadc213af..ad00f6dee5 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -36,10 +36,11 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/todo/src/api/TodoClient.ts b/plugins/todo/src/api/TodoClient.ts
index f75e4b6954..7e4e4c8f79 100644
--- a/plugins/todo/src/api/TodoClient.ts
+++ b/plugins/todo/src/api/TodoClient.ts
@@ -43,13 +43,8 @@ export class TodoClient implements TodoApi {
this.identityApi = options.identityApi;
}
- async listTodos({
- entity,
- offset,
- limit,
- orderBy,
- filters,
- }: TodoListOptions): Promise {
+ async listTodos(options: TodoListOptions): Promise {
+ const { entity, offset, limit, orderBy, filters } = options;
const baseUrl = await this.discoveryApi.getBaseUrl('todo');
const token = await this.identityApi.getIdToken();
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index feab9dcf93..ba1d464453 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -37,11 +37,12 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-router": "6.0.0-beta.0",
"react-use": "^17.2.4"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index aa2f6169e3..7a7113a984 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -30,11 +30,12 @@
"@material-ui/lab": "4.0.0-alpha.57",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
- "react": "^16.13.1",
- "react-dom": "^16.13.1",
"react-use": "^17.2.4",
"recharts": "^1.8.5"
},
+ "peerDependencies": {
+ "react": "^16.13.1 || ^17.0.0"
+ },
"devDependencies": {
"@backstage/cli": "^0.10.0",
"@backstage/core-app-api": "^0.1.24",
diff --git a/scripts/check-type-dependencies.js b/scripts/check-type-dependencies.js
index bb5f3b0967..4db1109145 100755
--- a/scripts/check-type-dependencies.js
+++ b/scripts/check-type-dependencies.js
@@ -143,7 +143,10 @@ function findTypesPackage(dep, pkg) {
*/
function findTypeDepErrors(typeDeps, pkg) {
const devDeps = mkTypeDepSet(pkg.get('devDependencies'));
- const deps = mkTypeDepSet(pkg.get('dependencies'));
+ const deps = mkTypeDepSet({
+ ...pkg.get('dependencies'),
+ ...pkg.get('peerDependencies'),
+ });
const errors = [];
for (const typeDep of typeDeps) {
diff --git a/yarn.lock b/yarn.lock
index 6756aafd0d..a71567ffe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -69,25 +69,25 @@
dependencies:
tslib "~2.0.1"
-"@asyncapi/avro-schema-parser@^0.2.1":
- version "0.2.1"
- resolved "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-0.2.1.tgz#0b7d9953e12084e6f556db261ae08bd8f6690faa"
- integrity sha512-RZJaHsdYM4dChYSrb/TWrVCn/r2qcus+9/8iLL8+SMINHb0ECgH8tFZFJpr3Tq+LV2SBFaRQ+9kuecjQ8BNDSA==
+"@asyncapi/avro-schema-parser@^0.3.0":
+ version "0.3.0"
+ resolved "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-0.3.0.tgz#6922acc559ef999c57e81297d78ffe680fc92b3c"
+ integrity sha512-gWAqS2CKxbChdX8hZY+5EYQl6atP8FTSBvoG5mGGQ89XUoNdlLX14lsvbgvBnDj5sSwqfs+b5Mh5PUZMR/8maA==
-"@asyncapi/openapi-schema-parser@^2.0.1":
+"@asyncapi/openapi-schema-parser@^2.0.0":
version "2.0.1"
resolved "https://registry.npmjs.org/@asyncapi/openapi-schema-parser/-/openapi-schema-parser-2.0.1.tgz#4d6e82cced907b14e0ad6f98261ff2562d968d96"
integrity sha512-algbtdM1gcAOa8+V8kp7WeBhdaNac82jmZUXx8YjyNfRVo02N2juDrjeBAGJd+FNva9Mb4MM7qfkJoAFpTL5VQ==
dependencies:
"@openapi-contrib/openapi-schema-to-json-schema" "^3.0.0"
-"@asyncapi/parser@^1.5.0":
- version "1.5.0"
- resolved "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.5.0.tgz#d70616a1e6081c7dd86957befd5dccc46b9a77df"
- integrity sha512-HzrehCcT6R+iqtktNmrUM9wRUEMBqnCeXIrGJT0txBMS1QduNRmXGjvuDpxqwyaATPH/xu1gSp2l6pFP/hyVbA==
+"@asyncapi/parser@^1.13.0":
+ version "1.13.0"
+ resolved "https://registry.npmjs.org/@asyncapi/parser/-/parser-1.13.0.tgz#bc20d53ba870ead9d26d5a4e3a838c5765ba8d4c"
+ integrity sha512-UnTYSjx2Sc+VKWIIeIV5I+ogFbN5iWzNgx1UgTXQ5oPhtNlsdIkF+w7qV8GyiraaKbBqAuwepv4xbBvlEi8hkw==
dependencies:
"@apidevtools/json-schema-ref-parser" "^9.0.6"
- "@asyncapi/specs" "^2.7.7"
+ "@asyncapi/specs" "^2.11.0"
"@fmvilas/pseudo-yaml-ast" "^0.3.1"
ajv "^6.10.1"
js-yaml "^3.13.1"
@@ -96,25 +96,24 @@
node-fetch "^2.6.0"
tiny-merge-patch "^0.1.2"
-"@asyncapi/react-component@^0.23.0":
- version "0.23.1"
- resolved "https://registry.npmjs.org/@asyncapi/react-component/-/react-component-0.23.1.tgz#6ae574aac86d835e6845268d49803c4808f37b97"
- integrity sha512-xBH8F//sF4Sb7M95eVDnQDG+czklQieFKHkCr8SJmmb2j4NylAOTJBoYSZJ3QTC9r0O+SxdQglwh+u1mhMAU+A==
+"@asyncapi/react-component@^1.0.0-next.25":
+ version "1.0.0-next.25"
+ resolved "https://registry.npmjs.org/@asyncapi/react-component/-/react-component-1.0.0-next.25.tgz#76b27e0e239b03c32499ee5cd8977e5ceb74f754"
+ integrity sha512-S+HguQ6IltQWiy+jO7hlmANJYxJ2UOvH7iMAw+YTcDtYGOe/mrDr7vbrrB3HigZRYIyZSV34cNgNOhw/psVHlg==
dependencies:
- "@asyncapi/avro-schema-parser" "^0.2.1"
- "@asyncapi/openapi-schema-parser" "^2.0.1"
- "@asyncapi/parser" "^1.5.0"
- constate "^1.2.0"
- dompurify "^2.1.1"
- markdown-it "^11.0.1"
- merge "^2.1.0"
- openapi-sampler "^1.0.0-beta.15"
- react-use "^12.2.0"
+ "@asyncapi/avro-schema-parser" "^0.3.0"
+ "@asyncapi/openapi-schema-parser" "^2.0.0"
+ "@asyncapi/parser" "^1.13.0"
+ highlight.js "^10.7.2"
+ isomorphic-dompurify "^0.13.0"
+ marked "^2.1.1"
+ openapi-sampler "^1.1.0"
+ use-resize-observer "^7.0.0"
-"@asyncapi/specs@^2.7.7":
- version "2.7.7"
- resolved "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.7.7.tgz#10f72c95153a3cc10039f6ba9c3a6f7c3b7fecfc"
- integrity sha512-z8kj4GDJ640DU4msRsWprvmuC9n7vIeJW+D7Tp1xdefoLX5ZJrK7+4Xruna513wV0fSLpFzCmGz7McEP6CtKDg==
+"@asyncapi/specs@^2.11.0":
+ version "2.12.0"
+ resolved "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.12.0.tgz#15534ca9e518b561d33edfdfdbb234f9b274f261"
+ integrity sha512-X4Xkrl+9WXSk5EJhsueIxNx6ymHI5wpkw4ofetV+VRnPLNob/XO4trPSJClrL5hlknxbGADLvlrkI5d3XJ996g==
"@azure/abort-controller@^1.0.0":
version "1.0.2"
@@ -2627,6 +2626,71 @@
exec-sh "^0.3.2"
minimist "^1.2.0"
+"@codemirror/highlight@^0.19.0":
+ version "0.19.6"
+ resolved "https://registry.npmjs.org/@codemirror/highlight/-/highlight-0.19.6.tgz#7f2e066f83f5649e8e0748a3abe0aaeaf64b8ac2"
+ integrity sha512-+eibu6on9quY8uN3xJ/n3rH+YIDLlpX7YulVmFvqAIz/ukRQ5tWaBmB7fMixHmnmRIRBRZgB8rNtonuMwZSAHQ==
+ dependencies:
+ "@codemirror/language" "^0.19.0"
+ "@codemirror/rangeset" "^0.19.0"
+ "@codemirror/state" "^0.19.0"
+ "@codemirror/view" "^0.19.0"
+ "@lezer/common" "^0.15.0"
+ style-mod "^4.0.0"
+
+"@codemirror/language@^0.19.0":
+ version "0.19.7"
+ resolved "https://registry.npmjs.org/@codemirror/language/-/language-0.19.7.tgz#9eef8e827692d93a701b18db9d46a42be34ecca6"
+ integrity sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q==
+ dependencies:
+ "@codemirror/state" "^0.19.0"
+ "@codemirror/text" "^0.19.0"
+ "@codemirror/view" "^0.19.0"
+ "@lezer/common" "^0.15.5"
+ "@lezer/lr" "^0.15.0"
+
+"@codemirror/rangeset@^0.19.0":
+ version "0.19.2"
+ resolved "https://registry.npmjs.org/@codemirror/rangeset/-/rangeset-0.19.2.tgz#d7a999e4273c00fecef4aba8535a426073cdcddf"
+ integrity sha512-5d+X8LtmeZtfFtKrSx57bIHRUpKv2HD0b74clp4fGA7qJLLfYehF6FGkJJxJb8lKsqAga1gdjjWr0jiypmIxoQ==
+ dependencies:
+ "@codemirror/state" "^0.19.0"
+
+"@codemirror/state@^0.19.0", "@codemirror/state@^0.19.3":
+ version "0.19.6"
+ resolved "https://registry.npmjs.org/@codemirror/state/-/state-0.19.6.tgz#d631f041d39ce41b7891b099fca26cb1fdb9763e"
+ integrity sha512-sqIQZE9VqwQj7D4c2oz9mfLhlT1ElAzGB5lO1lE33BPyrdNy1cJyCIOecT4cn4VeJOFrnjOeu+IftZ3zqdFETw==
+ dependencies:
+ "@codemirror/text" "^0.19.0"
+
+"@codemirror/stream-parser@^0.19.2":
+ version "0.19.2"
+ resolved "https://registry.npmjs.org/@codemirror/stream-parser/-/stream-parser-0.19.2.tgz#793428e55aa7b9daa64cb733973e5d5e3d9a2306"
+ integrity sha512-hBKRQlyu8GUOrY33xZ6/1kAfNZ8ZUm6cX9a7mPx8zAAqnpz/fpksC/qJRrkg1mPMBwxm+JG4fqAwDGJ3gLVniQ==
+ dependencies:
+ "@codemirror/highlight" "^0.19.0"
+ "@codemirror/language" "^0.19.0"
+ "@codemirror/state" "^0.19.0"
+ "@codemirror/text" "^0.19.0"
+ "@lezer/common" "^0.15.0"
+ "@lezer/lr" "^0.15.0"
+
+"@codemirror/text@^0.19.0":
+ version "0.19.5"
+ resolved "https://registry.npmjs.org/@codemirror/text/-/text-0.19.5.tgz#75033af2476214e79eae22b81ada618815441c18"
+ integrity sha512-Syu5Xc7tZzeUAM/y4fETkT0zgGr48rDG+w4U38bPwSIUr+L9S/7w2wDE1WGNzjaZPz12F6gb1gxWiSTg9ocLow==
+
+"@codemirror/view@^0.19.0":
+ version "0.19.27"
+ resolved "https://registry.npmjs.org/@codemirror/view/-/view-0.19.27.tgz#76e5dc19ecb4ce53e9fef1d29245040d7ff64183"
+ integrity sha512-Uz/LecEf7CyvMWaQBlKtbJCYn0hRnEZ2yYvuZVy9YMhmvGmES6ec7FaKw7lDFFOMLwLbBThc9kfw4DCHreHN1w==
+ dependencies:
+ "@codemirror/rangeset" "^0.19.0"
+ "@codemirror/state" "^0.19.3"
+ "@codemirror/text" "^0.19.0"
+ style-mod "^4.0.0"
+ w3c-keyname "^2.2.4"
+
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"
resolved "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
@@ -2985,13 +3049,12 @@
stream-events "^1.0.1"
xdg-basedir "^4.0.0"
-"@graphiql/toolkit@^0.3.2":
- version "0.3.2"
- resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.3.2.tgz#551753436ada2bc27ea870b7668e5199a958ccfb"
- integrity sha512-IweIT9VC8uDovg7kuCO9YqZcnIuWU8IGzrpUisXv6CUNK2Ed1ke8yERDTMmF/rjvLd2DeVZwM8iEOjEs4sUJQw==
+"@graphiql/toolkit@^0.4.2":
+ version "0.4.2"
+ resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.2.tgz#34de819add64672f3f7d4830dffb2094fb8d5366"
+ integrity sha512-14uG67QrONbRrhXwvBJFsMfcQfexmGhj7dgkputesx9xuPUkcCDNmVULnVA8sGYt8P/rSvjkfQYx3rtfW+GhAQ==
dependencies:
- "@n1ru4l/push-pull-async-iterable-iterator" "^3.0.0"
- graphql-ws "^4.9.0"
+ "@n1ru4l/push-pull-async-iterable-iterator" "^3.1.0"
meros "^1.1.4"
"@graphql-codegen/cli@^1.21.3":
@@ -3174,6 +3237,16 @@
tslib "~2.2.0"
value-or-promise "1.0.6"
+"@graphql-tools/batch-execute@^8.3.1":
+ version "8.3.1"
+ resolved "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz#0b74c54db5ac1c5b9a273baefc034c2343ebbb74"
+ integrity sha512-63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA==
+ dependencies:
+ "@graphql-tools/utils" "^8.5.1"
+ dataloader "2.0.0"
+ tslib "~2.3.0"
+ value-or-promise "1.0.11"
+
"@graphql-tools/code-file-loader@^6.3.1":
version "6.3.1"
resolved "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-6.3.1.tgz#42dfd4db5b968acdb453382f172ec684fa0c34ed"
@@ -3196,6 +3269,18 @@
tslib "~2.2.0"
value-or-promise "1.0.6"
+"@graphql-tools/delegate@^8.4.1", "@graphql-tools/delegate@^8.4.2":
+ version "8.4.2"
+ resolved "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.4.2.tgz#a61d45719855720304e3656800342cfa17d82558"
+ integrity sha512-CjggOhiL4WtyG2I3kux+1/p8lQxSFHBj0gwa0NxnQ6Vsnpw7Ig5VP1ovPnitFuBv2k4QdC37Nj2xv2n7DRn8fw==
+ dependencies:
+ "@graphql-tools/batch-execute" "^8.3.1"
+ "@graphql-tools/schema" "^8.3.1"
+ "@graphql-tools/utils" "^8.5.3"
+ dataloader "2.0.0"
+ tslib "~2.3.0"
+ value-or-promise "1.0.11"
+
"@graphql-tools/git-loader@^6.2.6":
version "6.2.6"
resolved "https://registry.npmjs.org/@graphql-tools/git-loader/-/git-loader-6.2.6.tgz#c2226f4b8f51f1c05c9ab2649ba32d49c68cd077"
@@ -3224,6 +3309,17 @@
"@graphql-tools/utils" "^7.0.0"
tslib "~2.1.0"
+"@graphql-tools/graphql-file-loader@^7.3.2":
+ version "7.3.3"
+ resolved "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz#7cee2f84f08dc13fa756820b510248b857583d36"
+ integrity sha512-6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA==
+ dependencies:
+ "@graphql-tools/import" "^6.5.7"
+ "@graphql-tools/utils" "^8.5.1"
+ globby "^11.0.3"
+ tslib "~2.3.0"
+ unixify "^1.0.0"
+
"@graphql-tools/graphql-tag-pluck@^6.2.6", "@graphql-tools/graphql-tag-pluck@^6.5.1":
version "6.5.1"
resolved "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-6.5.1.tgz#5fb227dbb1e19f4b037792b50f646f16a2d4c686"
@@ -3243,6 +3339,15 @@
resolve-from "5.0.0"
tslib "~2.2.0"
+"@graphql-tools/import@^6.5.7":
+ version "6.6.1"
+ resolved "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.1.tgz#2a7e1ceda10103ffeb8652a48ddc47150b035485"
+ integrity sha512-i9WA6k+erJMci822o9w9DoX+uncVBK60LGGYW8mdbhX0l7wEubUpA000thJ1aarCusYh0u+ZT9qX0HyVPXu25Q==
+ dependencies:
+ "@graphql-tools/utils" "8.5.3"
+ resolve-from "5.0.0"
+ tslib "~2.3.0"
+
"@graphql-tools/json-file-loader@^6.0.0", "@graphql-tools/json-file-loader@^6.2.6":
version "6.2.6"
resolved "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.6.tgz#830482cfd3721a0799cbf2fe5b09959d9332739a"
@@ -3251,6 +3356,16 @@
"@graphql-tools/utils" "^7.0.0"
tslib "~2.0.1"
+"@graphql-tools/json-file-loader@^7.3.2":
+ version "7.3.3"
+ resolved "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz#45cfde77b9dc4ab6c21575305ae537d2814d237f"
+ integrity sha512-CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q==
+ dependencies:
+ "@graphql-tools/utils" "^8.5.1"
+ globby "^11.0.3"
+ tslib "~2.3.0"
+ unixify "^1.0.0"
+
"@graphql-tools/load@^6.0.0", "@graphql-tools/load@^6.2.8":
version "6.2.8"
resolved "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.8.tgz#16900fb6e75e1d075cad8f7ea439b334feb0b96a"
@@ -3266,6 +3381,16 @@
unixify "1.0.0"
valid-url "1.0.9"
+"@graphql-tools/load@^7.4.1":
+ version "7.4.1"
+ resolved "https://registry.npmjs.org/@graphql-tools/load/-/load-7.4.1.tgz#aa572fcef11d6028097b6ef39c13fa9d62e5a441"
+ integrity sha512-UvBodW5hRHpgBUBVz5K5VIhJDOTFIbRRAGD6sQ2l9J5FDKBEs3u/6JjZDzbdL96br94D5cEd2Tk6auaHpTn7mQ==
+ dependencies:
+ "@graphql-tools/schema" "8.3.1"
+ "@graphql-tools/utils" "^8.5.1"
+ p-limit "3.1.0"
+ tslib "~2.3.0"
+
"@graphql-tools/merge@^6.0.0", "@graphql-tools/merge@^6.2.12", "@graphql-tools/merge@^6.2.14":
version "6.2.14"
resolved "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.14.tgz#694e2a2785ba47558e5665687feddd2935e9d94e"
@@ -3275,6 +3400,14 @@
"@graphql-tools/utils" "^7.7.0"
tslib "~2.2.0"
+"@graphql-tools/merge@^8.2.1":
+ version "8.2.1"
+ resolved "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.1.tgz#bf83aa06a0cfc6a839e52a58057a84498d0d51ff"
+ integrity sha512-Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA==
+ dependencies:
+ "@graphql-tools/utils" "^8.5.1"
+ tslib "~2.3.0"
+
"@graphql-tools/optimize@^1.0.1":
version "1.0.1"
resolved "https://registry.npmjs.org/@graphql-tools/optimize/-/optimize-1.0.1.tgz#9933fffc5a3c63f95102b1cb6076fb16ac7bb22d"
@@ -3318,6 +3451,16 @@
relay-compiler "10.1.0"
tslib "~2.0.1"
+"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.3.1":
+ version "8.3.1"
+ resolved "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74"
+ integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==
+ dependencies:
+ "@graphql-tools/merge" "^8.2.1"
+ "@graphql-tools/utils" "^8.5.1"
+ tslib "~2.3.0"
+ value-or-promise "1.0.11"
+
"@graphql-tools/schema@^7.0.0", "@graphql-tools/schema@^7.1.5":
version "7.1.5"
resolved "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.5.tgz#07b24e52b182e736a6b77c829fc48b84d89aa711"
@@ -3352,6 +3495,38 @@
valid-url "1.0.9"
ws "7.4.5"
+"@graphql-tools/url-loader@^7.4.2":
+ version "7.5.3"
+ resolved "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.5.3.tgz#a594be40e3bc68d22f76746356e7f0b8117b7137"
+ integrity sha512-VKMRJ4TOeVIdulkCLGSBUr4stRRwOGcVRXDeoUF+86K32Ufo0H2V0lz7QwS/bCl8GXV19FMgHZCDl4BMJyOXEA==
+ dependencies:
+ "@graphql-tools/delegate" "^8.4.1"
+ "@graphql-tools/utils" "^8.5.1"
+ "@graphql-tools/wrap" "^8.3.1"
+ "@n1ru4l/graphql-live-query" "0.9.0"
+ "@types/websocket" "1.0.4"
+ "@types/ws" "^8.0.0"
+ cross-undici-fetch "^0.0.26"
+ dset "^3.1.0"
+ extract-files "11.0.0"
+ graphql-sse "^1.0.1"
+ graphql-ws "^5.4.1"
+ isomorphic-ws "4.0.1"
+ meros "1.1.4"
+ subscriptions-transport-ws "^0.11.0"
+ sync-fetch "0.3.1"
+ tslib "~2.3.0"
+ valid-url "1.0.9"
+ value-or-promise "1.0.11"
+ ws "8.3.0"
+
+"@graphql-tools/utils@8.5.3", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.3":
+ version "8.5.3"
+ resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.5.3.tgz#404062e62cae9453501197039687749c4885356e"
+ integrity sha512-HDNGWFVa8QQkoQB0H1lftvaO1X5xUaUDk1zr1qDe0xN1NL0E/CrQdJ5UKLqOvH4hkqVUPxQsyOoAZFkaH6rLHg==
+ dependencies:
+ tslib "~2.3.0"
+
"@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.1.0", "@graphql-tools/utils@^7.1.2", "@graphql-tools/utils@^7.5.0", "@graphql-tools/utils@^7.7.0", "@graphql-tools/utils@^7.7.1", "@graphql-tools/utils@^7.8.1", "@graphql-tools/utils@^7.9.0", "@graphql-tools/utils@^7.9.1":
version "7.10.0"
resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.10.0.tgz#07a4cb5d1bec1ff1dc1d47a935919ee6abd38699"
@@ -3372,6 +3547,17 @@
tslib "~2.2.0"
value-or-promise "1.0.6"
+"@graphql-tools/wrap@^8.3.1":
+ version "8.3.2"
+ resolved "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.3.2.tgz#d3bcecb7529d071e4ecc4dfc75b9566e3da79d4f"
+ integrity sha512-7DcOBFB+Dd84x9dxSm7qS4iJONMyfLnCJb8A19vGPffpu4SMJ3sFcgwibKFu5l6mMUiigKgXna2RRgWI+02bKQ==
+ dependencies:
+ "@graphql-tools/delegate" "^8.4.2"
+ "@graphql-tools/schema" "^8.3.1"
+ "@graphql-tools/utils" "^8.5.3"
+ tslib "~2.3.0"
+ value-or-promise "1.0.11"
+
"@grpc/grpc-js@~1.3.0":
version "1.3.2"
resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.2.tgz#eae97e6daf5abd49a7818aadeca0744dfb1ebca1"
@@ -3674,6 +3860,11 @@
resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
+"@juggle/resize-observer@^3.3.1":
+ version "3.3.1"
+ resolved "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz#b50a781709c81e10701004214340f25475a171a0"
+ integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==
+
"@kubernetes/client-node@^0.16.0":
version "0.16.1"
resolved "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.16.1.tgz#c78ef667579777c1a532983922807e228dbc9b90"
@@ -4373,6 +4564,18 @@
npmlog "^4.1.2"
write-file-atomic "^3.0.3"
+"@lezer/common@^0.15.0", "@lezer/common@^0.15.5":
+ version "0.15.10"
+ resolved "https://registry.npmjs.org/@lezer/common/-/common-0.15.10.tgz#662da668f46244fb20bfaada67b43b3d0463b344"
+ integrity sha512-vlr+be73zTDoQBIknBVOh/633tmbQcjxUu9PIeVeYESeBK3V6TuBW96RRFg93Y2cyK9lglz241gOgSn452HFvA==
+
+"@lezer/lr@^0.15.0":
+ version "0.15.5"
+ resolved "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.5.tgz#4bce44169c441d9dda7be398f5202ea65c5f1138"
+ integrity sha512-DEcLyhdmBxD1foQe7RegLrSlfS/XaTMGLkO5evkzHWAQKh/JnFWp7j7iNB7s2EpxzRrBCh0U+W7JDCeFhv2mng==
+ dependencies:
+ "@lezer/common" "^0.15.0"
+
"@manypkg/find-root@^1.1.0":
version "1.1.0"
resolved "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz#a62d8ed1cd7e7d4c11d9d52a8397460b5d4ad29f"
@@ -4670,7 +4873,12 @@
outvariant "^1.2.0"
strict-event-emitter "^0.2.0"
-"@n1ru4l/push-pull-async-iterable-iterator@^3.0.0":
+"@n1ru4l/graphql-live-query@0.9.0":
+ version "0.9.0"
+ resolved "https://registry.npmjs.org/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc"
+ integrity sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==
+
+"@n1ru4l/push-pull-async-iterable-iterator@^3.1.0":
version "3.1.0"
resolved "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-3.1.0.tgz#be450c97d1c7cd6af1a992d53232704454345df9"
integrity sha512-K4scWxGhdQM0masHHy4gIQs2iGiLEXCrXttumknyPJqtdl4J179BjpibWSSQ1fxKdCcHgIlCTKXJU6cMM6D6Wg==
@@ -7092,6 +7300,13 @@
"@types/docker-modem" "*"
"@types/node" "*"
+"@types/dompurify@^2.1.0":
+ version "2.3.1"
+ resolved "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.3.1.tgz#2934adcd31c4e6b02676f9c22f9756e5091c04dd"
+ integrity sha512-YJth9qa0V/E6/XPH1Jq4BC8uCMmO8V1fKWn8PCvuZcAhMn7q0ez9LW6naQT04UZzjFfAPhyRMZmI2a2rbMlEFA==
+ dependencies:
+ "@types/trusted-types" "*"
+
"@types/dompurify@^2.2.2":
version "2.2.3"
resolved "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.2.3.tgz#6e89677a07902ac1b6821c345f34bd85da239b08"
@@ -7420,7 +7635,7 @@
dependencies:
"@types/json-schema" "*"
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@7.0.9", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.9"
resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -7881,14 +8096,7 @@
dependencies:
"@types/react" "*"
-"@types/react-wait@^0.3.0":
- version "0.3.1"
- resolved "https://registry.npmjs.org/@types/react-wait/-/react-wait-0.3.1.tgz#193cbd8fe86baa53b6f65dfa73f03d562f462a27"
- integrity sha512-BS9AEjWZItDgpx6LlICcuf53M27zBFCsHx/llCbrmrt/WI7ecG2LGquCss3n8O8bwEDiTX4yYLjy8yLeIfgYTg==
- dependencies:
- "@types/react" "*"
-
-"@types/react@*", "@types/react@>=16.9.0":
+"@types/react@*", "@types/react@>=16.9.0", "@types/react@^16.13.1 || ^17.0.0":
version "16.14.18"
resolved "https://registry.npmjs.org/@types/react/-/react-16.14.18.tgz#b2bcea05ee244fde92d409f91bd888ca8e54b20f"
integrity sha512-eeyqd1mqoG43mI0TvNKy9QNf1Tjz3DEOsRP3rlPo35OeMIt05I+v9RR8ZvL2GuYZeF2WAcLXJZMzu6zdz3VbtQ==
@@ -8272,6 +8480,13 @@
dependencies:
"@types/node" "*"
+"@types/websocket@1.0.4":
+ version "1.0.4"
+ resolved "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.4.tgz#1dc497280d8049a5450854dd698ee7e6ea9e60b8"
+ integrity sha512-qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA==
+ dependencies:
+ "@types/node" "*"
+
"@types/whatwg-streams@^0.0.7":
version "0.0.7"
resolved "https://registry.npmjs.org/@types/whatwg-streams/-/whatwg-streams-0.0.7.tgz#28bfe73dc850562296367249c4b32a50db81e9d3"
@@ -8291,6 +8506,13 @@
dependencies:
"@types/node" "*"
+"@types/ws@^8.0.0":
+ version "8.2.2"
+ resolved "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
+ integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
+ dependencies:
+ "@types/node" "*"
+
"@types/xml2js@*", "@types/xml2js@^0.4.7":
version "0.4.8"
resolved "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.8.tgz#84c120c864a5976d0b5cf2f930a75d850fc2b03a"
@@ -8765,6 +8987,11 @@ abab@^2.0.3:
resolved "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+abab@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+ integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
abbrev@1:
version "1.1.1"
resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -8828,6 +9055,11 @@ acorn@^7.1.1, acorn@^7.4.0:
resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+acorn@^8.2.4:
+ version "8.6.0"
+ resolved "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+ integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+
acorn@^8.4.1:
version "8.4.1"
resolved "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
@@ -11259,13 +11491,13 @@ code-point-at@^1.0.0:
resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-codemirror-graphql@^1.0.3:
- version "1.1.0"
- resolved "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.1.0.tgz#dd22ddf7761efa9131fa99a70a4a85fe653484e5"
- integrity sha512-bp2XUg7epL07kJcylM8VCISK6X+rFsHL2lUkPQAw2v721MVhn+80FgjMP8tiZCOfJgHn1+JgsA71L5nOHWgUdA==
+codemirror-graphql@^1.2.8:
+ version "1.2.8"
+ resolved "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.2.8.tgz#4d3845d786665776eb5c44b0948bfa8f9860077f"
+ integrity sha512-/SlF24YNWirA8SyyaiFkrwPVIhPS/OkMNRHkL3TeZKhJIv3wuGAa90B4DYqY17MBN2QN1+RYd/71eYZD/fvj1Q==
dependencies:
- graphql-language-service-interface "^2.9.0"
- graphql-language-service-parser "^1.10.0"
+ "@codemirror/stream-parser" "^0.19.2"
+ graphql-language-service "^4.1.1"
codemirror@^5.58.2:
version "5.63.3"
@@ -11639,11 +11871,6 @@ constants-browserify@^1.0.0:
resolved "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-constate@^1.2.0:
- version "1.3.2"
- resolved "https://registry.npmjs.org/constate/-/constate-1.3.2.tgz#fa5f0fc292207f1ec21b46a5eb81f59c8b0a8b84"
- integrity sha512-aaILV4vXwGTUZaQZHS5F1xBV8wRCR0Ow1505fdkS5/BPg6hbQrhNqdHL4wgxWgaDeEj43mu/Fb+LhqOKTMcrgQ==
-
contains-path@^0.1.0:
version "0.1.0"
resolved "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
@@ -11803,7 +12030,7 @@ copy-descriptor@^0.1.0:
resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-copy-to-clipboard@^3, copy-to-clipboard@^3.1.0, copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
+copy-to-clipboard@^3, copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
version "3.3.1"
resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
@@ -11872,6 +12099,17 @@ cosmiconfig@7.0.0, cosmiconfig@^7.0.0:
path-type "^4.0.0"
yaml "^1.10.0"
+cosmiconfig@7.0.1:
+ version "7.0.1"
+ resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+ dependencies:
+ "@types/parse-json" "^4.0.0"
+ import-fresh "^3.2.1"
+ parse-json "^5.0.0"
+ path-type "^4.0.0"
+ yaml "^1.10.0"
+
cosmiconfig@^6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -12030,6 +12268,16 @@ cross-spawn@^6.0.0:
shebang-command "^1.2.0"
which "^1.2.9"
+cross-undici-fetch@^0.0.26:
+ version "0.0.26"
+ resolved "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.0.26.tgz#29d93d56609f4d2334f9d5333d23ef7a242842a7"
+ integrity sha512-aMDRrLbWr0TGXfY92stlV+XOGpskeqFmWmrKSWsnc8w6gK5LPE83NBh7O7N6gCb2xjwHcm1Yn2nBXMEVH2RBcA==
+ dependencies:
+ abort-controller "^3.0.0"
+ form-data "^4.0.0"
+ node-fetch "^2.6.5"
+ undici "^4.9.3"
+
crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -12294,7 +12542,7 @@ cssom@~0.3.6:
resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-cssstyle@^2.2.0:
+cssstyle@^2.2.0, cssstyle@^2.3.0:
version "2.3.0"
resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
@@ -12761,6 +13009,11 @@ decimal.js@^10.2.0:
resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+decimal.js@^10.2.1:
+ version "10.3.1"
+ resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+ integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -13239,7 +13492,7 @@ domhandler@^4.2.0:
dependencies:
domelementtype "^2.2.0"
-dompurify@^2.1.1, dompurify@^2.2.9:
+dompurify@^2.2.7, dompurify@^2.2.9:
version "2.3.3"
resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
@@ -13558,11 +13811,6 @@ entities@^2.0.0, entities@~2.1.0:
resolved "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-entities@~2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
- integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
-
env-paths@^2.2.0:
version "2.2.0"
resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -13890,6 +14138,18 @@ escodegen@^1.14.1:
optionalDependencies:
source-map "~0.6.1"
+escodegen@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+ integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
+ dependencies:
+ esprima "^4.0.1"
+ estraverse "^5.2.0"
+ esutils "^2.0.2"
+ optionator "^0.8.1"
+ optionalDependencies:
+ source-map "~0.6.1"
+
eslint-config-prettier@^8.3.0:
version "8.3.0"
resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
@@ -14526,6 +14786,11 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
+extract-files@11.0.0:
+ version "11.0.0"
+ resolved "https://registry.npmjs.org/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
+ integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
+
extract-files@9.0.0, extract-files@^9.0.0:
version "9.0.0"
resolved "https://registry.npmjs.org/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
@@ -15872,19 +16137,19 @@ grapheme-splitter@^1.0.4:
resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-graphiql@^1.0.0-alpha.10:
- version "1.4.7"
- resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.4.7.tgz#6a35acf0786d7518fbb986b75bf0a3d752c19c1a"
- integrity sha512-oHsBTzdWTbRJhqazbjrC6wY7YInViErAeXLqetCxdFFu2Zk5FV3V3rs7KPrCyr7kM6lW0nfXMzIfKuIgxAqx7g==
+graphiql@^1.5.12:
+ version "1.5.13"
+ resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.5.13.tgz#7706c56504213598641e8300a612a7dccaba95d5"
+ integrity sha512-lfG7FZzjDb4jwAP5mU+IiYvkTcZ/OygbIlk6JJrB0CPBqMl4k/3dEaZFmyKjmy54xTo8bkiH28VgpcF8VPc1eg==
dependencies:
- "@graphiql/toolkit" "^0.3.2"
+ "@graphiql/toolkit" "^0.4.2"
codemirror "^5.58.2"
- codemirror-graphql "^1.0.3"
+ codemirror-graphql "^1.2.8"
copy-to-clipboard "^3.2.0"
dset "^3.1.0"
entities "^2.0.0"
escape-html "^1.0.3"
- graphql-language-service "^3.1.6"
+ graphql-language-service "^4.1.1"
markdown-it "^12.2.0"
graphlib@^2.1.8:
@@ -15911,6 +16176,23 @@ graphql-config@^3.0.2, graphql-config@^3.3.0:
minimatch "3.0.4"
string-env-interpolation "1.0.1"
+graphql-config@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.npmjs.org/graphql-config/-/graphql-config-4.1.0.tgz#a3b28d3fb537952ebeb69c75e4430605a10695e3"
+ integrity sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==
+ dependencies:
+ "@endemolshinegroup/cosmiconfig-typescript-loader" "3.0.2"
+ "@graphql-tools/graphql-file-loader" "^7.3.2"
+ "@graphql-tools/json-file-loader" "^7.3.2"
+ "@graphql-tools/load" "^7.4.1"
+ "@graphql-tools/merge" "^8.2.1"
+ "@graphql-tools/url-loader" "^7.4.2"
+ "@graphql-tools/utils" "^8.5.1"
+ cosmiconfig "7.0.1"
+ cosmiconfig-toml-loader "1.0.0"
+ minimatch "3.0.4"
+ string-env-interpolation "1.0.1"
+
graphql-extensions@^0.15.0:
version "0.15.0"
resolved "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817"
@@ -15920,63 +16202,51 @@ graphql-extensions@^0.15.0:
apollo-server-env "^3.1.0"
apollo-server-types "^0.9.0"
-graphql-language-service-interface@^2.9.0:
- version "2.9.1"
- resolved "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.9.1.tgz#be0b11b06b78730ea9d250e0e2290e7ed9c8d283"
- integrity sha512-yGsE67fxJBXxY82+rLDMvUpmzpOUM8XFB+k+xOTUyABWs27osKaoGiuDDXAVGg1adhm+cpunWbipe763ZJkAVA==
+graphql-language-service-interface@^2.10.1:
+ version "2.10.1"
+ resolved "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.10.1.tgz#0f81a3da576bad61da878b59c228901236358426"
+ integrity sha512-2n/nrt0QD8UnxzDKKHWomYuLK9uxGxyPztA6wI24Kng8Iw7jQk/doIti63z4xPKNi4CtbumSjk1TRYUZ/bgViw==
dependencies:
- graphql-language-service-parser "^1.10.0"
- graphql-language-service-types "^1.8.3"
- graphql-language-service-utils "^2.6.0"
+ graphql-config "^4.1.0"
+ graphql-language-service-parser "^1.10.4"
+ graphql-language-service-types "^1.8.7"
+ graphql-language-service-utils "^2.7.1"
vscode-languageserver-types "^3.15.1"
-graphql-language-service-parser@^1.10.0:
- version "1.10.0"
- resolved "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.10.0.tgz#116f4be849754f6afb4c196421a43fe96d87b278"
- integrity sha512-cLExv0EjqT2hsKdwVTPmKU6eMfjZAjxqywgCPnWD48eJn6tyuePMyG7ye+jpX1PRPPx/cDHfFJGf8sUclchvng==
+graphql-language-service-parser@^1.10.4:
+ version "1.10.4"
+ resolved "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.10.4.tgz#b2979deefc5c0df571dacd409b2d5fbf1cdf7a9d"
+ integrity sha512-duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA==
dependencies:
- graphql-language-service-types "^1.8.0"
+ graphql-language-service-types "^1.8.7"
-graphql-language-service-types@^1.8.0:
- version "1.8.1"
- resolved "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.1.tgz#963810010924f2b5eaea415d5b8eb0b7d42c479b"
- integrity sha512-IpYS0mEHEmRsFlq+loWCpSYYYizAID7Alri6GoFN1QqUdux+8rp1Tkp2NGsGDpDmm3Dbz5ojmJWzNWQGpuwveA==
-
-graphql-language-service-types@^1.8.2:
- version "1.8.2"
- resolved "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz#50ae56f69cc24fcfc3daa129b68b0eb9421e8578"
- integrity sha512-Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw==
-
-graphql-language-service-types@^1.8.3:
- version "1.8.3"
- resolved "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.3.tgz#d7d688d74c122c4d9cc4cceae761a1f2a3c396a1"
- integrity sha512-m+RHnlGkKDcesW/gC4M7I2pSmWJB84uWS6LtnjplO/07JN312nJCJYCwV/DBny2m1fmSOxN7H/o+JW0l56KwBA==
-
-graphql-language-service-utils@^2.5.3:
- version "2.5.3"
- resolved "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.5.3.tgz#185f4f65cf8c010871eb9405452a3a0bfdf88748"
- integrity sha512-ydevEZ0AgzEKQF3hiCbLXuS0o7189Ww/T30WtCKCLaRHDYk9Yyb2PZWdhSTWLxYZTaX2TccV6NtFWvzIC7UP3g==
+graphql-language-service-types@^1.8.7:
+ version "1.8.7"
+ resolved "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.7.tgz#f5e909e6d9334ea2d8d1f7281b695b6f5602c07f"
+ integrity sha512-LP/Mx0nFBshYEyD0Ny6EVGfacJAGVx+qXtlJP4hLzUdBNOGimfDNtMVIdZANBXHXcM41MDgMHTnyEx2g6/Ttbw==
dependencies:
- graphql-language-service-types "^1.8.0"
+ graphql-config "^4.1.0"
+ vscode-languageserver-types "^3.15.1"
+
+graphql-language-service-utils@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.7.1.tgz#c97c8d744a761480aba7e03e4a42adf28b6fce39"
+ integrity sha512-Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA==
+ dependencies:
+ "@types/json-schema" "7.0.9"
+ graphql-language-service-types "^1.8.7"
nullthrows "^1.0.0"
-graphql-language-service-utils@^2.6.0:
- version "2.6.0"
- resolved "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.6.0.tgz#d04904641248167ccbb381d8705ba97daa784954"
- integrity sha512-idqwmbREixhDuQMcYp8WH0btQT02xZny8MO/HduNTVjnPrmTYnZUbpZ9AejdflmaKoS0o8nNvgXQ0GpIOzbG5g==
+graphql-language-service@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-4.1.1.tgz#8093655c23af6a3f3eee3f92e6a5b0a3e2a21d70"
+ integrity sha512-7XP+XSzTnpnmh+EYbofnK/YdSaI7/mj7bS8ffP3A1UQtNBLb9mUErgYju6VegcV6Df0bJObLG+XxSBSlgV4kXQ==
dependencies:
- graphql-language-service-types "^1.8.3"
- nullthrows "^1.0.0"
-
-graphql-language-service@^3.1.6:
- version "3.2.0"
- resolved "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-3.2.0.tgz#e0eb6d5dea2cab92549a253d7a6b4fa0cce178b7"
- integrity sha512-xM5Ua5p7ttG/oEaDy2zk35FP2O2I9qD2N0DOrjCDUVDRC06FNDG+/CvF4qX9+i8DWOI65xch5vAhSQEfS2jFsA==
- dependencies:
- graphql-language-service-interface "^2.9.0"
- graphql-language-service-parser "^1.10.0"
- graphql-language-service-types "^1.8.2"
- graphql-language-service-utils "^2.5.3"
+ graphql-language-service-interface "^2.10.1"
+ graphql-language-service-parser "^1.10.4"
+ graphql-language-service-types "^1.8.7"
+ graphql-language-service-utils "^2.7.1"
+ picomatch "^2.3.0"
graphql-request@^3.3.0:
version "3.4.0"
@@ -15987,6 +16257,11 @@ graphql-request@^3.3.0:
extract-files "^9.0.0"
form-data "^3.0.0"
+graphql-sse@^1.0.1:
+ version "1.0.6"
+ resolved "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz#4f98e0a06f2020542ed054399116108491263224"
+ integrity sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==
+
graphql-subscriptions@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz#5f2fa4233eda44cf7570526adfcf3c16937aef11"
@@ -16036,15 +16311,10 @@ graphql-ws@^4.4.1:
resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz#b323fbf35a3736eed85dac24c0054d6d10c93e62"
integrity sha512-Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw==
-graphql-ws@^4.9.0:
- version "4.9.0"
- resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz#5cfd8bb490b35e86583d8322f5d5d099c26e365c"
- integrity sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==
-
-graphql@15.5.0:
- version "15.5.0"
- resolved "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5"
- integrity sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==
+graphql-ws@^5.4.1:
+ version "5.5.5"
+ resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9"
+ integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw==
graphql@^15.3.0:
version "15.5.1"
@@ -16056,6 +16326,11 @@ graphql@^15.5.1:
resolved "https://registry.npmjs.org/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"
integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==
+graphql@^16.0.0:
+ version "16.0.1"
+ resolved "https://registry.npmjs.org/graphql/-/graphql-16.0.1.tgz#93a13cd4e0e38ca8d0832e79614c8578bfd34f10"
+ integrity sha512-oPvCuu6dlLdiz8gZupJ47o1clgb72r1u8NDBcQYjcV6G/iEdmE11B1bBlkhXRvV0LisP/SXRFP7tT6AgaTjpzg==
+
grouped-queue@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/grouped-queue/-/grouped-queue-2.0.0.tgz#a2c6713f2171e45db2c300a3a9d7c119d694dac8"
@@ -16340,7 +16615,7 @@ highlight.js@^10.1.0, highlight.js@^10.1.1, highlight.js@^10.4.1, highlight.js@^
resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360"
integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==
-highlight.js@~10.7.0:
+highlight.js@^10.7.2, highlight.js@~10.7.0:
version "10.7.3"
resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
@@ -17511,6 +17786,11 @@ is-potential-custom-element-name@^1.0.0:
resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+ integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
is-promise@4.0.0, is-promise@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
@@ -17769,6 +18049,15 @@ isobject@^4.0.0:
resolved "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+isomorphic-dompurify@^0.13.0:
+ version "0.13.0"
+ resolved "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-0.13.0.tgz#a4dde357e8531018a85ebb2dd56c4794b6739ba3"
+ integrity sha512-j2/kt/PGbxvfeEm1uiRLlttZkQdn3hFe1rMr/wm3qFnMXSIw0Nmqu79k+TIoSj+KOwO98Sz9TbuNHU7ejv7IZA==
+ dependencies:
+ "@types/dompurify" "^2.1.0"
+ dompurify "^2.2.7"
+ jsdom "^16.5.2"
+
isomorphic-fetch@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
@@ -18504,6 +18793,39 @@ jsdom@^16.4.0:
ws "^7.2.3"
xml-name-validator "^3.0.0"
+jsdom@^16.5.2:
+ version "16.7.0"
+ resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+ integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+ dependencies:
+ abab "^2.0.5"
+ acorn "^8.2.4"
+ acorn-globals "^6.0.0"
+ cssom "^0.4.4"
+ cssstyle "^2.3.0"
+ data-urls "^2.0.0"
+ decimal.js "^10.2.1"
+ domexception "^2.0.1"
+ escodegen "^2.0.0"
+ form-data "^3.0.0"
+ html-encoding-sniffer "^2.0.1"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-potential-custom-element-name "^1.0.1"
+ nwsapi "^2.2.0"
+ parse5 "6.0.1"
+ saxes "^5.0.1"
+ symbol-tree "^3.2.4"
+ tough-cookie "^4.0.0"
+ w3c-hr-time "^1.0.2"
+ w3c-xmlserializer "^2.0.0"
+ webidl-conversions "^6.1.0"
+ whatwg-encoding "^1.0.5"
+ whatwg-mimetype "^2.3.0"
+ whatwg-url "^8.5.0"
+ ws "^7.4.6"
+ xml-name-validator "^3.0.0"
+
jsesc@^2.5.1:
version "2.5.2"
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -18541,7 +18863,7 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-json-pointer@^0.6.0:
+json-pointer@^0.6.1:
version "0.6.1"
resolved "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.1.tgz#3c6caa6ac139e2599f5a1659d39852154015054d"
integrity sha512-3OvjqKdCBvH41DLpV4iSt6v2XhZXV1bPB4OROuknvUXI7ZQNofieCPkmE26stEJ9zdQuvIxDHCuYhfgxFAAs+Q==
@@ -19586,7 +19908,7 @@ lodash@4.17.15:
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.0, lodash@~4.17.15, lodash@~4.17.4:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.0, lodash@~4.17.15, lodash@~4.17.4:
version "4.17.21"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -19878,17 +20200,6 @@ markdown-escapes@^1.0.0:
resolved "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
-markdown-it@^11.0.1:
- version "11.0.1"
- resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz#b54f15ec2a2193efa66dda1eb4173baea08993d6"
- integrity sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==
- dependencies:
- argparse "^1.0.7"
- entities "~2.0.0"
- linkify-it "^3.0.1"
- mdurl "^1.0.1"
- uc.micro "^1.0.5"
-
markdown-it@^12.2.0:
version "12.2.0"
resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz#091f720fd5db206f80de7a8d1f1a7035fd0d38db"
@@ -19925,6 +20236,11 @@ markdown-to-jsx@^7.1.3:
resolved "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.3.tgz#f00bae66c0abe7dd2d274123f84cb6bd2a2c7c6a"
integrity sha512-jtQ6VyT7rMT5tPV0g2EJakEnXLiPksnvlYtwQsVVZ611JsWGN8bQ1tVSDX4s6JllfEH6wmsYxNjTUAMrPmNA8w==
+marked@^2.1.1:
+ version "2.1.3"
+ resolved "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
+ integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==
+
math-expression-evaluator@^1.2.14:
version "1.2.22"
resolved "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e"
@@ -20324,11 +20640,6 @@ merge2@^1.2.3, merge2@^1.3.0:
resolved "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
-merge@^2.1.0:
- version "2.1.1"
- resolved "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
- integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
-
meros@1.1.4, meros@^1.1.4:
version "1.1.4"
resolved "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz#c17994d3133db8b23807f62bec7f0cb276cfd948"
@@ -21147,7 +21458,7 @@ nan@^2.14.1, nan@^2.15.0:
resolved "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-nano-css@^5.1.0, nano-css@^5.3.1:
+nano-css@^5.3.1:
version "5.3.1"
resolved "https://registry.npmjs.org/nano-css/-/nano-css-5.3.1.tgz#b709383e07ad3be61f64edffacb9d98250b87a1f"
integrity sha512-ENPIyNzANQRyYVvb62ajDd7PAyIgS2LIUnT9ewih4yrXSZX4hKoUwssy8WjUH++kEOA5wUTMgNnV7ko5n34kUA==
@@ -21316,6 +21627,13 @@ node-fetch@2.6.1, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+node-fetch@^2.6.5:
+ version "2.6.6"
+ resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+ integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+ dependencies:
+ whatwg-url "^5.0.0"
+
node-forge@^0.10.0:
version "0.10.0"
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -21943,12 +22261,13 @@ open@^8.0.9:
is-docker "^2.1.1"
is-wsl "^2.2.0"
-openapi-sampler@^1.0.0-beta.15:
- version "1.0.0-beta.16"
- resolved "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.16.tgz#7813524d5b88d222efb772ceb5a809075d6d9174"
- integrity sha512-05+GvwMagTY7GxoDQoWJfmAUFlxfebciiEzqKmu4iq6+MqBEn62AMUkn0CTxyKhnUGIaR2KXjTeslxIeJwVIOw==
+openapi-sampler@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.1.tgz#7bba7000a03cd8a4630bfbe5b3ef258990c78400"
+ integrity sha512-WAFsl5SPYuhQwaMTDFOcKhnEY1G1rmamrMiPmJdqwfl1lr81g63/befcsN9BNi0w5/R0L+hfcUj13PANEBeLgg==
dependencies:
- json-pointer "^0.6.0"
+ "@types/json-schema" "^7.0.7"
+ json-pointer "^0.6.1"
openid-client@^4.1.1, openid-client@^4.2.1:
version "4.9.0"
@@ -22445,7 +22764,7 @@ parse5@5.1.1:
resolved "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-parse5@^6.0.0:
+parse5@6.0.1, parse5@^6.0.0:
version "6.0.1"
resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -22850,7 +23169,7 @@ picocolors@^1.0.0:
resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0:
version "2.3.0"
resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
@@ -23981,9 +24300,9 @@ raw-loader@^4.0.2:
schema-utils "^3.0.0"
rc-progress@^3.0.0:
- version "3.1.3"
- resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-3.1.3.tgz#d77d8fd26d9d948d72c2a28b64b71a6e86df2426"
- integrity sha512-Jl4fzbBExHYMoC6HBPzel0a9VmhcSXx24LVt/mdhDM90MuzoMCJjXZAlhA0V0CJi+SKjMhfBoIQ6Lla1nD4QNw==
+ version "3.1.4"
+ resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-3.1.4.tgz#66040d0fae7d8ced2b38588378eccb2864bad615"
+ integrity sha512-XBAif08eunHssGeIdxMXOmRQRULdHaDdIFENQ578CMb4dyewahmmfJRyab+hw4KH4XssEzzYOkAInTLS7JJG+Q==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.6"
@@ -24151,11 +24470,6 @@ react-error-overlay@^6.0.9:
resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
-react-fast-compare@^2.0.4:
- version "2.0.4"
- resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
- integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
-
react-fast-compare@^3.0.1, react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
version "3.2.0"
resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
@@ -24473,23 +24787,6 @@ react-universal-interface@^0.6.2:
resolved "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
-react-use@^12.2.0:
- version "12.13.0"
- resolved "https://registry.npmjs.org/react-use/-/react-use-12.13.0.tgz#dfefd8145552841f1c2213c2e79966b505a264ba"
- integrity sha512-Kh0m9ezIn9xfRycx4jdAgvsYGstGfjTBO2ecIM3+G0RqrpMxTIL5jjYraHYfUzjGBHf7dUhNYBzm5vw5LItVZA==
- dependencies:
- "@types/react-wait" "^0.3.0"
- copy-to-clipboard "^3.1.0"
- nano-css "^5.1.0"
- react-fast-compare "^2.0.4"
- react-wait "^0.3.0"
- resize-observer-polyfill "^1.5.1"
- screenfull "^5.0.0"
- set-harmonic-interval "^1.0.1"
- throttle-debounce "^2.0.1"
- ts-easing "^0.2.0"
- tslib "^1.10.0"
-
react-use@^17.2.4:
version "17.2.4"
resolved "https://registry.npmjs.org/react-use/-/react-use-17.2.4.tgz#1f89be3db0a8237c79253db0a15e12bbe3cfeff1"
@@ -24522,12 +24819,7 @@ react-virtualized@^9.21.0:
prop-types "^15.6.0"
react-lifecycles-compat "^3.0.4"
-react-wait@^0.3.0:
- version "0.3.0"
- resolved "https://registry.npmjs.org/react-wait/-/react-wait-0.3.0.tgz#0cdd4d919012451a5bc3ab0a16d00c6fd9a8c10b"
- integrity sha512-kB5x/kMKWcn0uVr9gBdNz21/oGbQwEQnF3P9p6E9yLfJ9DRcKS0fagbgYMFI0YFOoyKDj+2q6Rwax0kTYJF37g==
-
-react@^16.0.0, react@^16.12.0, react@^16.13.1:
+react@^16.12.0, react@^16.13.1:
version "16.13.1"
resolved "https://registry.npmjs.org/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
@@ -25632,7 +25924,7 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-saxes@^5.0.0:
+saxes@^5.0.0, saxes@^5.0.1:
version "5.0.1"
resolved "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
@@ -25688,7 +25980,7 @@ scoped-regex@^2.0.0:
resolved "https://registry.npmjs.org/scoped-regex/-/scoped-regex-2.1.0.tgz#7b9be845d81fd9d21d1ec97c61a0b7cf86d2015f"
integrity sha512-g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ==
-screenfull@^5.0.0, screenfull@^5.1.0:
+screenfull@^5.1.0:
version "5.1.0"
resolved "https://registry.npmjs.org/screenfull/-/screenfull-5.1.0.tgz#85c13c70f4ead4c1b8a935c70010dfdcd2c0e5c8"
integrity sha512-dYaNuOdzr+kc6J6CFcBrzkLCfyGcMg+gWkJ8us93IQ7y1cevhQAugFsaCdMHb6lw8KV3xPzSxzH7zM1dQap9mA==
@@ -26943,6 +27235,11 @@ style-loader@^3.3.1:
resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
+style-mod@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz#97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01"
+ integrity sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==
+
style-to-object@0.3.0, style-to-object@^0.3.0:
version "0.3.0"
resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
@@ -26963,6 +27260,17 @@ stylis@^4.0.6:
resolved "https://registry.npmjs.org/stylis/-/stylis-4.0.7.tgz#412a90c28079417f3d27c028035095e4232d2904"
integrity sha512-OFFeUXFgwnGOKvEXaSv0D0KQ5ADP0n6g3SVONx6I/85JzNZ3u50FRwB3lVIk1QO2HNdI75tbVzc4Z66Gdp9voA==
+subscriptions-transport-ws@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883"
+ integrity sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==
+ dependencies:
+ backo2 "^1.0.2"
+ eventemitter3 "^3.1.0"
+ iterall "^1.2.1"
+ symbol-observable "^1.0.4"
+ ws "^5.2.0 || ^6.0.0 || ^7.0.0"
+
subscriptions-transport-ws@^0.9.18, subscriptions-transport-ws@^0.9.19:
version "0.9.19"
resolved "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf"
@@ -27213,6 +27521,14 @@ sync-fetch@0.3.0:
buffer "^5.7.0"
node-fetch "^2.6.1"
+sync-fetch@0.3.1:
+ version "0.3.1"
+ resolved "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.1.tgz#62aa82c4b4d43afd6906bfd7b5f92056458509f0"
+ integrity sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==
+ dependencies:
+ buffer "^5.7.0"
+ node-fetch "^2.6.1"
+
table@^6.0.9:
version "6.7.1"
resolved "https://registry.npmjs.org/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
@@ -27530,11 +27846,6 @@ throat@^5.0.0:
resolved "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
-throttle-debounce@^2.0.1:
- version "2.2.1"
- resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.2.1.tgz#fbd933ae6793448816f7d5b3cae259d464c98137"
- integrity sha512-i9hAVld1f+woAiyNGqWelpDD5W1tpMroL3NofTz9xzwq6acWBlO2dC8k5EFSZepU6oOINtV5Q3aSPoRg7o4+fA==
-
throttle-debounce@^3.0.1:
version "3.0.1"
resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
@@ -27758,6 +28069,18 @@ tr46@^2.0.2:
dependencies:
punycode "^2.1.1"
+tr46@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+ integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+ dependencies:
+ punycode "^2.1.1"
+
+tr46@~0.0.3:
+ version "0.0.3"
+ resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+ integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
"traverse@>=0.3.0 <0.4":
version "0.3.9"
resolved "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
@@ -28206,6 +28529,11 @@ underscore@^1.12.1, underscore@^1.9.1:
resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
+undici@^4.9.3:
+ version "4.11.0"
+ resolved "https://registry.npmjs.org/undici/-/undici-4.11.0.tgz#41fb4f944704d77e1c9fb472d40d2dbece64ccf2"
+ integrity sha512-gofXRqAdm81rzaZgPbMf98qvrNGd3ptJ26+mCcF3EXoC817p//MtL8XcDpTvHUXxdW27rAM2jvTae+KyAchorw==
+
unfetch@^4.2.0:
version "4.2.0"
resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
@@ -28464,7 +28792,7 @@ universalify@^2.0.0:
resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-unixify@1.0.0:
+unixify@1.0.0, unixify@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
integrity sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=
@@ -28639,6 +28967,13 @@ use-memo-one@^1.1.1:
resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c"
integrity sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==
+use-resize-observer@^7.0.0:
+ version "7.1.0"
+ resolved "https://registry.npmjs.org/use-resize-observer/-/use-resize-observer-7.1.0.tgz#709ea7540fbe0a60ceae41ee2bef933d7782e4d4"
+ integrity sha512-6DGWOnZpjAGP/MtslGg7OunZptyueQduMi0i8DC5nVKXtJ8Bdt0wR/1tSxugFRndzYCi/jtD+SlNs5PK8ijvXQ==
+ dependencies:
+ "@juggle/resize-observer" "^3.3.1"
+
use@^3.1.0:
version "3.1.1"
resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -28804,6 +29139,11 @@ validator@^8.0.0:
resolved "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==
+value-or-promise@1.0.11:
+ version "1.0.11"
+ resolved "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
+ integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==
+
value-or-promise@1.0.6:
version "1.0.6"
resolved "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.6.tgz#218aa4794aa2ee24dcf48a29aba4413ed584747f"
@@ -28917,6 +29257,11 @@ w3c-hr-time@^1.0.2:
dependencies:
browser-process-hrtime "^1.0.0"
+w3c-keyname@^2.2.4:
+ version "2.2.4"
+ resolved "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b"
+ integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==
+
w3c-xmlserializer@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
@@ -29009,6 +29354,11 @@ web-streams-polyfill@4.0.0-beta.1:
resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==
+webidl-conversions@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+ integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
webidl-conversions@^5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -29224,6 +29574,14 @@ whatwg-mimetype@^2.3.0:
resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+whatwg-url@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+ integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+ dependencies:
+ tr46 "~0.0.3"
+ webidl-conversions "^3.0.0"
+
whatwg-url@^8.0.0, whatwg-url@^8.4.0:
version "8.4.0"
resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
@@ -29233,6 +29591,15 @@ whatwg-url@^8.0.0, whatwg-url@^8.4.0:
tr46 "^2.0.2"
webidl-conversions "^6.1.0"
+whatwg-url@^8.5.0:
+ version "8.7.0"
+ resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+ integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+ dependencies:
+ lodash "^4.7.0"
+ tr46 "^2.1.0"
+ webidl-conversions "^6.1.0"
+
which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -29470,6 +29837,11 @@ ws@7.4.6:
resolved "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ws@8.3.0:
+ version "8.3.0"
+ resolved "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d"
+ integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==
+
"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.2.3, ws@^7.3.1:
version "7.5.0"
resolved "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691"