Skip to content

Commit f012c99

Browse files
committed
DEV: Update linting config and run gjs-codemod
1 parent 76ecc5a commit f012c99

File tree

6 files changed

+495
-489
lines changed

6 files changed

+495
-489
lines changed

.discourse-compatibility

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
< 3.5.0.beta5-dev: 76ecc5abb19aad9f7d817a83812fc10ef3a441d7
12
< 3.5.0.beta1-dev: 95c48fafe4241c063f815711e1f9b1d1610f23d9
23
< 3.4.0.beta1-dev: 5addd017de59124d749611010d34f7605226f668
34
< 3.3.0.beta2-dev: 0a837d7c044798417b1a7389cc37a67859c25dbe

Gemfile.lock

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,44 @@ GEM
1414
securerandom (>= 0.3)
1515
tzinfo (~> 2.0, >= 2.0.5)
1616
uri (>= 0.13.1)
17-
ast (2.4.2)
18-
base64 (0.2.0)
19-
benchmark (0.4.0)
20-
bigdecimal (3.1.9)
17+
ast (2.4.3)
18+
base64 (0.3.0)
19+
benchmark (0.4.1)
20+
bigdecimal (3.2.1)
2121
concurrent-ruby (1.3.5)
22-
connection_pool (2.5.0)
23-
drb (2.2.1)
22+
connection_pool (2.5.3)
23+
drb (2.2.3)
2424
i18n (1.14.7)
2525
concurrent-ruby (~> 1.0)
26-
json (2.10.2)
27-
language_server-protocol (3.17.0.4)
26+
json (2.12.2)
27+
language_server-protocol (3.17.0.5)
2828
lint_roller (1.1.0)
29-
logger (1.6.6)
29+
logger (1.7.0)
3030
minitest (5.25.5)
31-
parallel (1.26.3)
32-
parser (3.3.7.1)
31+
parallel (1.27.0)
32+
parser (3.3.8.0)
3333
ast (~> 2.4.1)
3434
racc
3535
prettier_print (1.2.1)
36+
prism (1.4.0)
3637
racc (1.8.1)
37-
rack (3.1.12)
38+
rack (3.1.15)
3839
rainbow (3.1.1)
3940
regexp_parser (2.10.0)
40-
rubocop (1.74.0)
41+
rubocop (1.75.8)
4142
json (~> 2.3)
4243
language_server-protocol (~> 3.17.0.2)
4344
lint_roller (~> 1.1.0)
4445
parallel (~> 1.10)
4546
parser (>= 3.3.0.2)
4647
rainbow (>= 2.2.2, < 4.0)
4748
regexp_parser (>= 2.9.3, < 3.0)
48-
rubocop-ast (>= 1.38.0, < 2.0)
49+
rubocop-ast (>= 1.44.0, < 2.0)
4950
ruby-progressbar (~> 1.7)
5051
unicode-display_width (>= 2.4.0, < 4.0)
51-
rubocop-ast (1.39.0)
52-
parser (>= 3.3.1.0)
52+
rubocop-ast (1.44.1)
53+
parser (>= 3.3.7.2)
54+
prism (~> 1.4)
5355
rubocop-capybara (2.22.1)
5456
lint_roller (~> 1.1)
5557
rubocop (~> 1.72, >= 1.72.1)
@@ -65,13 +67,13 @@ GEM
6567
rubocop-factory_bot (2.27.1)
6668
lint_roller (~> 1.1)
6769
rubocop (~> 1.72, >= 1.72.1)
68-
rubocop-rails (2.30.3)
70+
rubocop-rails (2.32.0)
6971
activesupport (>= 4.2.0)
7072
lint_roller (~> 1.1)
7173
rack (>= 1.1)
72-
rubocop (>= 1.72.1, < 2.0)
73-
rubocop-ast (>= 1.38.0, < 2.0)
74-
rubocop-rspec (3.5.0)
74+
rubocop (>= 1.75.0, < 2.0)
75+
rubocop-ast (>= 1.44.0, < 2.0)
76+
rubocop-rspec (3.6.0)
7577
lint_roller (~> 1.1)
7678
rubocop (~> 1.72, >= 1.72.1)
7779
rubocop-rspec_rails (2.31.0)
@@ -98,4 +100,4 @@ DEPENDENCIES
98100
syntax_tree
99101

100102
BUNDLED WITH
101-
2.6.6
103+
2.6.9

javascripts/discourse/components/custom-header-links.js renamed to javascripts/discourse/components/custom-header-links.gjs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import Component from "@glimmer/component";
22
import { dasherize } from "@ember/string";
3+
import concatClass from "discourse/helpers/concat-class";
34

45
function normalizeLocale(locale) {
56
return locale?.trim().toLowerCase().replace(/[-_]/g, "_");
67
}
8+
79
export default class CustomHeaderLinks extends Component {
810
get shouldShow() {
911
return settings.custom_header_links?.length > 0;
@@ -45,4 +47,33 @@ export default class CustomHeaderLinks extends Component {
4547
return result;
4648
}, []);
4749
}
50+
51+
<template>
52+
{{#if this.shouldShow}}
53+
<ul
54+
class="custom-header-links
55+
{{if @outletArgs.topicInfoVisible 'custom-header-links--hide-links'}}"
56+
>
57+
{{#each this.links as |link|}}
58+
<li
59+
class={{concatClass
60+
"headerLink"
61+
link.device
62+
link.locale
63+
link.linkClass
64+
link.hideOnScroll
65+
}}
66+
>
67+
<a
68+
title={{link.anchorAttributes.title}}
69+
href={{link.anchorAttributes.href}}
70+
target={{link.anchorAttributes.target}}
71+
>
72+
{{link.linkText}}
73+
</a>
74+
</li>
75+
{{/each}}
76+
</ul>
77+
{{/if}}
78+
</template>
4879
}

javascripts/discourse/components/custom-header-links.hbs

Lines changed: 0 additions & 26 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.11.1",
5-
"ember-template-lint": "7.0.1",
6-
"eslint": "9.22.0",
4+
"@discourse/lint-configs": "2.23.0",
5+
"ember-template-lint": "7.7.0",
6+
"eslint": "9.28.0",
77
"prettier": "3.5.3",
8-
"stylelint": "16.16.0"
8+
"stylelint": "16.20.0"
99
},
1010
"engines": {
1111
"node": ">= 22",

0 commit comments

Comments
 (0)