From 42fe0fdf707e4b4b7e14cc3e99dc6425ab89843f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 12:05:38 +0000 Subject: [PATCH] Update dependency date-fns to v3 (#81625) * Update dependency date-fns to v3 * update imports --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ashley Harrison --- package.json | 2 +- packages/grafana-data/package.json | 2 +- .../grafana-data/src/datetime/durationutil.ts | 4 +--- packages/grafana-ui/package.json | 2 +- .../components/RefreshPicker/RefreshPicker.tsx | 2 +- yarn.lock | 18 ++++++++---------- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 6d93ef2078b..e5169bc4912 100644 --- a/package.json +++ b/package.json @@ -298,7 +298,7 @@ "d3-force": "3.0.0", "d3-scale-chromatic": "3.0.0", "dangerously-set-html-content": "1.0.9", - "date-fns": "2.30.0", + "date-fns": "3.3.1", "debounce-promise": "3.1.2", "diff": "^5.1.0", "emotion": "11.0.0", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index bb5f23dd78e..aacd8bc4b19 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -40,7 +40,7 @@ "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", - "date-fns": "2.30.0", + "date-fns": "3.3.1", "dompurify": "^2.4.3", "eventemitter3": "5.0.1", "fast_array_intersect": "1.1.0", diff --git a/packages/grafana-data/src/datetime/durationutil.ts b/packages/grafana-data/src/datetime/durationutil.ts index c490554a2bc..c8049a641bb 100644 --- a/packages/grafana-data/src/datetime/durationutil.ts +++ b/packages/grafana-data/src/datetime/durationutil.ts @@ -1,6 +1,4 @@ -import { Duration, Interval, isAfter } from 'date-fns'; -import add from 'date-fns/add'; -import intervalToDuration from 'date-fns/intervalToDuration'; +import { add, Duration, intervalToDuration, Interval, isAfter } from 'date-fns'; const durationMap: { [key in Required]: string[] } = { years: ['y', 'Y', 'years'], diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 256f4125c48..b37a30177cd 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -65,7 +65,7 @@ "calculate-size": "1.1.1", "classnames": "2.5.1", "d3": "7.8.5", - "date-fns": "2.30.0", + "date-fns": "3.3.1", "hoist-non-react-statics": "3.3.2", "i18next": "^22.0.0", "i18next-browser-languagedetector": "^7.0.2", diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx index 1ea9e8e2163..7420a8034e0 100644 --- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx +++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx @@ -1,4 +1,4 @@ -import formatDuration from 'date-fns/formatDuration'; +import { formatDuration } from 'date-fns'; import React, { PureComponent } from 'react'; import { SelectableValue, parseDuration } from '@grafana/data'; diff --git a/yarn.lock b/yarn.lock index 9cc0287bc34..57474c76384 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1670,7 +1670,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.23.9, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:7.23.9, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.23.9 resolution: "@babel/runtime@npm:7.23.9" dependencies: @@ -3249,7 +3249,7 @@ __metadata: "@types/testing-library__jest-dom": "npm:5.14.9" "@types/tinycolor2": "npm:1.4.6" d3-interpolate: "npm:3.0.1" - date-fns: "npm:2.30.0" + date-fns: "npm:3.3.1" dompurify: "npm:^2.4.3" esbuild: "npm:0.18.12" eventemitter3: "npm:5.0.1" @@ -3803,7 +3803,7 @@ __metadata: css-loader: "npm:6.10.0" csstype: "npm:3.1.3" d3: "npm:7.8.5" - date-fns: "npm:2.30.0" + date-fns: "npm:3.3.1" esbuild: "npm:0.18.12" expose-loader: "npm:4.1.0" hoist-non-react-statics: "npm:3.3.2" @@ -14038,12 +14038,10 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:2.30.0": - version: 2.30.0 - resolution: "date-fns@npm:2.30.0" - dependencies: - "@babel/runtime": "npm:^7.21.0" - checksum: 10/70b3e8ea7aaaaeaa2cd80bd889622a4bcb5d8028b4de9162cbcda359db06e16ff6e9309e54eead5341e71031818497f19aaf9839c87d1aba1e27bb4796e758a9 +"date-fns@npm:3.3.1": + version: 3.3.1 + resolution: "date-fns@npm:3.3.1" + checksum: 10/98231936765dfb6fc6897676319b500a06a39f051b2c3ecbdd541a07ce9b1344b770277b8bfb1049fb7a2f70bf365ac8e6f1e2bb452b10e1a8101d518ca7f95d languageName: node linkType: hard @@ -17549,7 +17547,7 @@ __metadata: d3-force: "npm:3.0.0" d3-scale-chromatic: "npm:3.0.0" dangerously-set-html-content: "npm:1.0.9" - date-fns: "npm:2.30.0" + date-fns: "npm:3.3.1" debounce-promise: "npm:3.1.2" diff: "npm:^5.1.0" emotion: "npm:11.0.0"