Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Bump dependencies and fix linting #115

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import EmberObject from "@ember/object";
import { getOwner } from "@ember/owner";
import { emojiUrlFor } from "discourse/lib/text";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import { showUserNotes } from "discourse/plugins/discourse-user-notes/discourse-user-notes/lib/user-notes";

export default {
Expand All @@ -16,7 +16,7 @@ export default {
userNotesCount,
emojiEnabled: component.siteSettings.enable_emoji,
emojiUrl: emojiUrlFor("pencil"),
userNotesTitle: I18n.t("user_notes.show", { count: userNotesCount }),
userNotesTitle: i18n("user_notes.show", { count: userNotesCount }),
});
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Component from "@glimmer/component";
import { action } from "@ember/object";
import { service } from "@ember/service";
import DButton from "discourse/components/d-button";
import icon from "discourse/helpers/d-icon";
import emoji from "discourse/helpers/emoji";
import icon from "discourse-common/helpers/d-icon";
import I18n from "I18n";
import I18n from "discourse-i18n";
import { showUserNotes } from "discourse/plugins/discourse-user-notes/discourse-user-notes/lib/user-notes";

export default class extends Component {
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/discourse-user-notes/lib/user-notes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getOwnerWithFallback } from "discourse-common/lib/get-owner";
import { getOwnerWithFallback } from "discourse/lib/get-owner";
import UserNotesModal from "../../discourse/components/modal/user-notes";

export function showUserNotes(store, userId, callback, opts) {
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/discourse/components/modal/user-notes.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { popupAjaxError } from "discourse/lib/ajax-error";
import I18n from "I18n";
import { i18n } from "discourse-i18n";

export default class UserNotesModal extends Component {
@service dialog;
Expand Down Expand Up @@ -56,7 +56,7 @@ export default class UserNotesModal extends Component {
@action
removeNote(note) {
this.dialog.deleteConfirm({
message: I18n.t("user_notes.delete_confirm"),
message: i18n("user_notes.delete_confirm"),
didConfirm: () => {
note
.destroyRecord()
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/discourse/components/show-user-notes.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Component from "@glimmer/component";
import I18n from "I18n";
import { i18n } from "discourse-i18n";

export default class ShowUserNotes extends Component {
get label() {
if (this.args.count > 0) {
return I18n.t("user_notes.show", { count: this.args.count });
return i18n("user_notes.show", { count: this.args.count });
} else {
return I18n.t("user_notes.title");
return i18n("user_notes.title");
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { observes, on } from "discourse/lib/decorators";
import { iconNode } from "discourse/lib/icon-library";
import { withPluginApi } from "discourse/lib/plugin-api";
import { iconNode } from "discourse-common/lib/icon-library";
import { observes, on } from "discourse-common/utils/decorators";
import { showUserNotes } from "discourse/plugins/discourse-user-notes/discourse-user-notes/lib/user-notes";

const PLUGIN_ID = "discourse-user-notes";
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.2.2",
"ember-template-lint": "6.0.0",
"eslint": "9.15.0",
"@discourse/lint-configs": "2.4.0",
"ember-template-lint": "6.1.0",
"eslint": "9.19.0",
"prettier": "2.8.8"
},
"engines": {
"node": ">= 18",
"node": ">= 22",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">= 9"
}
"pnpm": "9.x"
},
"packageManager": "[email protected]"
}
Loading