Skip to content

Commit 6846c26

Browse files
DEV: Bump dependencies and fix linting (#262)
1 parent 0c069f6 commit 6846c26

File tree

9 files changed

+760
-604
lines changed

9 files changed

+760
-604
lines changed

admin/assets/javascripts/discourse/components/docker-manager/console.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
33
import didUpdate from "@ember/render-modifiers/modifiers/did-update";
4-
import { bind } from "discourse-common/utils/decorators";
4+
import { bind } from "discourse/lib/decorators";
55

66
export default class Console extends Component {
77
@bind

admin/assets/javascripts/discourse/components/docker-manager/upgrade-notice.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import { LinkTo } from "@ember/routing";
33
import { service } from "@ember/service";
4-
import i18n from "discourse-common/helpers/i18n";
4+
import { i18n } from "discourse-i18n";
55

66
export default class UpgradeNotice extends Component {
77
@service currentUser;

admin/assets/javascripts/discourse/components/repo-status.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import Component from "@glimmer/component";
22
import { action } from "@ember/object";
33
import { service } from "@ember/service";
44
import DButton from "discourse/components/d-button";
5+
import icon from "discourse/helpers/d-icon";
56
import formatDate from "discourse/helpers/format-date";
6-
import icon from "discourse-common/helpers/d-icon";
7-
import i18n from "discourse-common/helpers/i18n";
7+
import { i18n } from "discourse-i18n";
88
import commitUrl from "../helpers/commit-url";
99
import newCommits from "../helpers/new-commits";
1010

admin/assets/javascripts/discourse/controllers/update-show.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Controller from "@ember/controller";
22
import { action } from "@ember/object";
33
import { service } from "@ember/service";
4-
import { makeArray } from "discourse-common/lib/helpers";
5-
import I18n from "discourse-i18n";
4+
import { makeArray } from "discourse/lib/helpers";
5+
import { i18n } from "discourse-i18n";
66
import Repo from "../models/repo";
77

88
export default class UpgradeShow extends Controller {
@@ -23,9 +23,9 @@ export default class UpgradeShow extends Controller {
2323

2424
get title() {
2525
if (this.multiUpgrade) {
26-
return I18n.t("admin.docker.update_everything");
26+
return i18n("admin.docker.update_everything");
2727
} else {
28-
return I18n.t("admin.docker.update_repo", { name: this.model.name });
28+
return i18n("admin.docker.update_repo", { name: this.model.name });
2929
}
3030
}
3131

@@ -61,7 +61,7 @@ export default class UpgradeShow extends Controller {
6161
@action
6262
resetUpgrade() {
6363
this.dialog.confirm({
64-
message: I18n.t("admin.docker.reset_warning"),
64+
message: i18n("admin.docker.reset_warning"),
6565
didConfirm: async () => {
6666
if (this.multiUpgrade) {
6767
try {

admin/assets/javascripts/discourse/helpers/new-commits.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { htmlSafe } from "@ember/template";
2-
import I18n from "discourse-i18n";
2+
import { i18n } from "discourse-i18n";
33

44
export default function newCommits(commitsBehind, oldSha, newSha, url) {
55
if (!commitsBehind) {
@@ -10,7 +10,7 @@ export default function newCommits(commitsBehind, oldSha, newSha, url) {
1010
return "";
1111
}
1212

13-
const description = I18n.t("admin.docker.commits", {
13+
const description = i18n("admin.docker.commits", {
1414
count: commitsBehind,
1515
});
1616

admin/assets/javascripts/discourse/routes/update-processes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Route from "@ember/routing/route";
22
import { cancel } from "@ember/runloop";
3-
import discourseLater from "discourse-common/lib/later";
4-
import { bind } from "discourse-common/utils/decorators";
3+
import { bind } from "discourse/lib/decorators";
4+
import discourseLater from "discourse/lib/later";
55
import ProcessList from "../models/process-list";
66

77
const REFRESH_INTERVAL = 5000;

admin/assets/javascripts/discourse/routes/update.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Route from "@ember/routing/route";
22
import { service } from "@ember/service";
3-
import { bind } from "discourse-common/utils/decorators";
4-
import I18n from "discourse-i18n";
3+
import { bind } from "discourse/lib/decorators";
4+
import { i18n } from "discourse-i18n";
55
import Repo from "../models/repo";
66

77
export default class Upgrade extends Route {
@@ -26,7 +26,7 @@ export default class Upgrade extends Route {
2626
if (discourse?.branch === "origin/main") {
2727
// Special case: If the branch is "main" warn user
2828
controller.appendBannerHtml(
29-
I18n.t("admin.docker.main_branch_warning", {
29+
i18n("admin.docker.main_branch_warning", {
3030
url: "https://meta.discourse.org/t/17014",
3131
})
3232
);

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.2.2",
5-
"ember-template-lint": "6.0.0",
6-
"eslint": "9.15.0",
4+
"@discourse/lint-configs": "2.4.0",
5+
"ember-template-lint": "6.1.0",
6+
"eslint": "9.19.0",
77
"prettier": "2.8.8"
88
},
99
"engines": {
10-
"node": ">= 18",
10+
"node": ">= 22",
1111
"npm": "please-use-pnpm",
1212
"yarn": "please-use-pnpm",
13-
"pnpm": ">= 9"
14-
}
13+
"pnpm": "9.x"
14+
},
15+
"packageManager": "pnpm@9.15.5"
1516
}

0 commit comments

Comments
 (0)