mirror of
https://github.com/discourse/discourse-custom-header-links.git
synced 2025-06-30 02:12:10 +00:00
DEV: Update linting config and run gjs-codemod (#87)
* DEV: Update linting config and run gjs-codemod * DEV: Update linting config and run gjs-codemod
This commit is contained in:
parent
76ecc5abb1
commit
d1dcad91f3
@ -1,3 +1,4 @@
|
|||||||
|
< 3.5.0.beta5-dev: 76ecc5abb19aad9f7d817a83812fc10ef3a441d7
|
||||||
< 3.5.0.beta1-dev: 95c48fafe4241c063f815711e1f9b1d1610f23d9
|
< 3.5.0.beta1-dev: 95c48fafe4241c063f815711e1f9b1d1610f23d9
|
||||||
< 3.4.0.beta1-dev: 5addd017de59124d749611010d34f7605226f668
|
< 3.4.0.beta1-dev: 5addd017de59124d749611010d34f7605226f668
|
||||||
< 3.3.0.beta2-dev: 0a837d7c044798417b1a7389cc37a67859c25dbe
|
< 3.3.0.beta2-dev: 0a837d7c044798417b1a7389cc37a67859c25dbe
|
||||||
|
44
Gemfile.lock
44
Gemfile.lock
@ -14,30 +14,31 @@ GEM
|
|||||||
securerandom (>= 0.3)
|
securerandom (>= 0.3)
|
||||||
tzinfo (~> 2.0, >= 2.0.5)
|
tzinfo (~> 2.0, >= 2.0.5)
|
||||||
uri (>= 0.13.1)
|
uri (>= 0.13.1)
|
||||||
ast (2.4.2)
|
ast (2.4.3)
|
||||||
base64 (0.2.0)
|
base64 (0.3.0)
|
||||||
benchmark (0.4.0)
|
benchmark (0.4.1)
|
||||||
bigdecimal (3.1.9)
|
bigdecimal (3.2.1)
|
||||||
concurrent-ruby (1.3.5)
|
concurrent-ruby (1.3.5)
|
||||||
connection_pool (2.5.0)
|
connection_pool (2.5.3)
|
||||||
drb (2.2.1)
|
drb (2.2.3)
|
||||||
i18n (1.14.7)
|
i18n (1.14.7)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
json (2.10.2)
|
json (2.12.2)
|
||||||
language_server-protocol (3.17.0.4)
|
language_server-protocol (3.17.0.5)
|
||||||
lint_roller (1.1.0)
|
lint_roller (1.1.0)
|
||||||
logger (1.6.6)
|
logger (1.7.0)
|
||||||
minitest (5.25.5)
|
minitest (5.25.5)
|
||||||
parallel (1.26.3)
|
parallel (1.27.0)
|
||||||
parser (3.3.7.1)
|
parser (3.3.8.0)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
racc
|
racc
|
||||||
prettier_print (1.2.1)
|
prettier_print (1.2.1)
|
||||||
|
prism (1.4.0)
|
||||||
racc (1.8.1)
|
racc (1.8.1)
|
||||||
rack (3.1.12)
|
rack (3.1.15)
|
||||||
rainbow (3.1.1)
|
rainbow (3.1.1)
|
||||||
regexp_parser (2.10.0)
|
regexp_parser (2.10.0)
|
||||||
rubocop (1.74.0)
|
rubocop (1.76.0)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (~> 3.17.0.2)
|
language_server-protocol (~> 3.17.0.2)
|
||||||
lint_roller (~> 1.1.0)
|
lint_roller (~> 1.1.0)
|
||||||
@ -45,11 +46,12 @@ GEM
|
|||||||
parser (>= 3.3.0.2)
|
parser (>= 3.3.0.2)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
regexp_parser (>= 2.9.3, < 3.0)
|
regexp_parser (>= 2.9.3, < 3.0)
|
||||||
rubocop-ast (>= 1.38.0, < 2.0)
|
rubocop-ast (>= 1.45.0, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 4.0)
|
unicode-display_width (>= 2.4.0, < 4.0)
|
||||||
rubocop-ast (1.39.0)
|
rubocop-ast (1.45.0)
|
||||||
parser (>= 3.3.1.0)
|
parser (>= 3.3.7.2)
|
||||||
|
prism (~> 1.4)
|
||||||
rubocop-capybara (2.22.1)
|
rubocop-capybara (2.22.1)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rubocop (~> 1.72, >= 1.72.1)
|
rubocop (~> 1.72, >= 1.72.1)
|
||||||
@ -65,13 +67,13 @@ GEM
|
|||||||
rubocop-factory_bot (2.27.1)
|
rubocop-factory_bot (2.27.1)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rubocop (~> 1.72, >= 1.72.1)
|
rubocop (~> 1.72, >= 1.72.1)
|
||||||
rubocop-rails (2.30.3)
|
rubocop-rails (2.32.0)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
rubocop (>= 1.72.1, < 2.0)
|
rubocop (>= 1.75.0, < 2.0)
|
||||||
rubocop-ast (>= 1.38.0, < 2.0)
|
rubocop-ast (>= 1.44.0, < 2.0)
|
||||||
rubocop-rspec (3.5.0)
|
rubocop-rspec (3.6.0)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rubocop (~> 1.72, >= 1.72.1)
|
rubocop (~> 1.72, >= 1.72.1)
|
||||||
rubocop-rspec_rails (2.31.0)
|
rubocop-rspec_rails (2.31.0)
|
||||||
@ -98,4 +100,4 @@ DEPENDENCIES
|
|||||||
syntax_tree
|
syntax_tree
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.6.6
|
2.6.9
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
import Component from "@glimmer/component";
|
import Component from "@glimmer/component";
|
||||||
import { dasherize } from "@ember/string";
|
import { dasherize } from "@ember/string";
|
||||||
|
import concatClass from "discourse/helpers/concat-class";
|
||||||
|
|
||||||
function normalizeLocale(locale) {
|
function normalizeLocale(locale) {
|
||||||
return locale?.trim().toLowerCase().replace(/[-_]/g, "_");
|
return locale?.trim().toLowerCase().replace(/[-_]/g, "_");
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class CustomHeaderLinks extends Component {
|
export default class CustomHeaderLinks extends Component {
|
||||||
get shouldShow() {
|
get shouldShow() {
|
||||||
return settings.custom_header_links?.length > 0;
|
return settings.custom_header_links?.length > 0;
|
||||||
@ -45,4 +47,33 @@ export default class CustomHeaderLinks extends Component {
|
|||||||
return result;
|
return result;
|
||||||
}, []);
|
}, []);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<template>
|
||||||
|
{{#if this.shouldShow}}
|
||||||
|
<ul
|
||||||
|
class="custom-header-links
|
||||||
|
{{if @outletArgs.topicInfoVisible 'custom-header-links--hide-links'}}"
|
||||||
|
>
|
||||||
|
{{#each this.links as |link|}}
|
||||||
|
<li
|
||||||
|
class={{concatClass
|
||||||
|
"headerLink"
|
||||||
|
link.device
|
||||||
|
link.locale
|
||||||
|
link.linkClass
|
||||||
|
link.hideOnScroll
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
title={{link.anchorAttributes.title}}
|
||||||
|
href={{link.anchorAttributes.href}}
|
||||||
|
target={{link.anchorAttributes.target}}
|
||||||
|
>
|
||||||
|
{{link.linkText}}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{{/each}}
|
||||||
|
</ul>
|
||||||
|
{{/if}}
|
||||||
|
</template>
|
||||||
}
|
}
|
@ -1,26 +0,0 @@
|
|||||||
{{#if this.shouldShow}}
|
|
||||||
<ul
|
|
||||||
class="custom-header-links
|
|
||||||
{{if @outletArgs.topicInfoVisible 'custom-header-links--hide-links'}}"
|
|
||||||
>
|
|
||||||
{{#each this.links as |link|}}
|
|
||||||
<li
|
|
||||||
class={{concat-class
|
|
||||||
"headerLink"
|
|
||||||
link.device
|
|
||||||
link.locale
|
|
||||||
link.linkClass
|
|
||||||
link.hideOnScroll
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
title={{link.anchorAttributes.title}}
|
|
||||||
href={{link.anchorAttributes.href}}
|
|
||||||
target={{link.anchorAttributes.target}}
|
|
||||||
>
|
|
||||||
{{link.linkText}}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{{/each}}
|
|
||||||
</ul>
|
|
||||||
{{/if}}
|
|
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"private": true,
|
"private": true,
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@discourse/lint-configs": "2.11.1",
|
"@discourse/lint-configs": "2.25.0",
|
||||||
"ember-template-lint": "7.0.1",
|
"ember-template-lint": "7.8.1",
|
||||||
"eslint": "9.22.0",
|
"eslint": "9.28.0",
|
||||||
"prettier": "3.5.3",
|
"prettier": "3.5.3",
|
||||||
"stylelint": "16.16.0"
|
"stylelint": "16.20.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 22",
|
"node": ">= 22",
|
||||||
|
1371
pnpm-lock.yaml
generated
1371
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user