Skip to content

Commit e841ad4

Browse files
DEV: Update eslint config (#336)
1 parent f289194 commit e841ad4

13 files changed

+192
-171
lines changed

.eslintrc.cjs

-1
This file was deleted.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import EmberObject, { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import { dasherize } from "@ember/string";
55
import { isEmpty } from "@ember/utils";
66
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
@@ -235,7 +235,7 @@ export default class ParamInputForm extends Component {
235235
return null;
236236
}
237237
return moment(new Date(value).toISOString()).format("YYYY-MM-DD");
238-
} catch (err) {
238+
} catch {
239239
this.addError(info.identifier, ERRORS.INVALID_DATE(String(value)));
240240
return null;
241241
}
@@ -247,7 +247,7 @@ export default class ParamInputForm extends Component {
247247
return moment(new Date(`1970/01/01 ${value}`).toISOString()).format(
248248
"HH:mm"
249249
);
250-
} catch (err) {
250+
} catch {
251251
this.addError(info.identifier, ERRORS.INVALID_TIME(String(value)));
252252
return null;
253253
}
@@ -259,7 +259,7 @@ export default class ParamInputForm extends Component {
259259
return moment(new Date(value).toISOString()).format(
260260
"YYYY-MM-DD HH:mm"
261261
);
262-
} catch (err) {
262+
} catch {
263263
this.addError(info.identifier, ERRORS.INVALID_TIME(String(value)));
264264
return null;
265265
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Component from "@glimmer/component";
2-
import { inject as service } from "@ember/service";
2+
import { service } from "@ember/service";
33
import GroupChooser from "select-kit/components/group-chooser";
44

55
export default class GroupInput extends Component {

assets/javascripts/discourse/components/query-result.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 { schedule } from "@ember/runloop";
5-
import { inject as service } from "@ember/service";
5+
import { service } from "@ember/service";
66
import { capitalize } from "@ember/string";
77
import { ajax } from "discourse/lib/ajax";
88
import Badge from "discourse/models/badge";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class QueryRowContent extends Component {
4747
component: componentDefinition.component || TextViewComponent,
4848
ctx,
4949
};
50-
} catch (e) {
50+
} catch {
5151
return "error";
5252
}
5353
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import { cached } from "@glimmer/tracking";
33
import { action } from "@ember/object";
4-
import { inject as service } from "@ember/service";
4+
import { service } from "@ember/service";
55
import FullscreenCodeModal from "discourse/components/modal/fullscreen-code";
66

77
export default class Json extends Component {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { tracked } from "@glimmer/tracking";
22
import Controller from "@ember/controller";
33
import { action } from "@ember/object";
4-
import { inject as service } from "@ember/service";
4+
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";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { tracked } from "@glimmer/tracking";
22
import Controller from "@ember/controller";
33
import { action } from "@ember/object";
4-
import { inject as service } from "@ember/service";
4+
import { service } from "@ember/service";
55
import BookmarkModal from "discourse/components/modal/bookmark";
66
import { ajax } from "discourse/lib/ajax";
77
import { popupAjaxError } from "discourse/lib/ajax-error";

assets/javascripts/discourse/routes/group-reports-index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { inject as service } from "@ember/service";
1+
import { service } from "@ember/service";
22
import { ajax } from "discourse/lib/ajax";
33
import DiscourseRoute from "discourse/routes/discourse";
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { inject as service } from "@ember/service";
1+
import { service } from "@ember/service";
22
import { ajax } from "discourse/lib/ajax";
33
import DiscourseRoute from "discourse/routes/discourse";
44

eslint.config.mjs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import DiscourseRecommended from "@discourse/lint-configs/eslint";
2+
3+
export default [...DiscourseRecommended];

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "1.3.10",
4+
"@discourse/lint-configs": "2.0.1",
55
"ember-template-lint": "6.0.0",
6-
"eslint": "8.57.1",
7-
"prettier": "2.8.8",
8-
"@babel/plugin-proposal-decorators": "^7.25.7"
6+
"eslint": "9.14.0",
7+
"prettier": "2.8.8"
98
},
109
"engines": {
1110
"node": ">= 18",

0 commit comments

Comments
 (0)