From 2982d3856f80b794e947eaa309eda5238b8889c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 04:16:30 +0000 Subject: [PATCH 1/2] build(deps-dev): bump @types/luxon from 1.27.0 to 2.0.4 Bumps [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon) from 1.27.0 to 2.0.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon) --- updated-dependencies: - dependency-name: "@types/luxon" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/integration/package.json | 2 +- plugins/sentry/package.json | 2 +- plugins/splunk-on-call/package.json | 2 +- plugins/xcmetrics/package.json | 2 +- yarn.lock | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) 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/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/yarn.lock b/yarn.lock index 7657498ff7..0d8afa59fe 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" @@ -11342,9 +11342,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2: integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== core-js@^3.6.0, core-js@^3.8.3: - version "3.18.0" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz#9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49" - integrity sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w== + version "3.18.1" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f" + integrity sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 2f09cdb97f23b8b068112ab014d0a1f35014fdb9 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 27 Sep 2021 10:10:31 +0200 Subject: [PATCH 2/2] use preferred luxon duration units Signed-off-by: Patrik Oldsberg --- .../src/github/GithubCredentialsProvider.test.ts | 8 ++++---- plugins/xcmetrics/src/components/BuildList/BuildList.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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/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(), };