Skip to content

Commit bef1fa7

Browse files
DEV: Update eslint config (#606)
1 parent 10fb723 commit bef1fa7

17 files changed

+194
-173
lines changed

.eslintrc.cjs

-1
This file was deleted.

assets/javascripts/discourse/components/assign-button.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import DButton from "discourse/components/d-button";
55

66
export default class AssignButton extends Component {

assets/javascripts/discourse/components/assigned-to-post.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import DButton from "discourse/components/d-button";
55
import DropdownMenu from "discourse/components/dropdown-menu";
66
import icon from "discourse-common/helpers/d-icon";

assets/javascripts/discourse/components/assigned-topic-list-column.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import AssignActionsDropdown from "./assign-actions-dropdown";
55

66
export default class AssignedTopicListColumn extends Component {

assets/javascripts/discourse/components/assignment.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { hash } from "@ember/helper";
33
import { TextArea } from "@ember/legacy-built-in-components";
44
import { on } from "@ember/modifier";
55
import { action } from "@ember/object";
6-
import { inject as service } from "@ember/service";
6+
import { service } from "@ember/service";
77
import icon from "discourse-common/helpers/d-icon";
88
import i18n from "discourse-common/helpers/i18n";
99
import ComboBox from "select-kit/components/combo-box";

assets/javascripts/discourse/components/modal/assign-user.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import { TrackedObject } from "@ember-compat/tracked-built-ins";
55
import I18n from "I18n";
66

assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@glimmer/component";
22
import { tracked } 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 DButton from "discourse/components/d-button";
66
import DModal from "discourse/components/d-modal";
77
import DModalCancel from "discourse/components/d-modal-cancel";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { inject as controller } from "@ember/controller";
22
import { action } from "@ember/object";
33
import { alias } from "@ember/object/computed";
4-
import { inject as service } from "@ember/service";
4+
import { service } from "@ember/service";
55
import UserTopicsList from "discourse/controllers/user-topics-list";
66
import BulkSelectHelper from "discourse/lib/bulk-select-helper";
77
import { INPUT_DELAY } from "discourse-common/config/environment";

assets/javascripts/discourse/controllers/group-assigned.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller, { inject as controller } from "@ember/controller";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import { ajax } from "discourse/lib/ajax";
55
import { INPUT_DELAY } from "discourse-common/config/environment";
66
import discourseDebounce from "discourse-common/lib/debounce";

assets/javascripts/discourse/controllers/user-activity-assigned.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { inject as controller } from "@ember/controller";
22
import { action } from "@ember/object";
3-
import { inject as service } from "@ember/service";
3+
import { service } from "@ember/service";
44
import { htmlSafe } from "@ember/template";
55
import UserTopicsList from "discourse/controllers/user-topics-list";
66
import { INPUT_DELAY } from "discourse-common/config/environment";

assets/javascripts/discourse/raw-views/assign-topic-buttons.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import EmberObject from "@ember/object";
2-
import { inject as service } from "@ember/service";
2+
import { service } from "@ember/service";
33
import rawRenderGlimmer from "discourse/lib/raw-render-glimmer";
44
import AssignedTopicListColumn from "../components/assigned-topic-list-column";
55

assets/javascripts/discourse/routes/group-assigned.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/user-activity-assigned.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 cookie from "discourse/lib/cookie";
33
import UserTopicListRoute from "discourse/routes/user-topic-list";
44
import I18n from "I18n";

assets/javascripts/discourse/services/task-actions.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { tracked } from "@glimmer/tracking";
2-
import Service, { inject as service } from "@ember/service";
2+
import Service, { service } from "@ember/service";
33
import { isEmpty } from "@ember/utils";
44
import { ajax } from "discourse/lib/ajax";
55
import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -10,7 +10,7 @@ export default class TaskActions extends Service {
1010

1111
@tracked allowedGroups;
1212
@tracked allowedGroupsForAssignment;
13-
#suggestionsPromise;
13+
#suggestionsPromise; // eslint-disable-line no-unused-private-class-members
1414
@tracked _suggestions;
1515

1616
get suggestions() {

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)