From d9a0de9fb8a5bae48ad2970817d566684d579ea2 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 20 Nov 2024 17:48:06 +0000 Subject: [PATCH] DEV: Update linting --- .../featured-tiles.hbs | 2 +- .../featured-tiles.hbs | 2 +- .../templates/components/featured-tile.hbs | 18 +++++++-------- .../templates/components/featured-tiles.hbs | 4 ++-- package.json | 2 +- pnpm-lock.yaml | 23 +++++++++++++++---- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/javascripts/discourse/connectors/discovery-list-container-top/featured-tiles.hbs b/javascripts/discourse/connectors/discovery-list-container-top/featured-tiles.hbs index 496079f..00f4f85 100644 --- a/javascripts/discourse/connectors/discovery-list-container-top/featured-tiles.hbs +++ b/javascripts/discourse/connectors/discovery-list-container-top/featured-tiles.hbs @@ -1 +1 @@ -{{featured-tiles category=category}} \ No newline at end of file +{{featured-tiles category=this.category}} \ No newline at end of file diff --git a/javascripts/discourse/connectors/user-preferences-interface/featured-tiles.hbs b/javascripts/discourse/connectors/user-preferences-interface/featured-tiles.hbs index 59d4ff6..3132973 100644 --- a/javascripts/discourse/connectors/user-preferences-interface/featured-tiles.hbs +++ b/javascripts/discourse/connectors/user-preferences-interface/featured-tiles.hbs @@ -3,6 +3,6 @@ {{preference-checkbox labelKey=(theme-prefix "preference_description") - checked=model.show_featured_topics_banner + checked=this.model.show_featured_topics_banner }} \ No newline at end of file diff --git a/javascripts/discourse/templates/components/featured-tile.hbs b/javascripts/discourse/templates/components/featured-tile.hbs index e3de527..1c34c6a 100644 --- a/javascripts/discourse/templates/components/featured-tile.hbs +++ b/javascripts/discourse/templates/components/featured-tile.hbs @@ -1,20 +1,20 @@ - - {{#if topic.thumbnails}} + + {{#if this.topic.thumbnails}} {{/if}}
- {{topic.title}} + {{this.topic.title}} - {{#user-link user=topic.creator}} - {{avatar topic.creator imageSize="large"}} + {{#user-link user=this.topic.creator}} + {{avatar this.topic.creator imageSize="large"}} {{/user-link}}
diff --git a/javascripts/discourse/templates/components/featured-tiles.hbs b/javascripts/discourse/templates/components/featured-tiles.hbs index 6c51cbb..f7b2ebb 100644 --- a/javascripts/discourse/templates/components/featured-tiles.hbs +++ b/javascripts/discourse/templates/components/featured-tiles.hbs @@ -1,6 +1,6 @@ -{{#if shouldDisplay}} +{{#if this.shouldDisplay}}
- {{#each filteredTopics as |topic|}} + {{#each this.filteredTopics as |topic|}} {{featured-tile topic=topic}} {{/each}}
diff --git a/package.json b/package.json index 7b9f8d7..5605d91 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "devDependencies": { - "@discourse/lint-configs": "2.0.1", + "@discourse/lint-configs": "2.2.1", "ember-template-lint": "6.0.0", "eslint": "9.14.0", "prettier": "2.8.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aef887b..dbfe9bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@discourse/lint-configs': - specifier: 2.0.1 - version: 2.0.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8) + specifier: 2.2.1 + version: 2.2.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8) ember-template-lint: specifier: 6.0.0 version: 6.0.0 @@ -141,8 +141,8 @@ packages: resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} engines: {node: '>=6.9.0'} - '@discourse/lint-configs@2.0.1': - resolution: {integrity: sha512-4AKSzX4EYIEAtTCj+1+VKx0ziQ5XbYJZuQQ8cxhE7/amRloWyuM3YuDpa5x1r2zaLRbfEHXjlveVk+obMRLPqw==} + '@discourse/lint-configs@2.2.1': + resolution: {integrity: sha512-cXA6erpwaN9/wX+pNHUeDws6hdQEewfPb+nmWQNAaD72FTDKpjNmwxKDaVH1p65yVsF8SdNRZGKdAnOjkH42aw==} peerDependencies: ember-template-lint: 6.0.0 eslint: ^9.14.0 @@ -288,6 +288,12 @@ packages: resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} + '@stylistic/eslint-plugin-js@2.11.0': + resolution: {integrity: sha512-btchD0P3iij6cIk5RR5QMdEhtCCV0+L6cNheGhGCd//jaHILZMTi/EOqgEDAf1s4ZoViyExoToM+S2Iwa3U9DA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: '>=8.40.0' + '@types/eslint@8.56.12': resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==} @@ -1935,11 +1941,12 @@ snapshots: '@babel/helper-string-parser': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 - '@discourse/lint-configs@2.0.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)': + '@discourse/lint-configs@2.2.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)': dependencies: '@babel/core': 7.26.0 '@babel/eslint-parser': 7.25.9(@babel/core@7.26.0)(eslint@9.14.0) '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.0) + '@stylistic/eslint-plugin-js': 2.11.0(eslint@9.14.0) ember-template-lint: 6.0.0 eslint: 9.14.0 eslint-plugin-decorator-position: 6.0.0(@babel/eslint-parser@7.25.9(@babel/core@7.26.0)(eslint@9.14.0))(eslint@9.14.0) @@ -2118,6 +2125,12 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} + '@stylistic/eslint-plugin-js@2.11.0(eslint@9.14.0)': + dependencies: + eslint: 9.14.0 + eslint-visitor-keys: 4.2.0 + espree: 10.3.0 + '@types/eslint@8.56.12': dependencies: '@types/estree': 1.0.6