diff --git a/packages/integration/package.json b/packages/integration/package.json index 10fba2c6b3..1866ef18de 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -42,7 +42,7 @@ "@backstage/config-loader": "^0.6.7", "@backstage/test-utils": "^0.1.17", "@types/jest": "^26.0.7", - "@types/luxon": "^1.25.0", + "@types/luxon": "^2.0.4", "msw": "^0.29.0" }, "files": [ diff --git a/packages/integration/src/github/GithubCredentialsProvider.test.ts b/packages/integration/src/github/GithubCredentialsProvider.test.ts index 9450d96ab7..0f51db85be 100644 --- a/packages/integration/src/github/GithubCredentialsProvider.test.ts +++ b/packages/integration/src/github/GithubCredentialsProvider.test.ts @@ -76,7 +76,7 @@ describe('GithubCredentialsProvider tests', () => { octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({ data: { - expires_at: DateTime.local().plus({ hour: 1 }).toString(), + expires_at: DateTime.local().plus({ hours: 1 }).toString(), token: 'secret_token', }, } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']); @@ -120,7 +120,7 @@ describe('GithubCredentialsProvider tests', () => { octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({ data: { - expires_at: DateTime.local().plus({ hour: 1 }).toString(), + expires_at: DateTime.local().plus({ hours: 1 }).toString(), token: 'secret_token', }, } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']); @@ -151,7 +151,7 @@ describe('GithubCredentialsProvider tests', () => { octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({ data: { - expires_at: DateTime.local().plus({ hour: 1 }).toString(), + expires_at: DateTime.local().plus({ hours: 1 }).toString(), token: 'secret_token', }, } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']); @@ -272,7 +272,7 @@ describe('GithubCredentialsProvider tests', () => { octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({ data: { - expires_at: DateTime.local().plus({ hour: 1 }).toString(), + expires_at: DateTime.local().plus({ hours: 1 }).toString(), token: 'secret_token', }, } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']); diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json index 19a0bc0509..88bae10ef6 100644 --- a/plugins/sentry/package.json +++ b/plugins/sentry/package.json @@ -56,7 +56,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", "@types/jest": "^26.0.7", - "@types/luxon": "^1.27.0", + "@types/luxon": "^2.0.4", "@types/node": "^14.14.32", "@types/react": "*", "cross-fetch": "^3.0.6", diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json index 71354743c6..289b9f25dd 100644 --- a/plugins/splunk-on-call/package.json +++ b/plugins/splunk-on-call/package.json @@ -55,7 +55,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", "@types/jest": "^26.0.7", - "@types/luxon": "^1.25.0", + "@types/luxon": "^2.0.4", "@types/node": "^14.14.32", "cross-fetch": "^3.0.6", "msw": "^0.29.0", diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json index fc86ff572e..d3df9b6718 100644 --- a/plugins/xcmetrics/package.json +++ b/plugins/xcmetrics/package.json @@ -43,7 +43,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", "@types/jest": "^26.0.7", - "@types/luxon": "^1.27.0", + "@types/luxon": "^2.0.4", "@types/node": "^14.14.32", "cross-fetch": "^3.0.6", "msw": "^0.29.0" diff --git a/plugins/xcmetrics/src/components/BuildList/BuildList.tsx b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx index f9e8bfdd98..5a6e1bd322 100644 --- a/plugins/xcmetrics/src/components/BuildList/BuildList.tsx +++ b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx @@ -39,7 +39,7 @@ export const BuildList = () => { const tableRef = useRef(); const initialFilters = { - from: DateTime.now().minus({ year: 1 }).toISODate(), + from: DateTime.now().minus({ years: 1 }).toISODate(), to: DateTime.now().toISODate(), }; diff --git a/yarn.lock b/yarn.lock index f9a64362dd..2f6e3a8b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7090,10 +7090,10 @@ resolved "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.3.tgz#ec985618fd2712c010f8edab4f1ae7784ad7c583" integrity sha512-09sXZZVsB3Ib41U0fC+O1O+4UOZT1bl/e+/QubPxpqDWHNEchvx/DEb1KJMOwq6K3MTNzZFoNSzVdR++o1DVnw== -"@types/luxon@^1.25.0", "@types/luxon@^1.27.0": - version "1.27.0" - resolved "https://registry.npmjs.org/@types/luxon/-/luxon-1.27.0.tgz#1e3b5a7f8ca6944349c43498b4442b742c71ab0b" - integrity sha512-rr2lNXsErnA/ARtgFn46NtQjUa66cuwZYeo/2K7oqqxhJErhXgHBPyNKCo+pfOC3L7HFwtao8ebViiU9h4iAxA== +"@types/luxon@^2.0.4": + version "2.0.4" + resolved "https://registry.npmjs.org/@types/luxon/-/luxon-2.0.4.tgz#f7b5a86ccd843c0ccaddfaedd9ee1081bc1cde3b" + integrity sha512-l3xuhmyF2kBldy15SeY6d6HbK2BacEcSK1qTF1ISPtPHr29JH0C1fndz9ExXLKpGl0J6pZi+dGp1i5xesMt60Q== "@types/markdown-to-jsx@^6.11.3": version "6.11.3"