Skip to content

Commit bd6263e

Browse files
DEV: Bump dependencies and fix linting (#355)
1 parent d4be33d commit bd6263e

17 files changed

+790
-640
lines changed

assets/javascripts/discourse/components/data-explorer-bar-chart.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3+
import { bind } from "discourse/lib/decorators";
34
import loadScript from "discourse/lib/load-script";
4-
import { bind } from "discourse-common/utils/decorators";
55
import themeColor from "../lib/themeColor";
66

77
export default class DataExplorerBarChart extends Component {

assets/javascripts/discourse/components/explorer-schema.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
22
import { tracked } from "@glimmer/tracking";
33
import { action } from "@ember/object";
44
import { isBlank, isEmpty } from "@ember/utils";
5-
import { debounce } from "discourse-common/utils/decorators";
5+
import { debounce } from "discourse/lib/decorators";
66

77
export default class ExplorerSchema extends Component {
88
@tracked filter;

assets/javascripts/discourse/components/explorer-schema/one-table.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import { tracked } from "@glimmer/tracking";
3-
import { bind } from "discourse-common/utils/decorators";
3+
import { bind } from "discourse/lib/decorators";
44

55
export default class OneTable extends Component {
66
@tracked open = this.args.table.open;

assets/javascripts/discourse/components/modal/query-help.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { htmlSafe } from "@ember/template";
22
import DModal from "discourse/components/d-modal";
3-
import i18n from "discourse-common/helpers/i18n";
3+
import { i18n } from "discourse-i18n";
44

55
const QueryHelp = <template>
66
<DModal

assets/javascripts/discourse/components/param-input-form.gjs

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { isEmpty } from "@ember/utils";
66
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
77
import Form from "discourse/components/form";
88
import Category from "discourse/models/category";
9-
import I18n from "I18n";
9+
import { i18n } from "discourse-i18n";
1010
import BooleanThree from "./param-input/boolean-three";
1111
import CategoryIdInput from "./param-input/category-id-input";
1212
import GroupInput from "./param-input/group-input";
@@ -37,16 +37,16 @@ const layoutMap = {
3737
};
3838

3939
export const ERRORS = {
40-
REQUIRED: I18n.t("form_kit.errors.required"),
41-
NOT_AN_INTEGER: I18n.t("form_kit.errors.not_an_integer"),
42-
NOT_A_NUMBER: I18n.t("form_kit.errors.not_a_number"),
43-
OVERFLOW_HIGH: I18n.t("form_kit.errors.too_high", { count: 2147484647 }),
44-
OVERFLOW_LOW: I18n.t("form_kit.errors.too_low", { count: -2147484648 }),
45-
INVALID: I18n.t("explorer.form.errors.invalid"),
46-
NO_SUCH_CATEGORY: I18n.t("explorer.form.errors.no_such_category"),
47-
NO_SUCH_GROUP: I18n.t("explorer.form.errors.no_such_group"),
48-
INVALID_DATE: (date) => I18n.t("explorer.form.errors.invalid_date", { date }),
49-
INVALID_TIME: (time) => I18n.t("explorer.form.errors.invalid_time", { time }),
40+
REQUIRED: i18n("form_kit.errors.required"),
41+
NOT_AN_INTEGER: i18n("form_kit.errors.not_an_integer"),
42+
NOT_A_NUMBER: i18n("form_kit.errors.not_a_number"),
43+
OVERFLOW_HIGH: i18n("form_kit.errors.too_high", { count: 2147484647 }),
44+
OVERFLOW_LOW: i18n("form_kit.errors.too_low", { count: -2147484648 }),
45+
INVALID: i18n("explorer.form.errors.invalid"),
46+
NO_SUCH_CATEGORY: i18n("explorer.form.errors.no_such_category"),
47+
NO_SUCH_GROUP: i18n("explorer.form.errors.no_such_group"),
48+
INVALID_DATE: (date) => i18n("explorer.form.errors.invalid_date", { date }),
49+
INVALID_TIME: (time) => i18n("explorer.form.errors.invalid_time", { time }),
5050
};
5151

5252
function digitalizeCategoryId(value) {

assets/javascripts/discourse/components/query-result.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { schedule } from "@ember/runloop";
55
import { service } from "@ember/service";
66
import { capitalize } from "@ember/string";
77
import { ajax } from "discourse/lib/ajax";
8+
import getURL from "discourse/lib/get-url";
89
import Badge from "discourse/models/badge";
910
import Category from "discourse/models/category";
10-
import getURL from "discourse-common/lib/get-url";
11-
import I18n from "I18n";
11+
import I18n, { i18n } from "discourse-i18n";
1212
import BadgeViewComponent from "./result-types/badge";
1313
import CategoryViewComponent from "./result-types/category";
1414
import GroupViewComponent from "./result-types/group";
@@ -104,14 +104,14 @@ export default class QueryResult extends Component {
104104
get resultCount() {
105105
const count = this.args.content.result_count;
106106
if (count === this.args.content.default_limit) {
107-
return I18n.t("explorer.max_result_count", { count });
107+
return i18n("explorer.max_result_count", { count });
108108
} else {
109-
return I18n.t("explorer.result_count", { count });
109+
return i18n("explorer.result_count", { count });
110110
}
111111
}
112112

113113
get duration() {
114-
return I18n.t("explorer.run_time", {
114+
return i18n("explorer.run_time", {
115115
value: I18n.toNumber(this.args.content.duration, { precision: 1 }),
116116
});
117117
}

assets/javascripts/discourse/components/query-row-content.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Component from "@glimmer/component";
22
import { cached } from "@glimmer/tracking";
33
import { capitalize } from "@ember/string";
4+
import getURL from "discourse/lib/get-url";
45
import { escapeExpression } from "discourse/lib/utilities";
5-
import getURL from "discourse-common/lib/get-url";
66
import TextViewComponent from "./result-types/text";
77

88
export default class QueryRowContent extends Component {

assets/javascripts/discourse/components/result-types/badge.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import { htmlSafe } from "@ember/template";
33
import { isEmpty } from "@ember/utils";
4-
import { convertIconClass, iconHTML } from "discourse-common/lib/icon-library";
4+
import { convertIconClass, iconHTML } from "discourse/lib/icon-library";
55

66
export default class Badge extends Component {
77
get iconOrImageReplacement() {

assets/javascripts/discourse/components/share-report.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Component from "@glimmer/component";
22
import { tracked } from "@glimmer/tracking";
33
import { action } from "@ember/object";
4-
import getURL from "discourse-common/lib/get-url";
5-
import { bind } from "discourse-common/utils/decorators";
4+
import { bind } from "discourse/lib/decorators";
5+
import getURL from "discourse/lib/get-url";
66

77
export default class ShareReport extends Component {
88
@tracked visible = false;

assets/javascripts/discourse/controllers/admin-plugins-explorer.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { service } from "@ember/service";
55
import { Promise } from "rsvp";
66
import { ajax } from "discourse/lib/ajax";
77
import { popupAjaxError } from "discourse/lib/ajax-error";
8-
import { bind } from "discourse-common/utils/decorators";
9-
import I18n from "I18n";
8+
import { bind } from "discourse/lib/decorators";
9+
import { i18n } from "discourse-i18n";
1010
import QueryHelp from "discourse/plugins/discourse-data-explorer/discourse/components/modal/query-help";
1111
import { ParamValidationError } from "discourse/plugins/discourse-data-explorer/discourse/components/param-input-form";
1212
import Query from "discourse/plugins/discourse-data-explorer/discourse/models/query";
@@ -223,11 +223,11 @@ export default class PluginsExplorerController extends Controller {
223223
if (e.jqXHR) {
224224
popupAjaxError(e);
225225
} else if (e instanceof SyntaxError) {
226-
this.dialog.alert(I18n.t("explorer.import.unparseable_json"));
226+
this.dialog.alert(i18n("explorer.import.unparseable_json"));
227227
} else if (e instanceof TypeError) {
228-
this.dialog.alert(I18n.t("explorer.import.wrong_json"));
228+
this.dialog.alert(i18n("explorer.import.wrong_json"));
229229
} else {
230-
this.dialog.alert(I18n.t("errors.desc.unknown"));
230+
this.dialog.alert(i18n("errors.desc.unknown"));
231231
// eslint-disable-next-line no-console
232232
console.error(e);
233233
}

assets/javascripts/discourse/controllers/group-reports-show.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import BookmarkModal from "discourse/components/modal/bookmark";
66
import { ajax } from "discourse/lib/ajax";
77
import { popupAjaxError } from "discourse/lib/ajax-error";
88
import { BookmarkFormData } from "discourse/lib/bookmark-form-data";
9+
import { bind } from "discourse/lib/decorators";
910
import {
1011
NO_REMINDER_ICON,
1112
WITH_REMINDER_ICON,
1213
} from "discourse/models/bookmark";
13-
import { bind } from "discourse-common/utils/decorators";
1414
import { ParamValidationError } from "discourse/plugins/discourse-data-explorer/discourse/components/param-input-form";
1515

1616
export default class GroupReportsShowController extends Controller {

assets/javascripts/discourse/models/query.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { computed } from "@ember/object";
2+
import getURL from "discourse/lib/get-url";
23
import RestModel from "discourse/models/rest";
3-
import getURL from "discourse-common/lib/get-url";
44

55
export default class Query extends RestModel {
66
static updatePropertyNames = [

package.json

+7-6
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": "[email protected]"
1516
}

0 commit comments

Comments
 (0)