flan/advanced-camera-card
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1462 from felipecrs/date-fns-v3

Browse Source 
Update date-fns and date-fns-tz to v3
This commit is contained in:
Dermot Duffy
2024-06-05 20:17:33 -07:00
committed by GitHub
parent c789e76ffb 1a36ce0894
commit c4072064ac
28 changed files with 89 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+3 -3
View File
@@ -25,8 +25,8 @@
"@types/bluebird": "^3.5.36",
"component-emitter": "^1.3.0",
"crypto": "^1.0.1",
"date-fns": "^2.29.2",
"date-fns-tz": "^1.3.7",
"date-fns": "^3.6.0",
"date-fns-tz": "^3.1.3",
"embla-carousel": "8.0.0-rc14",
"embla-carousel-wheel-gestures": "8.0.0-rc04",
"home-assistant-js-websocket": "^8.0.0",
@@ -58,6 +58,7 @@
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-typescript": "^11.1.6",
"@types/lodash-es": "^4.17.5",
"@types/masonry-layout": "^4.2.5",
"@typescript-eslint/eslint-plugin": "^5.36.2",
@@ -77,7 +78,6 @@
"rollup-plugin-serve": "^2.0.1",
"rollup-plugin-styles": "^4.0.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.33.0",
"rollup-plugin-visualizer": "^5.8.2",
"sass": "^1.54.9",
"ts-prune": "^0.10.3",
rollup.config.js
+5 -5
View File
@@ -1,4 +1,4 @@
import typescript from 'rollup-plugin-typescript2';
import typescript from '@rollup/plugin-typescript';
import commonjs from '@rollup/plugin-commonjs';
import nodeResolve from '@rollup/plugin-node-resolve';
import { terser } from 'rollup-plugin-terser';
@@ -48,7 +48,9 @@ const plugins = [
include: 'node_modules/**',
sourceMap: false,
}),
typescript(),
typescript({
sourceMap: dev,
}),
json({ exclude: 'package.json' }),
replace({
preventAssignment: true,
@@ -89,9 +91,7 @@ const config = {
return '[name]-[hash].js';
},
format: 'es',
...(dev && {
sourcemap: true,
}),
sourcemap: dev,
},
plugins: plugins,
// These files use this at the toplevel, which causes rollup warning
src/camera-manager/browse-media/media.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import format from 'date-fns/format';
import { format } from 'date-fns';
import isEqual from 'lodash-es/isEqual';
import { formatDateAndTime } from '../../utils/basic';
import { RichBrowseMedia } from '../../utils/ha/browse-media/types';
src/camera-manager/frigate/engine-frigate.ts
+1 -5
View File
@@ -1,9 +1,5 @@
import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
import add from 'date-fns/add';
import endOfHour from 'date-fns/endOfHour';
import format from 'date-fns/format';
import fromUnixTime from 'date-fns/fromUnixTime';
import startOfHour from 'date-fns/startOfHour';
import { add, endOfHour, format, fromUnixTime, startOfHour } from 'date-fns';
import isEqual from 'lodash-es/isEqual';
import orderBy from 'lodash-es/orderBy';
import throttle from 'lodash-es/throttle';
src/camera-manager/frigate/media.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import fromUnixTime from 'date-fns/fromUnixTime';
import { fromUnixTime } from 'date-fns';
import isEqual from 'lodash-es/isEqual';
import { CameraConfig } from '../../config/types';
import {
src/camera-manager/frigate/util.ts
+2 -2
View File
@@ -1,4 +1,4 @@
import utcToZonedTime from 'date-fns-tz/utcToZonedTime';
import { toZonedTime } from 'date-fns-tz';
import { CameraConfig } from '../../config/types';
import { ClipsOrSnapshots } from '../../types';
import { formatDateAndTime, prettifyTitle } from '../../utils/basic';
@@ -18,7 +18,7 @@ export const getEventTitle = (event: FrigateEvent): string => {
const score = event.top_score !== null ? ` ${Math.round(event.top_score * 100)}%` : '';
return `${formatDateAndTime(
utcToZonedTime(event.start_time * 1000, localTimezone),
toZonedTime(event.start_time * 1000, localTimezone),
)} [${durationSeconds}s, ${prettifyTitle(event.label)}${score}]`;
};
src/camera-manager/manager.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import cloneDeep from 'lodash-es/cloneDeep';
import sum from 'lodash-es/sum';
import PQueue from 'p-queue';
src/camera-manager/motioneye/engine-motioneye.ts
+1 -4
View File
@@ -1,8 +1,5 @@
import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
import add from 'date-fns/add';
import endOfDay from 'date-fns/endOfDay';
import parse from 'date-fns/parse';
import startOfDay from 'date-fns/startOfDay';
import { add, endOfDay, parse, startOfDay } from 'date-fns';
import orderBy from 'lodash-es/orderBy';
import { CameraConfig } from '../../config/types';
import { allPromises, formatDate, isValidDate } from '../../utils/basic';
src/camera-manager/utils/range-to-cache-friendly.ts
+1 -5
View File
@@ -1,8 +1,4 @@
import endOfDay from 'date-fns/endOfDay';
import endOfHour from 'date-fns/endOfHour';
import endOfMinute from 'date-fns/endOfMinute';
import startOfDay from 'date-fns/startOfDay';
import startOfHour from 'date-fns/startOfHour';
import { endOfDay, endOfHour, endOfMinute, startOfDay, startOfHour } from 'date-fns';
import { DateRange } from '../range';
import { capEndDate } from './cap-end-date';
src/components-lib/live/live-controller.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import sub from 'date-fns/sub';
import { sub } from 'date-fns';
import { LitElement, ReactiveController } from 'lit';
import { ViewContext } from 'view';
import { CameraManager } from '../../camera-manager/manager.js';
src/components-lib/media-filter-controller.ts
+12 -10
View File
@@ -1,13 +1,15 @@
import endOfDay from 'date-fns/endOfDay';
import endOfMonth from 'date-fns/endOfMonth';
import endOfYesterday from 'date-fns/endOfYesterday';
import endOfToday from 'date-fns/esm/endOfToday';
import startOfToday from 'date-fns/esm/startOfToday';
import format from 'date-fns/format';
import parse from 'date-fns/parse';
import startOfDay from 'date-fns/startOfDay';
import startOfYesterday from 'date-fns/startOfYesterday';
import sub from 'date-fns/sub';
import {
endOfDay,
endOfMonth,
endOfYesterday,
endOfToday,
startOfToday,
format,
parse,
startOfDay,
startOfYesterday,
sub,
} from 'date-fns';
import { LitElement } from 'lit';
import isEqual from 'lodash-es/isEqual';
import orderBy from 'lodash-es/orderBy';
src/components-lib/timeline-source.ts
+1 -2
View File
@@ -1,5 +1,4 @@
import add from 'date-fns/add';
import sub from 'date-fns/sub';
import { add, sub } from 'date-fns';
import { DataSet } from 'vis-data';
import { IdType, TimelineItem, TimelineWindow } from 'vis-timeline/esnext';
import { CameraManager } from '../camera-manager/manager';
src/components/thumbnail.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import format from 'date-fns/format';
import { format } from 'date-fns';
import {
CSSResult,
html,
src/components/timeline-core.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import add from 'date-fns/add';
import differenceInSeconds from 'date-fns/differenceInSeconds';
import sub from 'date-fns/sub';
import { add, differenceInSeconds, sub } from 'date-fns';
import {
CSSResultGroup,
html,
src/utils/basic.ts
+6 -4
View File
@@ -1,7 +1,9 @@
import differenceInHours from 'date-fns/differenceInHours';
import differenceInMinutes from 'date-fns/differenceInMinutes';
import differenceInSeconds from 'date-fns/differenceInSeconds';
import format from 'date-fns/format';
import {
differenceInHours,
differenceInMinutes,
differenceInSeconds,
format,
} from 'date-fns';
import { StyleInfo } from 'lit/directives/style-map';
import { round } from 'lodash-es';
import isEqualWith from 'lodash-es/isEqualWith';
src/utils/ha/browse-media/browse-media-manager.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
import add from 'date-fns/add';
import { add } from 'date-fns';
import { homeAssistantWSRequest } from '..';
import { MemoryRequestCache } from '../../../camera-manager/cache';
import { allPromises } from '../../basic';
src/utils/screenshot.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import format from 'date-fns/format';
import { format } from 'date-fns';
import { View } from '../view/view';
export const screenshotMedia = (video: HTMLVideoElement): string | null => {
tests/camera-manager/cache.test.ts
+1 -2
View File
@@ -1,5 +1,4 @@
import add from 'date-fns/add';
import sub from 'date-fns/sub';
import { add, sub } from 'date-fns';
import sortBy from 'lodash-es/sortBy';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {
tests/camera-manager/frigate/util.test.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { mock } from 'vitest-mock-extended';
import {
tests/camera-manager/manager.test.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
import add from 'date-fns/add';
import { add } from 'date-fns';
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { mock } from 'vitest-mock-extended';
import { Camera } from '../../src/camera-manager/camera';
tests/camera-manager/range.test.ts
+1 -2
View File
@@ -1,5 +1,4 @@
import add from 'date-fns/add';
import sub from 'date-fns/sub';
import { add, sub } from 'date-fns';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {
compressRanges,
tests/card-controller/auto-update-manager.test.ts
+3 -3
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { AutoUpdateManager } from '../../src/card-controller/auto-update-manager';
import { createCardAPI, createConfig } from '../test-utils';
@@ -31,7 +31,7 @@ describe('AutoUpdateManager', () => {
manager.startDefaultViewTimer();
expect(api.getViewManager().setViewDefault).not.toBeCalled();
vi.setSystemTime(add(start, { seconds: 10 }));
vi.runOnlyPendingTimers();
@@ -64,7 +64,7 @@ describe('AutoUpdateManager', () => {
manager.startDefaultViewTimer();
expect(api.getViewManager().setViewDefault).not.toBeCalled();
vi.setSystemTime(add(start, { seconds: 10 }));
vi.runOnlyPendingTimers();
tests/card-controller/interaction-manager.test.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { InteractionManager } from '../../src/card-controller/interaction-manager';
import { createCardAPI, createConfig } from '../test-utils';
tests/card-controller/triggers-manager.test.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { CardController } from '../../src/card-controller/controller';
import { TriggersManager } from '../../src/card-controller/triggers-manager';
tests/components-lib/media-filter-controller.test.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import endOfDay from 'date-fns/endOfDay';
import startOfDay from 'date-fns/startOfDay';
import sub from 'date-fns/sub';
import { endOfDay, startOfDay, sub } from 'date-fns';
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { Capabilities } from '../../src/camera-manager/capabilities';
import { CameraManagerStore } from '../../src/camera-manager/store';
tests/utils/embla/plugins/auto-media-actions/auto-media-actions.test.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import add from 'date-fns/add';
import { add } from 'date-fns';
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { mock } from 'vitest-mock-extended';
import {
tests/utils/media-to-view.test.ts
+1 -2
View File
@@ -1,5 +1,4 @@
import add from 'date-fns/add';
import sub from 'date-fns/sub';
import { add, sub } from 'date-fns';
import { beforeEach, describe, expect, it, Mock, MockedFunction, vi } from 'vitest';
import { QueryType } from '../../src/camera-manager/types';
import {
yarn.lock
+37 -71
View File
@@ -325,15 +325,6 @@ __metadata:
languageName: node
linkType: hard
"@babel/runtime@npm:^7.21.0":
version: 7.24.0
resolution: "@babel/runtime@npm:7.24.0"
dependencies:
regenerator-runtime: "npm:^0.14.0"
checksum: 10c0/3495eed727bf4a4f84c35bb51ab53317ae38f4bbc3b1d0a8303751f9dfa0ce6f5fb2afced72b76c3dd0d8bb2ccb84787559a4dee9886291a36b26f02f0f759b4
languageName: node
linkType: hard
"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/template@npm:7.24.0"
@@ -1005,6 +996,25 @@ __metadata:
languageName: node
linkType: hard
"@rollup/plugin-typescript@npm:^11.1.6":
version: 11.1.6
resolution: "@rollup/plugin-typescript@npm:11.1.6"
dependencies:
"@rollup/pluginutils": "npm:^5.1.0"
resolve: "npm:^1.22.1"
peerDependencies:
rollup: ^2.14.0||^3.0.0||^4.0.0
tslib: "*"
typescript: ">=3.7.0"
peerDependenciesMeta:
rollup:
optional: true
tslib:
optional: true
checksum: 10c0/5347cd73ac28d4cf2401a3e689864a1a0df8f3ae029abd9c38525cbc84bcfa16c3a32a0ac5698dac65ec531ba7cf8332e14f5fc7f8fa501193da23320a134c5c
languageName: node
linkType: hard
"@rollup/pluginutils@npm:^3.0.8, @rollup/pluginutils@npm:^3.1.0":
version: 3.1.0
resolution: "@rollup/pluginutils@npm:3.1.0"
@@ -1028,7 +1038,7 @@ __metadata:
languageName: node
linkType: hard
"@rollup/pluginutils@npm:^5.0.1":
"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.1.0":
version: 5.1.0
resolution: "@rollup/pluginutils@npm:5.1.0"
dependencies:
@@ -2619,21 +2629,19 @@ __metadata:
languageName: node
linkType: hard
"date-fns-tz@npm:^1.3.7":
version: 1.3.8
resolution: "date-fns-tz@npm:1.3.8"
"date-fns-tz@npm:^3.1.3":
version: 3.1.3
resolution: "date-fns-tz@npm:3.1.3"
peerDependencies:
date-fns: ">=2.0.0"
checksum: 10c0/4cb16aeae3ea4a72ac4ae9f7db2011e38797aff122a78be16217a0492dde3938e1e62d21dbf1469a36fb4426824196233cedc70807f0a3033bca132bf76d563e
date-fns: ^3.0.0
checksum: 10c0/dcedf178a96632a798966cf5a881441aefc451cc308336a98919e49c2df8eff7a302d19b9d3903c50838dd0912533f862f0bfb9429e8c28c1c3ce5da19ccb64e
languageName: node
linkType: hard
"date-fns@npm:^2.29.2":
version: 2.30.0
resolution: "date-fns@npm:2.30.0"
dependencies:
"@babel/runtime": "npm:^7.21.0"
checksum: 10c0/e4b521fbf22bc8c3db332bbfb7b094fd3e7627de0259a9d17c7551e2d2702608a7307a449206065916538e384f37b181565447ce2637ae09828427aed9cb5581
"date-fns@npm:^3.6.0":
version: 3.6.0
resolution: "date-fns@npm:3.6.0"
checksum: 10c0/0b5fb981590ef2f8e5a3ba6cd6d77faece0ea7f7158948f2eaae7bbb7c80a8f63ae30b01236c2923cf89bb3719c33aeb150c715ea4fe4e86e37dcf06bed42fb6
languageName: node
linkType: hard
@@ -3752,18 +3760,7 @@ __metadata:
languageName: node
linkType: hard
"find-cache-dir@npm:^3.3.2":
version: 3.3.2
resolution: "find-cache-dir@npm:3.3.2"
dependencies:
commondir: "npm:^1.0.1"
make-dir: "npm:^3.0.2"
pkg-dir: "npm:^4.1.0"
checksum: 10c0/92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
languageName: node
linkType: hard
"find-up@npm:^4.0.0, find-up@npm:^4.1.0":
"find-up@npm:^4.1.0":
version: 4.1.0
resolution: "find-up@npm:4.1.0"
dependencies:
@@ -3867,6 +3864,7 @@ __metadata:
"@rollup/plugin-json": "npm:^4.1.0"
"@rollup/plugin-node-resolve": "npm:^13.3.0"
"@rollup/plugin-replace": "npm:^4.0.0"
"@rollup/plugin-typescript": "npm:^11.1.6"
"@types/bluebird": "npm:^3.5.36"
"@types/lodash-es": "npm:^4.17.5"
"@types/masonry-layout": "npm:^4.2.5"
@@ -3875,8 +3873,8 @@ __metadata:
"@vitest/coverage-istanbul": "npm:^1.5.0"
component-emitter: "npm:^1.3.0"
crypto: "npm:^1.0.1"
date-fns: "npm:^2.29.2"
date-fns-tz: "npm:^1.3.7"
date-fns: "npm:^3.6.0"
date-fns-tz: "npm:^3.1.3"
docsify-cli: "npm:^4.4.4"
embla-carousel: "npm:8.0.0-rc14"
embla-carousel-wheel-gestures: "npm:8.0.0-rc04"
@@ -3902,7 +3900,6 @@ __metadata:
rollup-plugin-serve: "npm:^2.0.1"
rollup-plugin-styles: "npm:^4.0.0"
rollup-plugin-terser: "npm:^7.0.2"
rollup-plugin-typescript2: "npm:^0.33.0"
rollup-plugin-visualizer: "npm:^5.8.2"
sass: "npm:^1.54.9"
screenfull: "npm:^6.0.2"
@@ -5469,7 +5466,7 @@ __metadata:
languageName: node
linkType: hard
"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
"make-dir@npm:^3.0.0":
version: 3.1.0
resolution: "make-dir@npm:3.1.0"
dependencies:
@@ -6454,15 +6451,6 @@ __metadata:
languageName: node
linkType: hard
"pkg-dir@npm:^4.1.0":
version: 4.2.0
resolution: "pkg-dir@npm:4.2.0"
dependencies:
find-up: "npm:^4.0.0"
checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
languageName: node
linkType: hard
"pkg-types@npm:^1.0.3":
version: 1.0.3
resolution: "pkg-types@npm:1.0.3"
@@ -7076,13 +7064,6 @@ __metadata:
languageName: node
linkType: hard
"regenerator-runtime@npm:^0.14.0":
version: 0.14.1
resolution: "regenerator-runtime@npm:0.14.1"
checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
languageName: node
linkType: hard
"regexp.prototype.flags@npm:^1.5.2":
version: 1.5.2
resolution: "regexp.prototype.flags@npm:1.5.2"
@@ -7148,7 +7129,7 @@ __metadata:
languageName: node
linkType: hard
"resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.21.0, resolve@npm:^1.22.4":
"resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.21.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4":
version: 1.22.8
resolution: "resolve@npm:1.22.8"
dependencies:
@@ -7161,7 +7142,7 @@ __metadata:
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.21.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
"resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.21.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
version: 1.22.8
resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
dependencies:
@@ -7269,21 +7250,6 @@ __metadata:
languageName: node
linkType: hard
"rollup-plugin-typescript2@npm:^0.33.0":
version: 0.33.0
resolution: "rollup-plugin-typescript2@npm:0.33.0"
dependencies:
"@rollup/pluginutils": "npm:^4.1.2"
find-cache-dir: "npm:^3.3.2"
fs-extra: "npm:^10.0.0"
tslib: "npm:^2.4.0"
peerDependencies:
rollup: ">=1.26.3"
typescript: ">=2.4.0"
checksum: 10c0/20cf7b9557245f6c540e496052656bc0a6e24aebdc27ba83b471545fe3f5bd1c35b69459fdeadde2d59dfe45cb9f18c15d228e11e1a577491bb5d01e357b81fa
languageName: node
linkType: hard
"rollup-plugin-visualizer@npm:^5.8.2":
version: 5.12.0
resolution: "rollup-plugin-visualizer@npm:5.12.0"
@@ -8182,7 +8148,7 @@ __metadata:
languageName: node
linkType: hard
"tslib@npm:^2.0.1, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0":
"tslib@npm:^2.0.1, tslib@npm:^2.1.0, tslib@npm:^2.3.1":
version: 2.6.2
resolution: "tslib@npm:2.6.2"
checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb