From b5cbf1862bea9320ac92d72873710567928a5445 Mon Sep 17 00:00:00 2001 From: Kiss Miklos Date: Sat, 24 Feb 2024 03:25:32 +0100 Subject: [PATCH] upgrade typescript, react, eslint Signed-off-by: Kiss Miklos --- package.json | 14 +- packages/app/package.json | 7 +- .../backstage-aws-backend/package.json | 3 +- .../package.json | 3 +- .../src/service/argocd.test.ts | 12 +- .../src/service/router.test.ts | 2 +- .../backstage-plugin-aws-auth/.eslintrc.js | 4 +- .../src/service/aws-api.test.ts | 8 +- .../providers/AWSEKSClusterProvider.test.ts | 4 +- .../src/providers/AWSIAMRoleProvider.test.ts | 4 +- .../src/providers/AWSIAMUserProvider.test.ts | 4 +- .../AWSLambdaFunctionProvider.test.ts | 4 +- .../src/providers/AWSS3BucketProvider.test.ts | 4 +- .../src/providers/OktaEntityProvider.test.ts | 4 +- .../providers/OktaGroupEntityProvider.test.ts | 22 +- .../providers/OktaOrgEntityProvider.test.ts | 26 +- .../providers/OktaUserEntityProvider.test.ts | 16 +- .../backstage-plugin-argo-cd/package.json | 12 +- .../backstage-plugin-argo-cd/tsconfig.json | 8 - .../backstage-plugin-aws-lambda/package.json | 4 +- .../src/components/ErrorBoundary.tsx | 8 +- .../src/state/AppState.tsx | 4 +- .../backstage-plugin-aws-lambda/tsconfig.json | 7 - .../backstage-plugin-aws/package.json | 3 +- .../backstage-plugin-bugsnag/package.json | 5 +- .../backstage-plugin-bugsnag/tsconfig.json | 7 - .../backstage-plugin-buildkite/package.json | 4 +- .../BuildKiteBuildsTable.test.tsx | 2 +- .../backstage-plugin-buildkite/tsconfig.json | 7 - .../backstage-plugin-cloudsmith/package.json | 4 +- .../backstage-plugin-datadog/package.json | 10 +- .../src/components/ErrorBoundary.tsx | 8 +- .../backstage-plugin-datadog/tsconfig.json | 8 - .../package.json | 7 +- .../tsconfig.json | 8 - .../package.json | 4 +- .../tsconfig.json | 8 - .../backstage-plugin-iframe/package.json | 24 +- .../backstage-plugin-iframe/tsconfig.json | 7 - .../backstage-plugin-jira/package.json | 4 +- .../backstage-plugin-jira/tsconfig.json | 7 - .../backstage-plugin-prometheus/package.json | 5 +- .../src/hooks/usePrometheus.ts | 1 + .../backstage-plugin-prometheus/tsconfig.json | 8 - .../package.json | 4 +- .../DependabotAlertsTable.tsx | 2 +- .../DependabotAlertsWidget.tsx | 2 +- .../tsconfig.json | 7 - .../backstage-plugin-shortcut/package.json | 3 +- .../backstage-plugin-travis-ci/package.json | 4 +- .../src/components/ContextProvider.tsx | 2 +- .../backstage-plugin-travis-ci/tsconfig.json | 8 - .../package.json | 3 +- .../tsconfig.json | 7 - .../backstage-plugin-home-rss/.eslintrc.js | 4 +- .../backstage-plugin-home-rss/package.json | 3 +- .../backstage-plugin-home-rss/tsconfig.json | 7 - .../scaffolder-backend-argocd/package.json | 1 - .../package.json | 1 - .../src/actions/s3/cp.test.ts | 4 +- .../package.json | 3 +- .../src/actions/run/backstageRequest.test.ts | 32 +- .../src/actions/run/helpers.test.ts | 18 +- .../package.json | 1 - .../package.json | 3 +- .../tsconfig.json | 7 - .../src/validator.test.js | 2 +- yarn.lock | 473 ++++-------------- 68 files changed, 255 insertions(+), 671 deletions(-) delete mode 100644 plugins/frontend/backstage-plugin-argo-cd/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-aws-lambda/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-bugsnag/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-buildkite/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-datadog/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-github-insights/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-github-pull-requests/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-iframe/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-jira/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-prometheus/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-security-insights/tsconfig.json delete mode 100644 plugins/frontend/backstage-plugin-travis-ci/tsconfig.json delete mode 100644 plugins/home/backstage-plugin-home-markdown/tsconfig.json delete mode 100644 plugins/home/backstage-plugin-home-rss/tsconfig.json delete mode 100644 plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/tsconfig.json diff --git a/package.json b/package.json index 338f51fbc..635290e71 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "start-backend": "yarn workspace backend start", "start-backend:ci": "yarn workspace backend backstage-cli package build && node packages/backend", "start:ci": "concurrently \"yarn start\" \"yarn start-backend:ci\"", - "build": "lerna run build", + "build": "backstage-cli repo build --all", "build-image": "yarn workspace backend build-image", "tsc": "tsc", "tsc:full": "tsc --skipLibCheck false --incremental false", @@ -20,13 +20,17 @@ "diff": "lerna run diff --", "test": "yarn backstage-cli repo test --workerIdleMemoryLimit=800M --coverage --runInBand", "test:all": "lerna run test -- --coverage --runInBand", - "lint": "lerna run lint --since origin/main --", + "lint": "backstage-cli repo lint --since origin/main", "lint:all": "lerna run lint --", "create-plugin": "backstage-cli create-plugin --scope roadiehq --no-private", "remove-plugin": "backstage-cli remove-plugin", "release": "changeset version && yarn prettier --write '{packages,plugins}/*/{package.json,CHANGELOG.md}' && yarn install", "prepare": "husky install" }, + "resolutions": { + "@types/react": "^18", + "@types/react-dom": "^18" + }, "workspaces": { "packages": [ "packages/*", @@ -35,17 +39,19 @@ ] }, "devDependencies": { - "@backstage/cli": "^0.25.1", + "@backstage/cli": "^0.25.0", "@spotify/prettier-config": "^14.0.0", "@types/webpack": "^5.28.0", "concurrently": "^7.0.0", + "eslint": "^8.6.0", "eslint-plugin-notice": "^0.9.10", + "eslint-plugin-react": "^7.28.0", "eslint-plugin-unused-imports": "^3.1.0", "husky": "^8.0.1", "lerna": "^6.0.0", "lint-staged": "^13.0.3", "prettier": "^2.3.2", - "typescript": "~4.7.0" + "typescript": "~5.2.0" }, "prettier": "@spotify/prettier-config", "dependencies": { diff --git a/packages/app/package.json b/packages/app/package.json index 4e5d16353..7131f496a 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -51,8 +51,8 @@ "@roadiehq/backstage-plugin-travis-ci": "^2.1.11", "@roadiehq/plugin-scaffolder-frontend-module-http-request-field": "^1.3.12", "history": "^5.0.0", - "react": "^17.0.2", - "react-dom": "^17.0.2", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router": "6.0.0-beta.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^15.3.3" @@ -61,9 +61,8 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^10.4.1", "@testing-library/user-event": "^12.0.7", - "@types/jest": "^26.0.7", "@types/node": "^14.14.32", - "@types/react-dom": "^16.9.8", + "@types/react-dom": "^18", "cross-env": "^7.0.0", "cypress": "^7.3.0", "eslint-plugin-cypress": "^2.10.3", diff --git a/plugins/backend/backstage-aws-backend/package.json b/plugins/backend/backstage-aws-backend/package.json index 1db886f62..66bf90f5d 100644 --- a/plugins/backend/backstage-aws-backend/package.json +++ b/plugins/backend/backstage-aws-backend/package.json @@ -42,8 +42,7 @@ "@backstage/cli": "^0.25.0", "@types/supertest": "^2.0.8", "supertest": "^4.0.2", - "aws-sdk-client-mock": "^0.6.2", - "ts-jest": "^26.1.0" + "aws-sdk-client-mock": "^0.6.2" }, "files": [ "dist", diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/package.json b/plugins/backend/backstage-plugin-argo-cd-backend/package.json index 86043edfb..f98996faf 100644 --- a/plugins/backend/backstage-plugin-argo-cd-backend/package.json +++ b/plugins/backend/backstage-plugin-argo-cd-backend/package.json @@ -39,10 +39,11 @@ }, "devDependencies": { "@backstage/cli": "^0.25.0", + "jest-mock": "^29.0.0", "@types/supertest": "^2.0.8", "jest-fetch-mock": "^3.0.3", "supertest": "^4.0.2", - "ts-jest": "^26.1.0" + "ts-jest": "^29.0.0" }, "files": [ "dist", diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.test.ts b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.test.ts index cca1cc01c..5c812bca9 100644 --- a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.test.ts +++ b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.test.ts @@ -7,12 +7,14 @@ import { } from './argocdTestResponses'; import fetchMock from 'jest-fetch-mock'; import { timer } from './timer.services'; -import { mocked } from 'ts-jest/utils'; import { Logger } from 'winston'; import { ResourceItem, UpdateArgoProjectAndAppProps } from './types'; +import { mocked } from 'jest-mock'; fetchMock.enableMocks(); -jest.mock('./timer.services'); +jest.mock('./timer.services', () => ({ + timer: jest.fn(), +})); const loggerMock = { error: jest.fn(), info: jest.fn(), @@ -1207,8 +1209,8 @@ describe('ArgoCD service', () => { expect(resp).toEqual( expect.objectContaining({ metadata: { name: 'application' } }), ); - expect(fetchMock).toBeCalledTimes(1); - expect(fetchMock).toBeCalledWith( + expect(fetchMock).toHaveBeenCalledTimes(1); + expect(fetchMock).toHaveBeenCalledWith( 'https://argoInstance1.com/api/v1/applications/application', expect.objectContaining({ headers: { Authorization: 'Bearer token' } }), ); @@ -1258,7 +1260,7 @@ describe('ArgoCD service', () => { }), ).rejects.toEqual('Unauthorized'); - expect(mockGetArgoToken).toBeCalledTimes(1); + expect(mockGetArgoToken).toHaveBeenCalledTimes(1); }); it('fails because unauthorized to get application information', async () => { diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/router.test.ts b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/router.test.ts index ff959f21c..5596fb335 100644 --- a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/router.test.ts +++ b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/router.test.ts @@ -5,7 +5,7 @@ import request from 'supertest'; import { getVoidLogger } from '@backstage/backend-common'; import fetchMock from 'jest-fetch-mock'; import { timer } from './timer.services'; -import { mocked } from 'ts-jest/utils'; +import { mocked } from 'jest-mock'; const mockDeleteApp = jest.fn(); const mockDeleteProject = jest.fn(); diff --git a/plugins/backend/backstage-plugin-aws-auth/.eslintrc.js b/plugins/backend/backstage-plugin-aws-auth/.eslintrc.js index 16a033dbc..e2a53a6ad 100644 --- a/plugins/backend/backstage-plugin-aws-auth/.eslintrc.js +++ b/plugins/backend/backstage-plugin-aws-auth/.eslintrc.js @@ -1,3 +1 @@ -module.exports = { - extends: [require.resolve('@backstage/cli/config/eslint.backend')], -}; +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/plugins/backend/backstage-plugin-aws-auth/src/service/aws-api.test.ts b/plugins/backend/backstage-plugin-aws-auth/src/service/aws-api.test.ts index 41a29ab6a..62b315ab1 100644 --- a/plugins/backend/backstage-plugin-aws-auth/src/service/aws-api.test.ts +++ b/plugins/backend/backstage-plugin-aws-auth/src/service/aws-api.test.ts @@ -63,8 +63,8 @@ describe('aws-api', () => { mockResponse(), ); - expect((await response).json).toBeCalledWith(credentialsStub); - expect(generateTemporaryCredentialsMock).toBeCalledWith( + expect((await response).json).toHaveBeenCalledWith(credentialsStub); + expect(generateTemporaryCredentialsMock).toHaveBeenCalledWith( keyIdStub, keySecretStub, undefined, @@ -90,8 +90,8 @@ describe('aws-api', () => { mockResponse(), ); - expect((await response).json).toBeCalledWith(credentialsStub); - expect(generateTemporaryCredentialsMock).toBeCalledWith( + expect((await response).json).toHaveBeenCalledWith(credentialsStub); + expect(generateTemporaryCredentialsMock).toHaveBeenCalledWith( keyIdStub, keySecretStub, roleArnStub, diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSEKSClusterProvider.test.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSEKSClusterProvider.test.ts index b6faf7c28..a54bc37b1 100644 --- a/plugins/backend/catalog-backend-module-aws/src/providers/AWSEKSClusterProvider.test.ts +++ b/plugins/backend/catalog-backend-module-aws/src/providers/AWSEKSClusterProvider.test.ts @@ -64,7 +64,7 @@ describe('AWSEKSClusterProvider', () => { const provider = AWSEKSClusterProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -93,7 +93,7 @@ describe('AWSEKSClusterProvider', () => { const provider = AWSEKSClusterProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMRoleProvider.test.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMRoleProvider.test.ts index 15a8404c9..0750cd1f5 100644 --- a/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMRoleProvider.test.ts +++ b/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMRoleProvider.test.ts @@ -56,7 +56,7 @@ describe('AWSIAMRoleProvider', () => { const provider = AWSIAMRoleProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -84,7 +84,7 @@ describe('AWSIAMRoleProvider', () => { const provider = AWSIAMRoleProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMUserProvider.test.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMUserProvider.test.ts index 11f8e2f92..c43b0b3b5 100644 --- a/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMUserProvider.test.ts +++ b/plugins/backend/catalog-backend-module-aws/src/providers/AWSIAMUserProvider.test.ts @@ -56,7 +56,7 @@ describe('AWSIAMUserProvider', () => { const provider = AWSIAMUserProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -84,7 +84,7 @@ describe('AWSIAMUserProvider', () => { const provider = AWSIAMUserProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSLambdaFunctionProvider.test.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSLambdaFunctionProvider.test.ts index 90781c0a0..73886ec81 100644 --- a/plugins/backend/catalog-backend-module-aws/src/providers/AWSLambdaFunctionProvider.test.ts +++ b/plugins/backend/catalog-backend-module-aws/src/providers/AWSLambdaFunctionProvider.test.ts @@ -56,7 +56,7 @@ describe('AWSLambdaFunctionProvider', () => { const provider = AWSLambdaFunctionProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -96,7 +96,7 @@ describe('AWSLambdaFunctionProvider', () => { const provider = AWSLambdaFunctionProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.test.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.test.ts index bf8d5ee83..32f6fc24a 100644 --- a/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.test.ts +++ b/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.test.ts @@ -56,7 +56,7 @@ describe('AWSS3BucketProvider', () => { const provider = AWSS3BucketProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -83,7 +83,7 @@ describe('AWSS3BucketProvider', () => { const provider = AWSS3BucketProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-okta/src/providers/OktaEntityProvider.test.ts b/plugins/backend/catalog-backend-module-okta/src/providers/OktaEntityProvider.test.ts index 9d107b706..dd3172ed0 100644 --- a/plugins/backend/catalog-backend-module-okta/src/providers/OktaEntityProvider.test.ts +++ b/plugins/backend/catalog-backend-module-okta/src/providers/OktaEntityProvider.test.ts @@ -56,7 +56,7 @@ describe('OktaEntityProvider', () => { }); provider.getClient('http://someorg', ['okta.users.read']); - expect(Client).toBeCalledWith({ + expect(Client).toHaveBeenCalledWith({ orgUrl: 'http://someorg', token: 'secret', }); @@ -75,7 +75,7 @@ describe('OktaEntityProvider', () => { }); provider.getClient('http://someorg', ['okta.users.read']); - expect(Client).toBeCalledWith({ + expect(Client).toHaveBeenCalledWith({ authorizationMode: 'PrivateKey', clientId: 'theclientid', keyId: 'thekeyid', diff --git a/plugins/backend/catalog-backend-module-okta/src/providers/OktaGroupEntityProvider.test.ts b/plugins/backend/catalog-backend-module-okta/src/providers/OktaGroupEntityProvider.test.ts index c33bfb9d3..d9f02970e 100644 --- a/plugins/backend/catalog-backend-module-okta/src/providers/OktaGroupEntityProvider.test.ts +++ b/plugins/backend/catalog-backend-module-okta/src/providers/OktaGroupEntityProvider.test.ts @@ -56,7 +56,7 @@ describe('OktaGroupProvider', () => { const provider = OktaGroupEntityProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -106,7 +106,7 @@ describe('OktaGroupProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -186,7 +186,7 @@ describe('OktaGroupProvider', () => { const provider = OktaGroupEntityProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -229,7 +229,7 @@ describe('OktaGroupProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -259,7 +259,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -290,7 +290,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -325,7 +325,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -371,7 +371,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -416,7 +416,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -437,7 +437,7 @@ describe('OktaGroupProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -484,7 +484,7 @@ describe('OktaGroupProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-okta/src/providers/OktaOrgEntityProvider.test.ts b/plugins/backend/catalog-backend-module-okta/src/providers/OktaOrgEntityProvider.test.ts index b507a4024..8c23ea07b 100644 --- a/plugins/backend/catalog-backend-module-okta/src/providers/OktaOrgEntityProvider.test.ts +++ b/plugins/backend/catalog-backend-module-okta/src/providers/OktaOrgEntityProvider.test.ts @@ -97,7 +97,7 @@ describe('OktaOrgEntityProvider', () => { const provider = OktaOrgEntityProvider.fromConfig(config, { logger }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.not.arrayContaining([ { @@ -171,7 +171,7 @@ describe('OktaOrgEntityProvider', () => { const provider = OktaOrgEntityProvider.fromConfig(config, { logger }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -213,7 +213,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -240,7 +240,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -270,7 +270,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -301,7 +301,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -333,7 +333,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.not.arrayContaining([ expect.objectContaining({ @@ -391,7 +391,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -476,7 +476,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -574,7 +574,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -650,7 +650,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -725,7 +725,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ @@ -803,7 +803,7 @@ describe('OktaOrgEntityProvider', () => { }); await provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: expect.arrayContaining([ expect.objectContaining({ diff --git a/plugins/backend/catalog-backend-module-okta/src/providers/OktaUserEntityProvider.test.ts b/plugins/backend/catalog-backend-module-okta/src/providers/OktaUserEntityProvider.test.ts index 550ba3e5f..51fb7b3ef 100644 --- a/plugins/backend/catalog-backend-module-okta/src/providers/OktaUserEntityProvider.test.ts +++ b/plugins/backend/catalog-backend-module-okta/src/providers/OktaUserEntityProvider.test.ts @@ -54,7 +54,7 @@ describe('OktaUserEntityProvider', () => { const provider = OktaUserEntityProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -84,7 +84,7 @@ describe('OktaUserEntityProvider', () => { const provider = OktaUserEntityProvider.fromConfig(config, { logger }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ @@ -110,7 +110,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ @@ -136,7 +136,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ @@ -162,7 +162,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ @@ -190,7 +190,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [], }); @@ -207,7 +207,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ @@ -252,7 +252,7 @@ describe('OktaUserEntityProvider', () => { }); provider.connect(entityProviderConnection); await provider.run(); - expect(entityProviderConnection.applyMutation).toBeCalledWith({ + expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({ type: 'full', entities: [ expect.objectContaining({ diff --git a/plugins/frontend/backstage-plugin-argo-cd/package.json b/plugins/frontend/backstage-plugin-argo-cd/package.json index c72d51dee..4b45f3918 100644 --- a/plugins/frontend/backstage-plugin-argo-cd/package.json +++ b/plugins/frontend/backstage-plugin-argo-cd/package.json @@ -52,8 +52,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, @@ -66,15 +66,7 @@ "@rollup/plugin-node-resolve": "^15.0.1", "@testing-library/jest-dom": "^5.12.0", "@testing-library/react": "^11.2.6", - "@typescript-eslint/eslint-plugin": "^4.22.0", - "@typescript-eslint/parser": "^4.22.0", "esbuild": "^0.11.13", - "eslint": "^7.24.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jest": "^24.3.5", - "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.23.2", - "eslint-plugin-react-hooks": "^4.2.0", "jest-environment-jsdom": "^29.2.1", "msw": "^1.0.1", "rollup-plugin-dts": "^5.2.0", diff --git a/plugins/frontend/backstage-plugin-argo-cd/tsconfig.json b/plugins/frontend/backstage-plugin-argo-cd/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-argo-cd/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/frontend/backstage-plugin-aws-lambda/package.json b/plugins/frontend/backstage-plugin-aws-lambda/package.json index 23ca4bfb4..17dc4c312 100644 --- a/plugins/frontend/backstage-plugin-aws-lambda/package.json +++ b/plugins/frontend/backstage-plugin-aws-lambda/package.json @@ -47,8 +47,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", diff --git a/plugins/frontend/backstage-plugin-aws-lambda/src/components/ErrorBoundary.tsx b/plugins/frontend/backstage-plugin-aws-lambda/src/components/ErrorBoundary.tsx index eada496f3..fde0a1523 100644 --- a/plugins/frontend/backstage-plugin-aws-lambda/src/components/ErrorBoundary.tsx +++ b/plugins/frontend/backstage-plugin-aws-lambda/src/components/ErrorBoundary.tsx @@ -1,8 +1,12 @@ import React, { Component } from 'react'; import Alert from '@material-ui/lab/Alert'; -interface Props {} -interface MyProps {} +interface Props { + children: JSX.Element; +} +interface MyProps { + children: JSX.Element; +} interface MyState { hasError: boolean; diff --git a/plugins/frontend/backstage-plugin-aws-lambda/src/state/AppState.tsx b/plugins/frontend/backstage-plugin-aws-lambda/src/state/AppState.tsx index 4b67a382a..1fc4f2944 100644 --- a/plugins/frontend/backstage-plugin-aws-lambda/src/state/AppState.tsx +++ b/plugins/frontend/backstage-plugin-aws-lambda/src/state/AppState.tsx @@ -48,7 +48,9 @@ const reducer: Reducer = (state, action) => { } }; -export const AppStateProvider: FC = ({ children }) => { +export const AppStateProvider: FC<{ children: JSX.Element }> = ({ + children, +}) => { const [state, dispatch] = useReducer(reducer, initialState); return ( diff --git a/plugins/frontend/backstage-plugin-aws-lambda/tsconfig.json b/plugins/frontend/backstage-plugin-aws-lambda/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-aws-lambda/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-aws/package.json b/plugins/frontend/backstage-plugin-aws/package.json index 6fad88e8f..c1254e4a4 100644 --- a/plugins/frontend/backstage-plugin-aws/package.json +++ b/plugins/frontend/backstage-plugin-aws/package.json @@ -45,7 +45,7 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", @@ -55,7 +55,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^13.1.8", - "@types/jest": "*", "@types/node": "*", "msw": "^1.0.1", "cross-fetch": "^3.1.5", diff --git a/plugins/frontend/backstage-plugin-bugsnag/package.json b/plugins/frontend/backstage-plugin-bugsnag/package.json index e051e060c..f28f1fddc 100644 --- a/plugins/frontend/backstage-plugin-bugsnag/package.json +++ b/plugins/frontend/backstage-plugin-bugsnag/package.json @@ -44,8 +44,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@types/luxon": "^3.0.0", @@ -58,7 +58,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", - "@types/jest": "^26.0.7", "@types/node": "^14.14.32", "cross-fetch": "^3.0.6", "jest-environment-jsdom": "^29.2.1", diff --git a/plugins/frontend/backstage-plugin-bugsnag/tsconfig.json b/plugins/frontend/backstage-plugin-bugsnag/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-bugsnag/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-buildkite/package.json b/plugins/frontend/backstage-plugin-buildkite/package.json index 32ed78f9d..8e914c6f3 100644 --- a/plugins/frontend/backstage-plugin-buildkite/package.json +++ b/plugins/frontend/backstage-plugin-buildkite/package.json @@ -46,8 +46,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, diff --git a/plugins/frontend/backstage-plugin-buildkite/src/components/BuildKiteBuildsTable/BuildKiteBuildsTable.test.tsx b/plugins/frontend/backstage-plugin-buildkite/src/components/BuildKiteBuildsTable/BuildKiteBuildsTable.test.tsx index 01ee4fc27..00dcd7798 100644 --- a/plugins/frontend/backstage-plugin-buildkite/src/components/BuildKiteBuildsTable/BuildKiteBuildsTable.test.tsx +++ b/plugins/frontend/backstage-plugin-buildkite/src/components/BuildKiteBuildsTable/BuildKiteBuildsTable.test.tsx @@ -100,7 +100,7 @@ describe('BuildKiteBuildsTable', () => { ); await waitFor(() => - expect(postMock).toBeCalledWith( + expect(postMock).toHaveBeenCalledWith( new Error('failed to fetch data, status 403: Forbidden'), ), ); diff --git a/plugins/frontend/backstage-plugin-buildkite/tsconfig.json b/plugins/frontend/backstage-plugin-buildkite/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-buildkite/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-cloudsmith/package.json b/plugins/frontend/backstage-plugin-cloudsmith/package.json index 3cf27db50..506adc73b 100644 --- a/plugins/frontend/backstage-plugin-cloudsmith/package.json +++ b/plugins/frontend/backstage-plugin-cloudsmith/package.json @@ -45,7 +45,8 @@ "@backstage/plugin-home": "^0.6.0" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", @@ -55,7 +56,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^13.1.8", - "@types/jest": "*", "@types/node": "*", "msw": "^1.0.1", "cross-fetch": "^3.1.5", diff --git a/plugins/frontend/backstage-plugin-datadog/package.json b/plugins/frontend/backstage-plugin-datadog/package.json index e08c42e18..44b965619 100644 --- a/plugins/frontend/backstage-plugin-datadog/package.json +++ b/plugins/frontend/backstage-plugin-datadog/package.json @@ -40,15 +40,14 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "cross-fetch": "^3.1.4", - "eslint-plugin-jest": "^24.3.6", "history": "^5.0.0", "moment": "^2.29.1", "re-resizable": "^6.9.0", "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, @@ -59,12 +58,7 @@ "@backstage/test-utils": "^1.4.6", "@testing-library/jest-dom": "^5.12.0", "@testing-library/react": "^10.4.1", - "@typescript-eslint/eslint-plugin": "^4.4.0", - "@typescript-eslint/parser": "^4.4.0", "esbuild": "^0.11.13", - "eslint": "^7.6.0", - "eslint-plugin-jest": "^24.3.6", - "eslint-plugin-react": "^7.20.5", "jest-environment-jsdom": "^29.2.1", "msw": "^1.0.1", "rollup-plugin-dts": "^5.2.0", diff --git a/plugins/frontend/backstage-plugin-datadog/src/components/ErrorBoundary.tsx b/plugins/frontend/backstage-plugin-datadog/src/components/ErrorBoundary.tsx index 01ea40000..a4f46b563 100644 --- a/plugins/frontend/backstage-plugin-datadog/src/components/ErrorBoundary.tsx +++ b/plugins/frontend/backstage-plugin-datadog/src/components/ErrorBoundary.tsx @@ -1,8 +1,12 @@ import React, { Component } from 'react'; import Alert from '@material-ui/lab/Alert'; -interface Props {} -interface MyProps {} +interface Props { + children: JSX.Element; +} +interface MyProps { + children: JSX.Element; +} interface MyState { hasError: boolean; diff --git a/plugins/frontend/backstage-plugin-datadog/tsconfig.json b/plugins/frontend/backstage-plugin-datadog/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-datadog/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/frontend/backstage-plugin-github-insights/package.json b/plugins/frontend/backstage-plugin-github-insights/package.json index 88e942a1c..10db89863 100644 --- a/plugins/frontend/backstage-plugin-github-insights/package.json +++ b/plugins/frontend/backstage-plugin-github-insights/package.json @@ -52,8 +52,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0" }, "devDependencies": { @@ -68,8 +68,7 @@ "esbuild": "^0.8.56", "msw": "^1.0.1", "react-test-renderer": "^16.14.0", - "jest-environment-jsdom": "^29.2.1", - "typescript": "^4.2.4" + "jest-environment-jsdom": "^29.2.1" }, "files": [ "dist" diff --git a/plugins/frontend/backstage-plugin-github-insights/tsconfig.json b/plugins/frontend/backstage-plugin-github-insights/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-github-insights/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/frontend/backstage-plugin-github-pull-requests/package.json b/plugins/frontend/backstage-plugin-github-pull-requests/package.json index 07afbfed4..d53aa4639 100644 --- a/plugins/frontend/backstage-plugin-github-pull-requests/package.json +++ b/plugins/frontend/backstage-plugin-github-pull-requests/package.json @@ -54,8 +54,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0" }, "devDependencies": { diff --git a/plugins/frontend/backstage-plugin-github-pull-requests/tsconfig.json b/plugins/frontend/backstage-plugin-github-pull-requests/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-github-pull-requests/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/frontend/backstage-plugin-iframe/package.json b/plugins/frontend/backstage-plugin-iframe/package.json index a7d5fa4f1..02f93071e 100644 --- a/plugins/frontend/backstage-plugin-iframe/package.json +++ b/plugins/frontend/backstage-plugin-iframe/package.json @@ -33,34 +33,32 @@ "postpack": "backstage-cli package postpack", "clean": "backstage-cli clean" }, + "peerDependencies": { + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" + }, "dependencies": { "@backstage/core-components": "^0.14.0", "@backstage/core-plugin-api": "^1.8.1", "@backstage/plugin-catalog-react": "^1.9.2", "@backstage/plugin-home": "^0.6.0", - "@material-ui/core": "^4.11.0" - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0" - }, - "devDependencies": { - "@backstage/cli": "^0.25.0", + "@material-ui/core": "^4.11.0", "@backstage/core-app-api": "^1.11.2", - "@backstage/core-plugin-api": "^1.8.1", "@backstage/dev-utils": "^1.0.25", - "@backstage/plugin-catalog-react": "^1.9.2", "@backstage/test-utils": "^1.4.6", "@backstage/theme": "^0.5.0", - "@testing-library/jest-dom": "^5.12.0", - "@testing-library/react": "^11.2.6", - "jest-environment-jsdom": "^29.2.1", "msw": "^1.0.1", "rollup-plugin-dts": "^5.2.0", "@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-node-resolve": "^15.0.1", "rollup-plugin-esbuild": "^5.0.0" }, + "devDependencies": { + "@backstage/cli": "^0.25.0", + "@testing-library/jest-dom": "^5.12.0", + "@testing-library/react": "^11.2.6", + "jest-environment-jsdom": "^29.2.1" + }, "files": [ "dist" ] diff --git a/plugins/frontend/backstage-plugin-iframe/tsconfig.json b/plugins/frontend/backstage-plugin-iframe/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-iframe/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-jira/package.json b/plugins/frontend/backstage-plugin-jira/package.json index 803c6b8a4..70f7d9952 100644 --- a/plugins/frontend/backstage-plugin-jira/package.json +++ b/plugins/frontend/backstage-plugin-jira/package.json @@ -53,8 +53,8 @@ "xml-js": "^1.6.11" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", diff --git a/plugins/frontend/backstage-plugin-jira/tsconfig.json b/plugins/frontend/backstage-plugin-jira/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-jira/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-prometheus/package.json b/plugins/frontend/backstage-plugin-prometheus/package.json index 37df4f993..20ea94eea 100644 --- a/plugins/frontend/backstage-plugin-prometheus/package.json +++ b/plugins/frontend/backstage-plugin-prometheus/package.json @@ -51,8 +51,8 @@ "recharts": "^1.8.5" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@types/luxon": "^3.0.0", @@ -63,7 +63,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", - "@types/jest": "^26.0.7", "@types/node": "^14.14.32", "@types/lodash": "^4.14.173", "@types/recharts": "^1.8.14", diff --git a/plugins/frontend/backstage-plugin-prometheus/src/hooks/usePrometheus.ts b/plugins/frontend/backstage-plugin-prometheus/src/hooks/usePrometheus.ts index 7780adb77..5a9ca4efc 100644 --- a/plugins/frontend/backstage-plugin-prometheus/src/hooks/usePrometheus.ts +++ b/plugins/frontend/backstage-plugin-prometheus/src/hooks/usePrometheus.ts @@ -66,6 +66,7 @@ export function resultToGraphData( }) .groupBy('time') .map(_.spread(_.assign)) + // @ts-ignore .map(it => ({ ...it, time: DateTime.fromISO(it.time).toSeconds() })) .value(); return { data, keys, metrics }; diff --git a/plugins/frontend/backstage-plugin-prometheus/tsconfig.json b/plugins/frontend/backstage-plugin-prometheus/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-prometheus/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/frontend/backstage-plugin-security-insights/package.json b/plugins/frontend/backstage-plugin-security-insights/package.json index 05cdf766b..779e6a31c 100644 --- a/plugins/frontend/backstage-plugin-security-insights/package.json +++ b/plugins/frontend/backstage-plugin-security-insights/package.json @@ -52,8 +52,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0" }, "devDependencies": { diff --git a/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsTable/DependabotAlertsTable.tsx b/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsTable/DependabotAlertsTable.tsx index 73284cb68..662d902be 100644 --- a/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsTable/DependabotAlertsTable.tsx +++ b/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsTable/DependabotAlertsTable.tsx @@ -238,7 +238,7 @@ export const DependabotAlertsTable: FC<{}> = () => { authorization: `token ${token}`, }, }); - const { repository } = await gqlEndpoint(query, { + const { repository } = await gqlEndpoint(query, { name: repo, owner: owner, }); diff --git a/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsWidget/DependabotAlertsWidget.tsx b/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsWidget/DependabotAlertsWidget.tsx index 6400cde95..55cd6ec84 100644 --- a/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsWidget/DependabotAlertsWidget.tsx +++ b/plugins/frontend/backstage-plugin-security-insights/src/components/DependabotAlertsWidget/DependabotAlertsWidget.tsx @@ -250,7 +250,7 @@ export const DependabotAlertsWidget = () => { authorization: `token ${token}`, }, }); - const { repository } = await gqlEndpoint(query, { + const { repository } = await gqlEndpoint(query, { name: repo, owner: owner, }); diff --git a/plugins/frontend/backstage-plugin-security-insights/tsconfig.json b/plugins/frontend/backstage-plugin-security-insights/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/frontend/backstage-plugin-security-insights/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/frontend/backstage-plugin-shortcut/package.json b/plugins/frontend/backstage-plugin-shortcut/package.json index efb6bac52..69438deb9 100644 --- a/plugins/frontend/backstage-plugin-shortcut/package.json +++ b/plugins/frontend/backstage-plugin-shortcut/package.json @@ -44,7 +44,7 @@ "@backstage/plugin-home": "^0.6.0" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", @@ -54,7 +54,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^13.1.8", - "@types/jest": "*", "@types/node": "*", "jest-environment-jsdom": "^29.2.1", "cross-fetch": "^3.1.5" diff --git a/plugins/frontend/backstage-plugin-travis-ci/package.json b/plugins/frontend/backstage-plugin-travis-ci/package.json index 215d47453..14bca495c 100644 --- a/plugins/frontend/backstage-plugin-travis-ci/package.json +++ b/plugins/frontend/backstage-plugin-travis-ci/package.json @@ -48,8 +48,8 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0", - "react-dom": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router": "6.0.0-beta.0 || ^6.3.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, diff --git a/plugins/frontend/backstage-plugin-travis-ci/src/components/ContextProvider.tsx b/plugins/frontend/backstage-plugin-travis-ci/src/components/ContextProvider.tsx index 974b431c9..aaddefbbb 100644 --- a/plugins/frontend/backstage-plugin-travis-ci/src/components/ContextProvider.tsx +++ b/plugins/frontend/backstage-plugin-travis-ci/src/components/ContextProvider.tsx @@ -28,7 +28,7 @@ export const StateContext = React.createContext< >([] as any); const STORAGE_KEY = `${travisCIApiRef.id}.settings`; -type Props = { entity: Entity }; +type Props = { entity: Entity; children: JSX.Element }; export const ContextProvider: React.FC = ({ entity, children }) => { const [settings, setSettings] = useLocalStorage(STORAGE_KEY, { entity }); if (settings === undefined) { diff --git a/plugins/frontend/backstage-plugin-travis-ci/tsconfig.json b/plugins/frontend/backstage-plugin-travis-ci/tsconfig.json deleted file mode 100644 index 7855354d3..000000000 --- a/plugins/frontend/backstage-plugin-travis-ci/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types", - "incremental": false - } -} diff --git a/plugins/home/backstage-plugin-home-markdown/package.json b/plugins/home/backstage-plugin-home-markdown/package.json index 1928d5cca..0de1ce4aa 100644 --- a/plugins/home/backstage-plugin-home-markdown/package.json +++ b/plugins/home/backstage-plugin-home-markdown/package.json @@ -44,14 +44,13 @@ "winston": "^3.2.1" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", "@backstage/test-utils": "^1.4.6", "@testing-library/jest-dom": "^5.12.0", "@testing-library/react": "^12.1.3", - "@types/jest": "^26.0.7", "msw": "^1.0.1", "rollup-plugin-dts": "^5.2.0", "@rollup/plugin-commonjs": "^24.0.1", diff --git a/plugins/home/backstage-plugin-home-markdown/tsconfig.json b/plugins/home/backstage-plugin-home-markdown/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/home/backstage-plugin-home-markdown/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/home/backstage-plugin-home-rss/.eslintrc.js b/plugins/home/backstage-plugin-home-rss/.eslintrc.js index 363ad4d15..6b52b938c 100644 --- a/plugins/home/backstage-plugin-home-rss/.eslintrc.js +++ b/plugins/home/backstage-plugin-home-rss/.eslintrc.js @@ -14,6 +14,4 @@ * limitations under the License. */ -module.exports = { - extends: [require.resolve('@backstage/cli/config/eslint')], -}; +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/plugins/home/backstage-plugin-home-rss/package.json b/plugins/home/backstage-plugin-home-rss/package.json index e173cdb66..85813a1be 100644 --- a/plugins/home/backstage-plugin-home-rss/package.json +++ b/plugins/home/backstage-plugin-home-rss/package.json @@ -44,7 +44,7 @@ "winston": "^3.2.1" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@types/luxon": "^3.0.0", @@ -52,7 +52,6 @@ "@backstage/test-utils": "^1.4.6", "@testing-library/jest-dom": "^5.12.0", "@testing-library/react": "^12.1.3", - "@types/jest": "^26.0.7", "msw": "^1.0.1", "rollup-plugin-esbuild": "^5.0.0", "rollup-plugin-dts": "^5.2.0", diff --git a/plugins/home/backstage-plugin-home-rss/tsconfig.json b/plugins/home/backstage-plugin-home-rss/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/home/backstage-plugin-home-rss/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/plugins/scaffolder-actions/scaffolder-backend-argocd/package.json b/plugins/scaffolder-actions/scaffolder-backend-argocd/package.json index 1137bdfc9..01ce6987c 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-argocd/package.json +++ b/plugins/scaffolder-actions/scaffolder-backend-argocd/package.json @@ -38,7 +38,6 @@ "winston": "^3.2.1" }, "devDependencies": { - "@types/jest": "^26.0.7", "@backstage/cli": "^0.25.0" }, "files": [ diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-aws/package.json b/plugins/scaffolder-actions/scaffolder-backend-module-aws/package.json index 2c94bbc8a..1fd602ecb 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-aws/package.json +++ b/plugins/scaffolder-actions/scaffolder-backend-module-aws/package.json @@ -50,7 +50,6 @@ "@types/adm-zip": "^0.4.34", "@types/fs-extra": "^9.0.13", "@types/glob": "^7.2.0", - "@types/jest": "^26.0.7", "@types/mock-fs": "^4.13.1", "aws-sdk-client-mock": "^0.6.0", "mock-fs": "^5.1.2" diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-aws/src/actions/s3/cp.test.ts b/plugins/scaffolder-actions/scaffolder-backend-module-aws/src/actions/s3/cp.test.ts index 0d12e6429..54d9593a8 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-aws/src/actions/s3/cp.test.ts +++ b/plugins/scaffolder-actions/scaffolder-backend-module-aws/src/actions/s3/cp.test.ts @@ -63,7 +63,7 @@ describe('roadiehq:aws:s3:cp', () => { input: { bucket: 'test', region: 'eu1' }, }); - expect(mockS3Client.send).toBeCalledWith( + expect(mockS3Client.send).toHaveBeenCalledWith( expect.objectContaining({ input: { Bucket: 'test', @@ -80,7 +80,7 @@ describe('roadiehq:aws:s3:cp', () => { input: { bucket: 'test', region: 'eu1', prefix: 'upload-to-this' }, }); - expect(mockS3Client.send).toBeCalledWith( + expect(mockS3Client.send).toHaveBeenCalledWith( expect.objectContaining({ input: { Bucket: 'test', diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/package.json b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/package.json index 044fd075e..b3a2ba886 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/package.json +++ b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/package.json @@ -39,8 +39,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.25.0", - "@types/jest": "^26.0.7" + "@backstage/cli": "^0.25.0" }, "files": [ "dist" diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/backstageRequest.test.ts b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/backstageRequest.test.ts index 856a59164..a77d7ef23 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/backstageRequest.test.ts +++ b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/backstageRequest.test.ts @@ -61,7 +61,7 @@ describe('http:backstage:request', () => { method: 'GET', }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'GET', @@ -93,7 +93,7 @@ describe('http:backstage:request', () => { }, }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -128,7 +128,7 @@ describe('http:backstage:request', () => { }), }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -158,7 +158,7 @@ describe('http:backstage:request', () => { body: 'test', }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -186,7 +186,7 @@ describe('http:backstage:request', () => { body: 'asdf', }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -219,7 +219,7 @@ describe('http:backstage:request', () => { headers: {}, }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -256,7 +256,7 @@ describe('http:backstage:request', () => { headers: HEADERS, }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -286,7 +286,7 @@ describe('http:backstage:request', () => { }, }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'POST', @@ -316,7 +316,7 @@ describe('http:backstage:request', () => { method: 'GET', }, }); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: `${mockBaseUrl}/api/proxy/foo`, method: 'GET', @@ -346,9 +346,9 @@ describe('http:backstage:request', () => { method: 'GET', }, }); - expect(loggerSpy).toBeCalledTimes(1); + expect(loggerSpy).toHaveBeenCalledTimes(1); expect(loggerSpy.mock.calls[0]).toContain(expectedLog); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'GET', @@ -377,9 +377,9 @@ describe('http:backstage:request', () => { logRequestPath: false, }, }); - expect(loggerSpy).toBeCalledTimes(1); + expect(loggerSpy).toHaveBeenCalledTimes(1); expect(loggerSpy.mock.calls[0]).toContain(expectedLog); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'GET', @@ -416,9 +416,9 @@ describe('http:backstage:request', () => { logRequestPath: false, }, }); - expect(loggerSpy).toBeCalledTimes(1); + expect(loggerSpy).toHaveBeenCalledTimes(1); expect(loggerSpy.mock.calls[0]).toContain(expectedLog); - expect(http).toBeCalledWith( + expect(http).toHaveBeenCalledWith( { url: 'http://backstage.tests/api/proxy/foo', method: 'GET', @@ -445,7 +445,7 @@ describe('http:backstage:request', () => { logRequestPath: false, }, }); - expect(loggerSpy).toBeCalledTimes(2); + expect(loggerSpy).toHaveBeenCalledTimes(2); expect(loggerSpy.mock.calls[1]).toContain(expectedLog); expect(http).not.toHaveBeenCalled(); }); diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/helpers.test.ts b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/helpers.test.ts index 276a5b067..febfad4e6 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/helpers.test.ts +++ b/plugins/scaffolder-actions/scaffolder-backend-module-http-request/src/actions/run/helpers.test.ts @@ -148,9 +148,7 @@ describe('http', () => { (fetch as unknown as jest.Mock).mockImplementation(() => { throw new Error('fetch error'); }); - await expect( - async () => await http(options, logger), - ).rejects.toThrowError( + await expect(async () => await http(options, logger)).rejects.toThrow( 'There was an issue with the request: Error: fetch error', ); }); @@ -170,9 +168,9 @@ describe('http', () => { (fetch as unknown as jest.Mock).mockResolvedValue( Promise.resolve(mockedResponse), ); - await expect( - async () => await http(options, logger), - ).rejects.toThrowError('Unable to complete request'); + await expect(async () => await http(options, logger)).rejects.toThrow( + 'Unable to complete request', + ); const logEvents = logOutput.trim().split('\n'); expect(logEvents).toEqual( @@ -252,9 +250,7 @@ describe('http', () => { (fetch as unknown as jest.Mock).mockResolvedValue( Promise.resolve(mockedResponse), ); - await expect( - async () => await http(options, logger), - ).rejects.toThrowError( + await expect(async () => await http(options, logger)).rejects.toThrow( 'Could not parse response body: Error: Unable to get JSON', ); }); @@ -265,9 +261,7 @@ describe('http', () => { (fetch as unknown as jest.Mock).mockResolvedValue( new AbortController().abort(), ); - await expect( - async () => await http(options, logger), - ).rejects.toThrowError( + await expect(async () => await http(options, logger)).rejects.toThrow( 'There was an issue with the request: Error: Request was aborted as it took longer than 60 seconds', ); }); diff --git a/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json b/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json index 5ffbe2fac..84e9df506 100644 --- a/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json +++ b/plugins/scaffolder-actions/scaffolder-backend-module-utils/package.json @@ -49,7 +49,6 @@ "@backstage/cli": "^0.25.0", "@types/adm-zip": "^0.4.34", "@types/fs-extra": "^9.0.13", - "@types/jest": "^26.0.7", "@types/js-yaml": "^4.0.0", "@types/mock-fs": "^4.13.1", "mock-fs": "^5.1.2" diff --git a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json index 9c88ce045..9269e8ee1 100644 --- a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json +++ b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json @@ -47,7 +47,7 @@ "react-use": "^17.2.4" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@backstage/cli": "^0.25.0", @@ -57,7 +57,6 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^14.0.0", - "@types/jest": "*", "@types/node": "*", "@types/nunjucks": "^3.2.3", "msw": "^1.0.1", diff --git a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/tsconfig.json b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/tsconfig.json deleted file mode 100644 index f2e3c7446..000000000 --- a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "@backstage/cli/config/tsconfig.json", - "include": ["src", "dev"], - "compilerOptions": { - "outDir": "dist-types" - } -} diff --git a/utils/roadie-backstage-entity-validator/src/validator.test.js b/utils/roadie-backstage-entity-validator/src/validator.test.js index 0b984980b..7e0c893e1 100644 --- a/utils/roadie-backstage-entity-validator/src/validator.test.js +++ b/utils/roadie-backstage-entity-validator/src/validator.test.js @@ -651,7 +651,7 @@ spec: false, 'custom-validation-schema.json', ), - ).rejects.toThrowError( + ).rejects.toThrow( 'Error: Malformed annotation, /metadata/annotations/custom~1source-location must match pattern "^custom-field-value:\\d*$"', ); }); diff --git a/yarn.lock b/yarn.lock index f9ef8c78c..3aec4e57f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4508,13 +4508,6 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== - dependencies: - "@babel/highlight" "^7.10.4" - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -5207,7 +5200,7 @@ "@babel/traverse" "^7.23.9" "@babel/types" "^7.23.9" -"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": +"@babel/highlight@^7.0.0", "@babel/highlight@^7.16.7": version "7.16.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== @@ -6439,7 +6432,7 @@ semver "^7.5.3" zod "^3.22.4" -"@backstage/cli@^0.25.0", "@backstage/cli@^0.25.1": +"@backstage/cli@^0.25.0": version "0.25.2" resolved "https://registry.yarnpkg.com/@backstage/cli/-/cli-0.25.2.tgz#53f27c99c988f17edffb9e77b1864a53bccb3334" integrity sha512-PljPYaxljPtgrs+wFUSw30UXNq7/lTsMPqC4SgCzPXNCA1XDKGK0mnNkJJJD2r4bYwBXZ9mRdcs+zCf7MBrOmg== @@ -8894,21 +8887,6 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== -"@eslint/eslintrc@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" - integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== - dependencies: - ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" - import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - strip-json-comments "^3.1.1" - "@eslint/eslintrc@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" @@ -9345,15 +9323,6 @@ dependencies: client-only "^0.0.1" -"@humanwhocodes/config-array@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" - integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== - dependencies: - "@humanwhocodes/object-schema" "^1.2.0" - debug "^4.1.1" - minimatch "^3.0.4" - "@humanwhocodes/config-array@^0.9.2": version "0.9.5" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" @@ -9363,7 +9332,7 @@ debug "^4.1.1" minimatch "^3.0.4" -"@humanwhocodes/object-schema@^1.2.0", "@humanwhocodes/object-schema@^1.2.1": +"@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== @@ -13563,14 +13532,6 @@ jest-matcher-utils "^27.0.0" pretty-format "^27.0.0" -"@types/jest@^26.0.7": - version "26.0.24" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" - integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== - dependencies: - jest-diff "^26.0.0" - pretty-format "^26.0.0" - "@types/jest@^29.5.11": version "29.5.12" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544" @@ -13859,20 +13820,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@*": - version "17.0.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" - integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== +"@types/react-dom@*", "@types/react-dom@^18": + version "18.2.19" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.19.tgz#b84b7c30c635a6c26c6a6dfbb599b2da9788be58" + integrity sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA== dependencies: "@types/react" "*" -"@types/react-dom@^16.9.8": - version "16.9.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz#674b8f116645fe5266b40b525777fc6bb8eb3bcd" - integrity sha512-FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A== - dependencies: - "@types/react" "^16" - "@types/react-is@^18.2.0": version "18.2.1" resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-18.2.1.tgz#61d01c2a6fc089a53520c0b66996d458fdc46863" @@ -13918,34 +13872,7 @@ dependencies: "@types/react" "*" -"@types/react@*": - version "17.0.43" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" - integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^16": - version "16.14.24" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.24.tgz#f2c5e9fa78f83f769884b83defcf7924b9eb5c82" - integrity sha512-e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^16.13.1 || ^17.0.0": - version "17.0.44" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7" - integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^16.13.1 || ^17.0.0 || ^18.0.0": +"@types/react@*", "@types/react@^16.13.1 || ^17.0.0", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0", "@types/react@^18": version "18.2.58" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.58.tgz#22082d12898d11806f4a1aefb5583116a047493d" integrity sha512-TaGvMNhxvG2Q0K0aYxiKfNDS5m5ZsoIBBbtfUorxdH4NGSXIlYvZxLJI+9Dd3KjeB3780bciLyAb7ylO8pLhPw== @@ -14233,20 +14160,6 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^4.22.0", "@typescript-eslint/eslint-plugin@^4.4.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" - integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== - dependencies: - "@typescript-eslint/experimental-utils" "4.33.0" - "@typescript-eslint/scope-manager" "4.33.0" - debug "^4.3.1" - functional-red-black-tree "^1.0.1" - ignore "^5.1.8" - regexpp "^3.1.0" - semver "^7.3.5" - tsutils "^3.21.0" - "@typescript-eslint/eslint-plugin@^6.12.0": version "6.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" @@ -14264,28 +14177,6 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/experimental-utils@4.33.0", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" - integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== - dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/parser@^4.22.0", "@typescript-eslint/parser@^4.4.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" - integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== - dependencies: - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - debug "^4.3.1" - "@typescript-eslint/parser@^6.7.2": version "6.10.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a" @@ -14297,14 +14188,6 @@ "@typescript-eslint/visitor-keys" "6.10.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" - integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - "@typescript-eslint/scope-manager@5.21.0": version "5.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.21.0.tgz#a4b7ed1618f09f95e3d17d1c0ff7a341dac7862e" @@ -14339,11 +14222,6 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" - integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== - "@typescript-eslint/types@5.21.0": version "5.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.21.0.tgz#8cdb9253c0dfce3f2ab655b9d36c03f72e684017" @@ -14359,19 +14237,6 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== -"@typescript-eslint/typescript-estree@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" - integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@5.21.0": version "5.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.21.0.tgz#9f0c233e28be2540eaed3df050f0d54fb5aa52de" @@ -14437,14 +14302,6 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" - integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== - dependencies: - "@typescript-eslint/types" "4.33.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@5.21.0": version "5.21.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.21.0.tgz#453fb3662409abaf2f8b1f65d515699c888dd8ae" @@ -14784,7 +14641,7 @@ acorn-walk@^8.0.2, acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.1.1, acorn@^7.4.0: +acorn@^7.1.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -14884,7 +14741,7 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.0.1, ajv@^8.10.0, ajv@^8.4.0, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.10.0, ajv@^8.4.0, ajv@^8.8.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== @@ -15934,7 +15791,7 @@ buffer-equal-constant-time@1.0.1: resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= -buffer-from@1.x, buffer-from@^1.0.0: +buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== @@ -17802,7 +17659,7 @@ debug@2.6.9, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -18081,11 +17938,6 @@ detect-port-alt@^1.1.6: address "^1.0.1" debug "^2.6.0" -diff-sequences@^26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" - integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== - diff-sequences@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" @@ -18520,7 +18372,7 @@ enhanced-resolve@^5.13.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.0, enquirer@^2.3.5, enquirer@^2.3.6, enquirer@~2.3.6: +enquirer@^2.3.0, enquirer@^2.3.6, enquirer@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -18926,7 +18778,7 @@ eslint-plugin-deprecation@^2.0.0: tslib "^2.3.1" tsutils "^3.21.0" -eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.25.4: +eslint-plugin-import@^2.25.4: version "2.25.4" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== @@ -18945,13 +18797,6 @@ eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.25.4: resolve "^1.20.0" tsconfig-paths "^3.12.0" -eslint-plugin-jest@^24.3.5, eslint-plugin-jest@^24.3.6: - version "24.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz#206ac0833841e59e375170b15f8d0955219c4889" - integrity sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA== - dependencies: - "@typescript-eslint/experimental-utils" "^4.0.1" - eslint-plugin-jest@^27.0.0: version "27.0.4" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.0.4.tgz#ab9c7b3f48bfade4762c24c415a5d9bbc0174a61" @@ -18959,7 +18804,7 @@ eslint-plugin-jest@^27.0.0: dependencies: "@typescript-eslint/utils" "^5.10.0" -eslint-plugin-jsx-a11y@^6.4.1, eslint-plugin-jsx-a11y@^6.5.1: +eslint-plugin-jsx-a11y@^6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8" integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g== @@ -18986,12 +18831,12 @@ eslint-plugin-notice@^0.9.10: lodash "^4.17.15" metric-lcs "^0.1.2" -eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.3.0: +eslint-plugin-react-hooks@^4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4" integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ== -eslint-plugin-react@^7.20.5, eslint-plugin-react@^7.23.2, eslint-plugin-react@^7.28.0: +eslint-plugin-react@^7.28.0: version "7.29.4" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2" integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ== @@ -19039,13 +18884,6 @@ eslint-scope@^7.1.1: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - eslint-utils@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" @@ -19053,11 +18891,6 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - eslint-visitor-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" @@ -19084,52 +18917,6 @@ eslint-webpack-plugin@^4.0.0: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^7.24.0, eslint@^7.6.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" - integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.3" - "@humanwhocodes/config-array" "^0.5.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - eslint@^8.6.0: version "8.12.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e" @@ -19176,15 +18963,6 @@ esm@^3.2.25: resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== - dependencies: - acorn "^7.4.0" - acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" - espree@^9.3.1: version "9.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" @@ -21462,17 +21240,12 @@ ignore-walk@^6.0.0: dependencies: minimatch "^9.0.0" -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - ignore@^5.0.4, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0: +ignore@^5.1.4, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -21853,7 +21626,7 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-ci@2.0.0, is-ci@^2.0.0: +is-ci@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== @@ -22509,16 +22282,6 @@ jest-css-modules@^2.1.0: dependencies: identity-obj-proxy "3.0.0" -jest-diff@^26.0.0: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" - integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== - dependencies: - chalk "^4.0.0" - diff-sequences "^26.6.2" - jest-get-type "^26.3.0" - pretty-format "^26.6.2" - jest-diff@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" @@ -22644,11 +22407,6 @@ jest-fetch-mock@^3.0.3: cross-fetch "^3.0.4" promise-polyfill "^8.1.3" -jest-get-type@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" - integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== - jest-get-type@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" @@ -22844,6 +22602,15 @@ jest-mock@^27.5.1: "@jest/types" "^27.5.1" "@types/node" "*" +jest-mock@^29.0.0, jest-mock@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347" + integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-util "^29.7.0" + jest-mock@^29.2.1: version "29.2.1" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.2.1.tgz#a0d361cffcb28184fa9c5443adbf591fa5759775" @@ -22853,15 +22620,6 @@ jest-mock@^29.2.1: "@types/node" "*" jest-util "^29.2.1" -jest-mock@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347" - integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-util "^29.7.0" - jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" @@ -23175,18 +22933,6 @@ jest-snapshot@^29.7.0: pretty-format "^29.7.0" semver "^7.5.3" -jest-util@^26.1.0: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" - integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== - dependencies: - "@jest/types" "^26.6.2" - "@types/node" "*" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - micromatch "^4.0.2" - jest-util@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" @@ -23199,24 +22945,24 @@ jest-util@^27.5.1: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-util@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747" - integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g== +jest-util@^29.0.0, jest-util@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc" + integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA== dependencies: - "@jest/types" "^29.2.1" + "@jest/types" "^29.6.3" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-util@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc" - integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA== +jest-util@^29.2.1: + version "29.2.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747" + integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g== dependencies: - "@jest/types" "^29.6.3" + "@jest/types" "^29.2.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" @@ -23613,11 +23359,6 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@2.x, json5@^2.1.2, json5@^2.1.3, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - json5@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" @@ -23625,6 +23366,11 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.1.2, json5@^2.1.3, json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" @@ -24443,7 +24189,7 @@ lodash.isstring@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= -lodash.memoize@^4.1.2: +lodash.memoize@4.x, lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= @@ -24473,11 +24219,6 @@ lodash.topath@^4.5.2: resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" integrity sha512-1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg== -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -24488,7 +24229,7 @@ lodash.zipobject@^4.1.3: resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8" integrity sha512-A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ== -lodash@4.17.21, lodash@4.x, lodash@^4.15.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.15, lodash@~4.17.21, lodash@~4.17.4: +lodash@4.17.21, lodash@^4.15.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.15, lodash@~4.17.21, lodash@~4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -25615,11 +25356,6 @@ mkdirp-infer-owner@^2.0.0: infer-owner "^1.0.4" mkdirp "^1.0.3" -mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -25627,6 +25363,11 @@ mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@^0.5.6: dependencies: minimist "^1.2.6" +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mnemonist@0.38.3: version "0.38.3" resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.38.3.tgz#35ec79c1c1f4357cfda2fe264659c2775ccd7d9d" @@ -27858,7 +27599,7 @@ pretty-format@29.4.3: ansi-styles "^5.0.0" react-is "^18.0.0" -pretty-format@^26.0.0, pretty-format@^26.6.2: +pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== @@ -27925,11 +27666,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -progress@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - prom-client@^15.0.0: version "15.1.0" resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.0.tgz#816a4a2128da169d0471093baeccc6d2f17a4613" @@ -28417,14 +28153,13 @@ react-dev-utils@^12.0.0-next.60: strip-ansi "^6.0.1" text-table "^0.2.0" -react-dom@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@^18.0.2: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" + scheduler "^0.23.0" react-double-scrollbar@0.0.15: version "0.0.15" @@ -28781,13 +28516,12 @@ react-window@^1.8.6: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== +react@^18.0.2: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" read-cmd-shim@3.0.0: version "3.0.0" @@ -29132,7 +28866,7 @@ regexp.prototype.flags@^1.5.2: es-errors "^1.3.0" set-function-name "^2.0.1" -regexpp@^3.1.0, regexpp@^3.2.0: +regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -29581,9 +29315,9 @@ rollup-pluginutils@^2.8.2: estree-walker "^0.6.1" rollup@^2.60.2: - version "2.70.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e" - integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA== + version "2.79.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" @@ -29737,13 +29471,12 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0: version "2.7.0" @@ -29828,18 +29561,18 @@ semver@7.3.8: dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@~7.5.4: +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@~7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - send@0.17.2: version "0.17.2" resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" @@ -31063,17 +30796,6 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^6.0.9: - version "6.8.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" - integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== - dependencies: - ajv "^8.0.1" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - tapable@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -31544,21 +31266,19 @@ ts-is-present@^1.1.1: resolved "https://registry.yarnpkg.com/ts-is-present/-/ts-is-present-1.2.2.tgz#ba59b4a9d2bc22b99d1ba7f4af3d5eb320408d95" integrity sha512-cA5MPLWGWYXvnlJb4TamUUx858HVHBsxxdy8l7jxODOLDyGYnQOllob2A2jyDghGa5iJHs2gzFNHvwGJ0ZfR8g== -ts-jest@^26.1.0: - version "26.5.6" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35" - integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA== +ts-jest@^29.0.0: + version "29.1.2" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09" + integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g== dependencies: bs-logger "0.x" - buffer-from "1.x" fast-json-stable-stringify "2.x" - jest-util "^26.1.0" - json5 "2.x" - lodash "4.x" + jest-util "^29.0.0" + json5 "^2.2.3" + lodash.memoize "4.x" make-error "1.x" - mkdirp "1.x" - semver "7.x" - yargs-parser "20.x" + semver "^7.5.3" + yargs-parser "^21.0.1" ts-node@^10.0.0: version "10.9.2" @@ -31879,21 +31599,16 @@ typescript@5.3.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^4.2.4: - version "4.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" - integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== - -typescript@~4.7.0: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== - typescript@~5.1.0: version "5.1.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== +typescript@~5.2.0: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -33159,12 +32874,7 @@ yargs-parser@20.2.4: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== -yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@21.1.1, yargs-parser@^21.1.1: +yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== @@ -33177,6 +32887,11 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + yargs-parser@^21.0.0: version "21.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"