From db040749b2cfabadd8f47c4f1bb8ddace7d0c60e Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 6 Feb 2025 16:43:59 +0000 Subject: [PATCH] DEV: Bump dependencies and fix linting (#685) --- .../discourse/components/csv-uploader.gjs | 4 +- .../discourse-post-event/creator.gjs | 2 +- .../components/discourse-post-event/dates.gjs | 2 +- .../discourse-post-event/event-status.gjs | 2 +- .../components/discourse-post-event/index.gjs | 2 +- .../discourse-post-event/invitee.gjs | 2 +- .../discourse-post-event/invitees.gjs | 4 +- .../discourse-post-event/more-menu.gjs | 4 +- .../components/discourse-post-event/url.gjs | 2 +- .../discourse/components/event-date.gjs | 4 +- .../discourse/components/event-field.gjs | 2 +- .../components/modal/post-event-builder.js | 40 +- .../modal/post-event-bulk-invite.js | 12 +- .../modal/post-event-invitees/index.gjs | 7 +- .../discourse/components/region-input.js | 6 +- .../components/upcoming-events-calendar.js | 2 +- .../components/upcoming-events-list.gjs | 14 +- .../add-upcoming-events-to-sidebar.js | 6 +- .../discourse/initializers/disable-sort.js | 4 +- .../initializers/discourse-calendar.js | 16 +- .../initializers/discourse-group-timezones.js | 2 +- .../discourse-post-event-decorator.gjs | 6 +- .../initializers/event-relative-date.js | 4 +- .../discourse/lib/calendar-locale.js | 12 +- .../discourse/lib/event-relative-date.js | 4 +- .../models/discourse-post-event-event.js | 2 +- .../discourse-group-timezones-filter.js | 4 +- .../discourse-group-timezones-header.js | 4 +- package.json | 13 +- pnpm-lock.yaml | 1317 +++++++++-------- .../acceptance/notifications-test.js | 10 +- .../acceptance/post-event-builder-test.js | 6 +- .../topic-calendar-holidays-test.js | 2 +- .../acceptance/topic-title-decorator-test.js | 2 +- .../components/upcoming-events-list-test.gjs | 24 +- 35 files changed, 848 insertions(+), 701 deletions(-) diff --git a/assets/javascripts/discourse/components/csv-uploader.gjs b/assets/javascripts/discourse/components/csv-uploader.gjs index 5ac6a398..d828f618 100644 --- a/assets/javascripts/discourse/components/csv-uploader.gjs +++ b/assets/javascripts/discourse/components/csv-uploader.gjs @@ -3,9 +3,9 @@ import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import { service } from "@ember/service"; import { or } from "truth-helpers"; +import icon from "discourse/helpers/d-icon"; import UppyUpload from "discourse/lib/uppy/uppy-upload"; -import icon from "discourse-common/helpers/d-icon"; -import i18n from "discourse-common/helpers/i18n"; +import { i18n } from "discourse-i18n"; export default class CsvUploader extends Component { @service dialog; diff --git a/assets/javascripts/discourse/components/discourse-post-event/creator.gjs b/assets/javascripts/discourse/components/discourse-post-event/creator.gjs index d877b9e4..44dc031f 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/creator.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/creator.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import avatar from "discourse/helpers/avatar"; import { formatUsername } from "discourse/lib/utilities"; -import i18n from "discourse-common/helpers/i18n"; +import { i18n } from "discourse-i18n"; export default class DiscoursePostEventCreator extends Component { get username() { diff --git a/assets/javascripts/discourse/components/discourse-post-event/dates.gjs b/assets/javascripts/discourse/components/discourse-post-event/dates.gjs index 56c5db97..e5ac9044 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/dates.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/dates.gjs @@ -5,9 +5,9 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import { next } from "@ember/runloop"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import icon from "discourse/helpers/d-icon"; import { applyLocalDates } from "discourse/lib/local-dates"; import { cook } from "discourse/lib/text"; -import icon from "discourse-common/helpers/d-icon"; import guessDateFormat from "../../lib/guess-best-date-format"; export default class DiscoursePostEventDates extends Component { diff --git a/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs b/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs index 55c58d9d..c773732f 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import i18n from "discourse-common/helpers/i18n"; +import { i18n } from "discourse-i18n"; export default class EventStatus extends Component { get eventStatusLabel() { diff --git a/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/assets/javascripts/discourse/components/discourse-post-event/index.gjs index 54f618c8..527cc521 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/index.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/index.gjs @@ -4,9 +4,9 @@ import { service } from "@ember/service"; import { modifier } from "ember-modifier"; import PluginOutlet from "discourse/components/plugin-outlet"; import concatClass from "discourse/helpers/concat-class"; +import icon from "discourse/helpers/d-icon"; import replaceEmoji from "discourse/helpers/replace-emoji"; import routeAction from "discourse/helpers/route-action"; -import icon from "discourse-common/helpers/d-icon"; import Creator from "./creator"; import Dates from "./dates"; import EventStatus from "./event-status"; diff --git a/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs b/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs index d3aef6a0..76b08b0b 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs @@ -5,7 +5,7 @@ import { eq } from "truth-helpers"; import AvatarFlair from "discourse/components/avatar-flair"; import avatar from "discourse/helpers/avatar"; import concatClass from "discourse/helpers/concat-class"; -import i18n from "discourse-common/helpers/i18n"; +import { i18n } from "discourse-i18n"; export default class DiscoursePostEventInvitee extends Component { @service site; diff --git a/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs b/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs index 6b522590..4e6d8377 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; -import icon from "discourse-common/helpers/d-icon"; -import i18n from "discourse-common/helpers/i18n"; +import icon from "discourse/helpers/d-icon"; +import { i18n } from "discourse-i18n"; import Invitee from "./invitee"; export default class DiscoursePostEventInvitees extends Component { diff --git a/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs b/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs index 2c466481..f27e16b3 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs @@ -7,9 +7,9 @@ import DropdownMenu from "discourse/components/dropdown-menu"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { downloadCalendar } from "discourse/lib/download-calendar"; import { exportEntity } from "discourse/lib/export-csv"; +import { getAbsoluteURL } from "discourse/lib/get-url"; import { cook } from "discourse/lib/text"; -import i18n from "discourse-common/helpers/i18n"; -import { getAbsoluteURL } from "discourse-common/lib/get-url"; +import { i18n } from "discourse-i18n"; import DMenu from "float-kit/components/d-menu"; import { buildParams, replaceRaw } from "../../lib/raw-event-helper"; import PostEventBuilder from "../modal/post-event-builder"; diff --git a/assets/javascripts/discourse/components/discourse-post-event/url.gjs b/assets/javascripts/discourse/components/discourse-post-event/url.gjs index 0ce02faa..57c5f2db 100644 --- a/assets/javascripts/discourse/components/discourse-post-event/url.gjs +++ b/assets/javascripts/discourse/components/discourse-post-event/url.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import icon from "discourse-common/helpers/d-icon"; +import icon from "discourse/helpers/d-icon"; export default class DiscoursePostEventUrl extends Component { get url() { diff --git a/assets/javascripts/discourse/components/event-date.gjs b/assets/javascripts/discourse/components/event-date.gjs index 5df14af8..16ed4958 100644 --- a/assets/javascripts/discourse/components/event-date.gjs +++ b/assets/javascripts/discourse/components/event-date.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; -import I18n from "discourse-i18n"; +import { i18n } from "discourse-i18n"; import guessDateFormat from "../lib/guess-best-date-format"; export default class EventDate extends Component { @@ -93,7 +93,7 @@ export default class EventDate extends Component { } get timeRemainingContent() { - return I18n.t("discourse_post_event.topic_title.ends_in_duration", { + return i18n("discourse_post_event.topic_title.ends_in_duration", { duration: this.eventEndedAt.from(moment()), }); } diff --git a/assets/javascripts/discourse/components/event-field.gjs b/assets/javascripts/discourse/components/event-field.gjs index 0f1411ce..cb08466d 100644 --- a/assets/javascripts/discourse/components/event-field.gjs +++ b/assets/javascripts/discourse/components/event-field.gjs @@ -1,4 +1,4 @@ -import i18n from "discourse-common/helpers/i18n"; +import { i18n } from "discourse-i18n"; import notEq from "truth-helpers/helpers/not-eq"; const EventField =