From c84fe69e1025437baafa6a2bceace13bfcacb4a0 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 23 Oct 2023 12:08:35 +0200 Subject: [PATCH] DEV: Use `@discourse/lint-configs` (#24038) --- .eslintrc | 9 - .eslintrc.cjs | 1 + .prettierrc | 17 - .prettierrc.cjs | 1 + .template-lintrc.js | 34 +- .../discourse/app/components/cook-text.gjs | 1 - .../discourse/app/components/fast-edit.gjs | 1 - .../form-template-field/wrapper.gjs | 1 - .../groups-form-membership-fields.js | 4 +- .../post-text-selection-toolbar.gjs | 1 - .../app/components/post-text-selection.gjs | 1 - .../discourse/app/components/user-tip.gjs | 1 - app/assets/javascripts/discourse/package.json | 2 - .../integration/components/ace-editor-test.js | 2 +- .../integration/components/d-button-test.js | 4 +- .../integration/components/load-more-test.js | 2 +- .../email-group-user-chooser-test.js | 2 +- .../components/sidebar/section-link-test.js | 4 +- .../components/sidebar/section-test.js | 2 +- .../components/themes-list-test.js | 4 +- .../components/user-status-message-test.js | 2 +- .../tests/unit/lib/ember-events-test.js | 2 +- .../addon/components/d-float-body.gjs | 1 - .../addon/components/d-inline-menu.gjs | 1 - .../addon/components/d-inline-tooltip.gjs | 1 - .../float-kit/addon/components/d-menu.gjs | 1 - .../float-kit/addon/components/d-popover.gjs | 1 - .../float-kit/addon/components/d-tooltip.gjs | 1 - .../theme-transpiler/transpiler.js | 3 +- app/assets/javascripts/yarn.lock | 312 +----------------- package.json | 12 +- .../components/chat-channel-members.gjs | 1 - .../chat-channel-message-emoji-picker.gjs | 1 - .../discourse/components/chat-channel-row.gjs | 1 - .../chat-message-actions-desktop.gjs | 1 - .../chat-message-actions-mobile.gjs | 1 - .../components/chat-message-reaction.gjs | 1 - .../discourse/components/chat-message.gjs | 1 - .../discourse/components/chat-thread-list.gjs | 1 - .../components/chat-thread-participants.gjs | 44 +-- .../discourse/components/chat-user-info.gjs | 16 +- .../discourse/components/chat/form.gjs | 8 +- .../discourse/components/dc-filter-input.gjs | 1 - yarn.lock | 281 ++++++---------- 44 files changed, 175 insertions(+), 614 deletions(-) delete mode 100644 .eslintrc create mode 100644 .eslintrc.cjs delete mode 100644 .prettierrc create mode 100644 .prettierrc.cjs diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index c2cef78b8ad..00000000000 --- a/.eslintrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "eslint-config-discourse", - "rules": { - "discourse-ember/global-ember": "error", - "eol-last": "error", - "no-restricted-globals": "off", - "no-restricted-imports": ["error", { "paths": ["I18n"] }] - } -} diff --git a/.eslintrc.cjs b/.eslintrc.cjs new file mode 100644 index 00000000000..be1a9f3f46c --- /dev/null +++ b/.eslintrc.cjs @@ -0,0 +1 @@ +module.exports = require("@discourse/lint-configs/eslint"); diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 8a1423e9391..00000000000 --- a/.prettierrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "plugins": ["prettier-plugin-ember-template-tag"], - "overrides": [ - { - "files": "*.gjs", - "options": { - "parser": "ember-template-tag" - } - }, - { - "files": "*.gts", - "options": { - "parser": "ember-template-tag" - } - } - ] -} diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 00000000000..57f647bc84c --- /dev/null +++ b/.prettierrc.cjs @@ -0,0 +1 @@ +module.exports = require("@discourse/lint-configs/prettier"); diff --git a/.template-lintrc.js b/.template-lintrc.js index 8fc14a870cf..f78c8dc4f3f 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -1,34 +1,10 @@ -module.exports = { - plugins: ["ember-template-lint-plugin-discourse"], - extends: "discourse:recommended", +const templateLint = require("@discourse/lint-configs/template-lint"); +module.exports = { + ...templateLint, rules: { - "no-action-modifiers": true, - "no-args-paths": true, - "no-attrs-in-components": true, + ...templateLint.rules, "no-capital-arguments": false, // TODO: we extensively use `args` argument name - "no-curly-component-invocation": { - allow: [ - // These are helpers, not components - "directory-item-header-title", - "directory-item-user-field-value", - "directory-item-value", - "directory-table-header-title", - "loading-spinner", - "directory-item-label", - "hide-application-footer", - ], - }, - "no-implicit-this": { - allow: ["loading-spinner", "hide-application-footer"], - }, - "require-mandatory-role-attributes": false, - "require-media-caption": false, - // Begin prettier compatibility - "eol-last": false, - "self-closing-void-elements": false, - "block-indentation": false, - quotes: false, - // End prettier compatibility + "require-button-type": false, }, }; diff --git a/app/assets/javascripts/discourse/app/components/cook-text.gjs b/app/assets/javascripts/discourse/app/components/cook-text.gjs index c7327bfef99..22c871c2e6b 100644 --- a/app/assets/javascripts/discourse/app/components/cook-text.gjs +++ b/app/assets/javascripts/discourse/app/components/cook-text.gjs @@ -52,7 +52,6 @@ export default class CookText extends Component { }