From 68c2cf142f9ad2d8f1bb0c2355b4156dc53ba8f4 Mon Sep 17 00:00:00 2001 From: Tony Vu Date: Tue, 6 Feb 2024 09:51:28 -0600 Subject: [PATCH 1/7] web: convert user contact method .js dependencies to .jsx (#3652) * convert js files to jsx * remove out of scope field --------- Co-authored-by: Nathaniel Caza --- web/src/app/dialogs/{FormDialog.js => FormDialog.jsx} | 0 .../components/{DialogContentError.js => DialogContentError.jsx} | 0 .../components/{DialogTitleWrapper.js => DialogTitleWrapper.jsx} | 0 web/src/app/forms/{Form.js => Form.jsx} | 0 web/src/app/forms/{FormContainer.js => FormContainer.jsx} | 0 web/src/app/forms/{FormField.js => FormField.jsx} | 0 web/src/app/main/{ErrorBoundary.js => ErrorBoundary.jsx} | 0 web/src/app/util/{OtherActions.js => OtherActions.jsx} | 0 .../app/util/{OtherActionsDesktop.js => OtherActionsDesktop.jsx} | 0 .../app/util/{OtherActionsMobile.js => OtherActionsMobile.jsx} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename web/src/app/dialogs/{FormDialog.js => FormDialog.jsx} (100%) rename web/src/app/dialogs/components/{DialogContentError.js => DialogContentError.jsx} (100%) rename web/src/app/dialogs/components/{DialogTitleWrapper.js => DialogTitleWrapper.jsx} (100%) rename web/src/app/forms/{Form.js => Form.jsx} (100%) rename web/src/app/forms/{FormContainer.js => FormContainer.jsx} (100%) rename web/src/app/forms/{FormField.js => FormField.jsx} (100%) rename web/src/app/main/{ErrorBoundary.js => ErrorBoundary.jsx} (100%) rename web/src/app/util/{OtherActions.js => OtherActions.jsx} (100%) rename web/src/app/util/{OtherActionsDesktop.js => OtherActionsDesktop.jsx} (100%) rename web/src/app/util/{OtherActionsMobile.js => OtherActionsMobile.jsx} (100%) diff --git a/web/src/app/dialogs/FormDialog.js b/web/src/app/dialogs/FormDialog.jsx similarity index 100% rename from web/src/app/dialogs/FormDialog.js rename to web/src/app/dialogs/FormDialog.jsx diff --git a/web/src/app/dialogs/components/DialogContentError.js b/web/src/app/dialogs/components/DialogContentError.jsx similarity index 100% rename from web/src/app/dialogs/components/DialogContentError.js rename to web/src/app/dialogs/components/DialogContentError.jsx diff --git a/web/src/app/dialogs/components/DialogTitleWrapper.js b/web/src/app/dialogs/components/DialogTitleWrapper.jsx similarity index 100% rename from web/src/app/dialogs/components/DialogTitleWrapper.js rename to web/src/app/dialogs/components/DialogTitleWrapper.jsx diff --git a/web/src/app/forms/Form.js b/web/src/app/forms/Form.jsx similarity index 100% rename from web/src/app/forms/Form.js rename to web/src/app/forms/Form.jsx diff --git a/web/src/app/forms/FormContainer.js b/web/src/app/forms/FormContainer.jsx similarity index 100% rename from web/src/app/forms/FormContainer.js rename to web/src/app/forms/FormContainer.jsx diff --git a/web/src/app/forms/FormField.js b/web/src/app/forms/FormField.jsx similarity index 100% rename from web/src/app/forms/FormField.js rename to web/src/app/forms/FormField.jsx diff --git a/web/src/app/main/ErrorBoundary.js b/web/src/app/main/ErrorBoundary.jsx similarity index 100% rename from web/src/app/main/ErrorBoundary.js rename to web/src/app/main/ErrorBoundary.jsx diff --git a/web/src/app/util/OtherActions.js b/web/src/app/util/OtherActions.jsx similarity index 100% rename from web/src/app/util/OtherActions.js rename to web/src/app/util/OtherActions.jsx diff --git a/web/src/app/util/OtherActionsDesktop.js b/web/src/app/util/OtherActionsDesktop.jsx similarity index 100% rename from web/src/app/util/OtherActionsDesktop.js rename to web/src/app/util/OtherActionsDesktop.jsx diff --git a/web/src/app/util/OtherActionsMobile.js b/web/src/app/util/OtherActionsMobile.jsx similarity index 100% rename from web/src/app/util/OtherActionsMobile.js rename to web/src/app/util/OtherActionsMobile.jsx From 6a7dacce03d2f940bfbea5840afa8054e5203fc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:20:33 -0600 Subject: [PATCH 2/7] build(deps-dev): bump @mui/x-data-grid from 6.18.7 to 6.19.3 (#3650) Bumps [@mui/x-data-grid](https://github.com/mui/mui-x/tree/HEAD/packages/grid/x-data-grid) from 6.18.7 to 6.19.3. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/next/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v6.19.3/packages/grid/x-data-grid) --- updated-dependencies: - dependency-name: "@mui/x-data-grid" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d145f64848..e7a1845144 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@mui/material": "5.15.5", "@mui/styles": "5.15.5", "@mui/system": "5.15.6", - "@mui/x-data-grid": "6.18.7", + "@mui/x-data-grid": "6.19.3", "@playwright/test": "1.41.2", "@storybook/addon-essentials": "7.6.7", "@storybook/addon-interactions": "7.6.7", diff --git a/yarn.lock b/yarn.lock index 9febce735c..dd1163ccb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3355,9 +3355,9 @@ __metadata: languageName: node linkType: hard -"@mui/x-data-grid@npm:6.18.7": - version: 6.18.7 - resolution: "@mui/x-data-grid@npm:6.18.7" +"@mui/x-data-grid@npm:6.19.3": + version: 6.19.3 + resolution: "@mui/x-data-grid@npm:6.19.3" dependencies: "@babel/runtime": ^7.23.2 "@mui/utils": ^5.14.16 @@ -3369,7 +3369,7 @@ __metadata: "@mui/system": ^5.4.1 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - checksum: ac3e1e196a576ce3ebe5cb204dd8fc286604265107a3c3e0f6ec3ad333b7c115500017e2328c6c61dac3bd0620c3bc54ab8d7490a629e38cb93e71f91a5be60c + checksum: 3cf6a9b8957a9f7df24ac9f83a312b0c05c5a1556c86916b6c1f6c4a189f3cbb75db73ac35b28d11bf61f26fa7cd3875f612e2b3bb6498ecea4b57efdcbbc5f2 languageName: node linkType: hard @@ -18319,7 +18319,7 @@ __metadata: "@mui/material": 5.15.5 "@mui/styles": 5.15.5 "@mui/system": 5.15.6 - "@mui/x-data-grid": 6.18.7 + "@mui/x-data-grid": 6.19.3 "@playwright/test": 1.41.2 "@storybook/addon-essentials": 7.6.7 "@storybook/addon-interactions": 7.6.7 From 76407796e1625630b5809ca4824c24c3355263c5 Mon Sep 17 00:00:00 2001 From: Nathaniel Caza Date: Tue, 6 Feb 2024 15:34:20 -0600 Subject: [PATCH 3/7] rename components from .js to .jsx (#3657) --- .../escalation-policies/{PolicyStepForm.js => PolicyStepForm.jsx} | 0 .../{PolicyStepsCard.js => PolicyStepsCard.jsx} | 0 web/src/app/icons/components/{Icons.js => Icons.jsx} | 0 .../{ScheduleOverrideDialog.js => ScheduleOverrideDialog.jsx} | 0 .../{ScheduleOverrideList.js => ScheduleOverrideList.jsx} | 0 .../app/schedules/{ScheduleTZFilter.js => ScheduleTZFilter.jsx} | 0 .../{CalendarSubscribeButton.js => CalendarSubscribeButton.jsx} | 0 .../{CalendarSubscribeForm.js => CalendarSubscribeForm.jsx} | 0 .../{CalendarSuccessForm.js => CalendarSuccessForm.jsx} | 0 web/src/app/selection/{QuerySelect.js => QuerySelect.jsx} | 0 .../app/services/{ServiceLabelForm.js => ServiceLabelForm.jsx} | 0 .../util/{AppBarSearchContainer.js => AppBarSearchContainer.jsx} | 0 web/src/app/util/{FilterContainer.js => FilterContainer.jsx} | 0 web/src/app/util/{Markdown.js => Markdown.jsx} | 0 web/src/app/util/{PageActions.js => PageActions.jsx} | 0 web/src/app/util/{Search.js => Search.jsx} | 0 web/src/app/wizard/{WizardForm.js => WizardForm.jsx} | 0 web/src/app/wizard/{WizardRouter.js => WizardRouter.jsx} | 0 .../app/wizard/{WizardScheduleForm.js => WizardScheduleForm.jsx} | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename web/src/app/escalation-policies/{PolicyStepForm.js => PolicyStepForm.jsx} (100%) rename web/src/app/escalation-policies/{PolicyStepsCard.js => PolicyStepsCard.jsx} (100%) rename web/src/app/icons/components/{Icons.js => Icons.jsx} (100%) rename web/src/app/schedules/{ScheduleOverrideDialog.js => ScheduleOverrideDialog.jsx} (100%) rename web/src/app/schedules/{ScheduleOverrideList.js => ScheduleOverrideList.jsx} (100%) rename web/src/app/schedules/{ScheduleTZFilter.js => ScheduleTZFilter.jsx} (100%) rename web/src/app/schedules/calendar-subscribe/{CalendarSubscribeButton.js => CalendarSubscribeButton.jsx} (100%) rename web/src/app/schedules/calendar-subscribe/{CalendarSubscribeForm.js => CalendarSubscribeForm.jsx} (100%) rename web/src/app/schedules/calendar-subscribe/{CalendarSuccessForm.js => CalendarSuccessForm.jsx} (100%) rename web/src/app/selection/{QuerySelect.js => QuerySelect.jsx} (100%) rename web/src/app/services/{ServiceLabelForm.js => ServiceLabelForm.jsx} (100%) rename web/src/app/util/{AppBarSearchContainer.js => AppBarSearchContainer.jsx} (100%) rename web/src/app/util/{FilterContainer.js => FilterContainer.jsx} (100%) rename web/src/app/util/{Markdown.js => Markdown.jsx} (100%) rename web/src/app/util/{PageActions.js => PageActions.jsx} (100%) rename web/src/app/util/{Search.js => Search.jsx} (100%) rename web/src/app/wizard/{WizardForm.js => WizardForm.jsx} (100%) rename web/src/app/wizard/{WizardRouter.js => WizardRouter.jsx} (100%) rename web/src/app/wizard/{WizardScheduleForm.js => WizardScheduleForm.jsx} (100%) diff --git a/web/src/app/escalation-policies/PolicyStepForm.js b/web/src/app/escalation-policies/PolicyStepForm.jsx similarity index 100% rename from web/src/app/escalation-policies/PolicyStepForm.js rename to web/src/app/escalation-policies/PolicyStepForm.jsx diff --git a/web/src/app/escalation-policies/PolicyStepsCard.js b/web/src/app/escalation-policies/PolicyStepsCard.jsx similarity index 100% rename from web/src/app/escalation-policies/PolicyStepsCard.js rename to web/src/app/escalation-policies/PolicyStepsCard.jsx diff --git a/web/src/app/icons/components/Icons.js b/web/src/app/icons/components/Icons.jsx similarity index 100% rename from web/src/app/icons/components/Icons.js rename to web/src/app/icons/components/Icons.jsx diff --git a/web/src/app/schedules/ScheduleOverrideDialog.js b/web/src/app/schedules/ScheduleOverrideDialog.jsx similarity index 100% rename from web/src/app/schedules/ScheduleOverrideDialog.js rename to web/src/app/schedules/ScheduleOverrideDialog.jsx diff --git a/web/src/app/schedules/ScheduleOverrideList.js b/web/src/app/schedules/ScheduleOverrideList.jsx similarity index 100% rename from web/src/app/schedules/ScheduleOverrideList.js rename to web/src/app/schedules/ScheduleOverrideList.jsx diff --git a/web/src/app/schedules/ScheduleTZFilter.js b/web/src/app/schedules/ScheduleTZFilter.jsx similarity index 100% rename from web/src/app/schedules/ScheduleTZFilter.js rename to web/src/app/schedules/ScheduleTZFilter.jsx diff --git a/web/src/app/schedules/calendar-subscribe/CalendarSubscribeButton.js b/web/src/app/schedules/calendar-subscribe/CalendarSubscribeButton.jsx similarity index 100% rename from web/src/app/schedules/calendar-subscribe/CalendarSubscribeButton.js rename to web/src/app/schedules/calendar-subscribe/CalendarSubscribeButton.jsx diff --git a/web/src/app/schedules/calendar-subscribe/CalendarSubscribeForm.js b/web/src/app/schedules/calendar-subscribe/CalendarSubscribeForm.jsx similarity index 100% rename from web/src/app/schedules/calendar-subscribe/CalendarSubscribeForm.js rename to web/src/app/schedules/calendar-subscribe/CalendarSubscribeForm.jsx diff --git a/web/src/app/schedules/calendar-subscribe/CalendarSuccessForm.js b/web/src/app/schedules/calendar-subscribe/CalendarSuccessForm.jsx similarity index 100% rename from web/src/app/schedules/calendar-subscribe/CalendarSuccessForm.js rename to web/src/app/schedules/calendar-subscribe/CalendarSuccessForm.jsx diff --git a/web/src/app/selection/QuerySelect.js b/web/src/app/selection/QuerySelect.jsx similarity index 100% rename from web/src/app/selection/QuerySelect.js rename to web/src/app/selection/QuerySelect.jsx diff --git a/web/src/app/services/ServiceLabelForm.js b/web/src/app/services/ServiceLabelForm.jsx similarity index 100% rename from web/src/app/services/ServiceLabelForm.js rename to web/src/app/services/ServiceLabelForm.jsx diff --git a/web/src/app/util/AppBarSearchContainer.js b/web/src/app/util/AppBarSearchContainer.jsx similarity index 100% rename from web/src/app/util/AppBarSearchContainer.js rename to web/src/app/util/AppBarSearchContainer.jsx diff --git a/web/src/app/util/FilterContainer.js b/web/src/app/util/FilterContainer.jsx similarity index 100% rename from web/src/app/util/FilterContainer.js rename to web/src/app/util/FilterContainer.jsx diff --git a/web/src/app/util/Markdown.js b/web/src/app/util/Markdown.jsx similarity index 100% rename from web/src/app/util/Markdown.js rename to web/src/app/util/Markdown.jsx diff --git a/web/src/app/util/PageActions.js b/web/src/app/util/PageActions.jsx similarity index 100% rename from web/src/app/util/PageActions.js rename to web/src/app/util/PageActions.jsx diff --git a/web/src/app/util/Search.js b/web/src/app/util/Search.jsx similarity index 100% rename from web/src/app/util/Search.js rename to web/src/app/util/Search.jsx diff --git a/web/src/app/wizard/WizardForm.js b/web/src/app/wizard/WizardForm.jsx similarity index 100% rename from web/src/app/wizard/WizardForm.js rename to web/src/app/wizard/WizardForm.jsx diff --git a/web/src/app/wizard/WizardRouter.js b/web/src/app/wizard/WizardRouter.jsx similarity index 100% rename from web/src/app/wizard/WizardRouter.js rename to web/src/app/wizard/WizardRouter.jsx diff --git a/web/src/app/wizard/WizardScheduleForm.js b/web/src/app/wizard/WizardScheduleForm.jsx similarity index 100% rename from web/src/app/wizard/WizardScheduleForm.js rename to web/src/app/wizard/WizardScheduleForm.jsx From 870b9e97a380956094146a1458ab27ee9a847e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:32:18 -0600 Subject: [PATCH 4/7] build(deps-dev): bump @typescript-eslint/parser from 6.18.1 to 6.21.0 (#3654) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.18.1 to 6.21.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index e7a1845144..84722bdddd 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "@types/react-transition-group": "4.4.7", "@types/react-virtualized-auto-sizer": "1.0.4", "@typescript-eslint/eslint-plugin": "6.18.1", - "@typescript-eslint/parser": "6.18.1", + "@typescript-eslint/parser": "6.21.0", "@urql/exchange-retry": "1.2.1", "bowser": "2.11.0", "chance": "1.1.11", diff --git a/yarn.lock b/yarn.lock index dd1163ccb5..16a370ae41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6997,21 +6997,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.18.1": - version: 6.18.1 - resolution: "@typescript-eslint/parser@npm:6.18.1" - dependencies: - "@typescript-eslint/scope-manager": 6.18.1 - "@typescript-eslint/types": 6.18.1 - "@typescript-eslint/typescript-estree": 6.18.1 - "@typescript-eslint/visitor-keys": 6.18.1 +"@typescript-eslint/parser@npm:6.21.0": + version: 6.21.0 + resolution: "@typescript-eslint/parser@npm:6.21.0" + dependencies: + "@typescript-eslint/scope-manager": 6.21.0 + "@typescript-eslint/types": 6.21.0 + "@typescript-eslint/typescript-estree": 6.21.0 + "@typescript-eslint/visitor-keys": 6.21.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: f123310976a73d9f08470dbad917c9e7b038e9e1362924a225a29d35fac1a2726d447952ca77b914d47f50791d235bb66f5171c7a4a0536e9c170fb20e73a2e4 + checksum: 162fe3a867eeeffda7328bce32dae45b52283c68c8cb23258fb9f44971f761991af61f71b8c9fe1aa389e93dfe6386f8509c1273d870736c507d76dd40647b68 languageName: node linkType: hard @@ -7035,6 +7035,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:6.21.0": + version: 6.21.0 + resolution: "@typescript-eslint/scope-manager@npm:6.21.0" + dependencies: + "@typescript-eslint/types": 6.21.0 + "@typescript-eslint/visitor-keys": 6.21.0 + checksum: 71028b757da9694528c4c3294a96cc80bc7d396e383a405eab3bc224cda7341b88e0fc292120b35d3f31f47beac69f7083196c70616434072fbcd3d3e62d3376 + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:6.18.1": version: 6.18.1 resolution: "@typescript-eslint/type-utils@npm:6.18.1" @@ -7066,6 +7076,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:6.21.0": + version: 6.21.0 + resolution: "@typescript-eslint/types@npm:6.21.0" + checksum: 9501b47d7403417af95fc1fb72b2038c5ac46feac0e1598a46bcb43e56a606c387e9dcd8a2a0abe174c91b509f2d2a8078b093786219eb9a01ab2fbf9ee7b684 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.62.0": version: 5.62.0 resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" @@ -7103,6 +7120,25 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:6.21.0": + version: 6.21.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.21.0" + dependencies: + "@typescript-eslint/types": 6.21.0 + "@typescript-eslint/visitor-keys": 6.21.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + minimatch: 9.0.3 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 + peerDependenciesMeta: + typescript: + optional: true + checksum: dec02dc107c4a541e14fb0c96148f3764b92117c3b635db3a577b5a56fc48df7a556fa853fb82b07c0663b4bf2c484c9f245c28ba3e17e5cb0918ea4cab2ea21 + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:6.18.1": version: 6.18.1 resolution: "@typescript-eslint/utils@npm:6.18.1" @@ -7158,6 +7194,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:6.21.0": + version: 6.21.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.21.0" + dependencies: + "@typescript-eslint/types": 6.21.0 + eslint-visitor-keys: ^3.4.1 + checksum: 67c7e6003d5af042d8703d11538fca9d76899f0119130b373402819ae43f0bc90d18656aa7add25a24427ccf1a0efd0804157ba83b0d4e145f06107d7d1b7433 + languageName: node + linkType: hard + "@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0": version: 1.2.0 resolution: "@ungap/structured-clone@npm:1.2.0" @@ -18347,7 +18393,7 @@ __metadata: "@types/react-transition-group": 4.4.7 "@types/react-virtualized-auto-sizer": 1.0.4 "@typescript-eslint/eslint-plugin": 6.18.1 - "@typescript-eslint/parser": 6.18.1 + "@typescript-eslint/parser": 6.21.0 "@urql/exchange-retry": 1.2.1 bowser: 2.11.0 chance: 1.1.11 From bfd2385ffd4a5d096e8b67b5eb26351b109df0b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:32:37 -0600 Subject: [PATCH 5/7] build(deps-dev): bump luxon and @types/luxon (#3649) Bumps [luxon](https://github.com/moment/luxon) and [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon). These dependencies needed to be updated together. Updates `luxon` from 3.4.3 to 3.4.4 - [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md) - [Commits](https://github.com/moment/luxon/compare/3.4.3...3.4.4) Updates `@types/luxon` from 3.3.4 to 3.4.2 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon) --- updated-dependencies: - dependency-name: luxon dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: "@types/luxon" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 21 +++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 84722bdddd..2817d9cc51 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/glob": "8.1.0", "@types/jest": "29.5.10", "@types/lodash": "4.14.202", - "@types/luxon": "3.3.4", + "@types/luxon": "3.4.2", "@types/node": "20.10.5", "@types/prop-types": "15.7.11", "@types/react": "18.2.48", @@ -106,7 +106,7 @@ "http-server": "14.1.1", "jest": "29.7.0", "lodash": "4.17.21", - "luxon": "3.4.3", + "luxon": "3.4.4", "mdast-util-find-and-replace": "3.0.1", "mdi-material-ui": "7.7.0", "msw": "2.0.11", diff --git a/yarn.lock b/yarn.lock index 16a370ae41..6178cfe6e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6593,10 +6593,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:3.3.4": - version: 3.3.4 - resolution: "@types/luxon@npm:3.3.4" - checksum: aa4862bd62d748e7966f9a0ec76058e9d74397ee426c7d64f61c677d83de0303c303cc78515001833df3f4ad16c95f572b0e2ffaee6e55bc50b80857e8437f3a +"@types/luxon@npm:3.4.2": + version: 3.4.2 + resolution: "@types/luxon@npm:3.4.2" + checksum: 6f92d5bd02e89f310395753506bcd9cef3a56f5940f7a50db2a2b9822bce753553ac767d143cb5b4f9ed5ddd4a84e64f89ff538082ceb4d18739af7781b56925 languageName: node linkType: hard @@ -14765,14 +14765,7 @@ __metadata: languageName: node linkType: hard -"luxon@npm:3.4.3": - version: 3.4.3 - resolution: "luxon@npm:3.4.3" - checksum: 3eade81506224d038ed24035a0cd0dd4887848d7eba9361dce9ad8ef81380596a68153240be3988721f9690c624fb449fcf8fd8c3fc0681a6a8496faf48e92a3 - languageName: node - linkType: hard - -"luxon@npm:^3.2.1": +"luxon@npm:3.4.4, luxon@npm:^3.2.1": version: 3.4.4 resolution: "luxon@npm:3.4.4" checksum: 36c1f99c4796ee4bfddf7dc94fa87815add43ebc44c8934c924946260a58512f0fd2743a629302885df7f35ccbd2d13f178c15df046d0e3b6eb71db178f1c60c @@ -18384,7 +18377,7 @@ __metadata: "@types/glob": 8.1.0 "@types/jest": 29.5.10 "@types/lodash": 4.14.202 - "@types/luxon": 3.3.4 + "@types/luxon": 3.4.2 "@types/node": 20.10.5 "@types/prop-types": 15.7.11 "@types/react": 18.2.48 @@ -18425,7 +18418,7 @@ __metadata: http-server: 14.1.1 jest: 29.7.0 lodash: 4.17.21 - luxon: 3.4.3 + luxon: 3.4.4 mdast-util-find-and-replace: 3.0.1 mdi-material-ui: 7.7.0 msw: 2.0.11 From 6731f32d09f1e0d33be1ede57b828aa46baafbe4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:32:59 -0600 Subject: [PATCH 6/7] build(deps): bump github.com/jackc/pgx/v5 from 5.5.2 to 5.5.3 (#3646) Bumps [github.com/jackc/pgx/v5](https://github.com/jackc/pgx) from 5.5.2 to 5.5.3. - [Changelog](https://github.com/jackc/pgx/blob/master/CHANGELOG.md) - [Commits](https://github.com/jackc/pgx/compare/v5.5.2...v5.5.3) --- updated-dependencies: - dependency-name: github.com/jackc/pgx/v5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e647bd6046..4012494978 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/gordonklaus/ineffassign v0.1.0 github.com/hashicorp/yamux v0.1.1 github.com/jackc/pgtype v1.14.1 - github.com/jackc/pgx/v5 v5.5.2 + github.com/jackc/pgx/v5 v5.5.3 github.com/jmespath/go-jmespath v0.4.0 github.com/joho/godotenv v1.5.1 github.com/kffl/speedbump v1.1.0 diff --git a/go.sum b/go.sum index bea6fb9a16..14607e141e 100644 --- a/go.sum +++ b/go.sum @@ -969,8 +969,8 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= -github.com/jackc/pgx/v5 v5.5.2 h1:iLlpgp4Cp/gC9Xuscl7lFL1PhhW+ZLtXZcrfCt4C3tA= -github.com/jackc/pgx/v5 v5.5.2/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= +github.com/jackc/pgx/v5 v5.5.3 h1:Ces6/M3wbDXYpM8JyyPD57ivTtJACFZJd885pdIaV2s= +github.com/jackc/pgx/v5 v5.5.3/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= From 9466d6f2069654429129df5f059b6761b8678e00 Mon Sep 17 00:00:00 2001 From: ethan-haynes Date: Tue, 6 Feb 2024 17:21:29 -0600 Subject: [PATCH 7/7] Update web/src/app/forms/FormField.jsx Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- web/src/app/forms/FormField.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/app/forms/FormField.jsx b/web/src/app/forms/FormField.jsx index c0865857ef..b146b3c602 100644 --- a/web/src/app/forms/FormField.jsx +++ b/web/src/app/forms/FormField.jsx @@ -288,7 +288,6 @@ FormField.propTypes = { multiple: p.bool, destType: p.string, - options: p.arrayOf( p.shape({ label: p.string,