Skip to content

Commit afc578d

Browse files
authored
DEV: Update linting (#50)
1 parent 7d1250d commit afc578d

File tree

6 files changed

+1178
-1294
lines changed

6 files changed

+1178
-1294
lines changed

Gemfile.lock

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.2.1.1)
4+
activesupport (8.0.2)
55
base64
6+
benchmark (>= 0.3)
67
bigdecimal
78
concurrent-ruby (~> 1.0, >= 1.3.1)
89
connection_pool (>= 2.2.5)
@@ -12,68 +13,81 @@ GEM
1213
minitest (>= 5.1)
1314
securerandom (>= 0.3)
1415
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
1517
ast (2.4.2)
1618
base64 (0.2.0)
17-
bigdecimal (3.1.8)
18-
concurrent-ruby (1.3.4)
19-
connection_pool (2.4.1)
19+
benchmark (0.4.0)
20+
bigdecimal (3.1.9)
21+
concurrent-ruby (1.3.5)
22+
connection_pool (2.5.0)
2023
drb (2.2.1)
21-
i18n (1.14.6)
24+
i18n (1.14.7)
2225
concurrent-ruby (~> 1.0)
23-
json (2.7.2)
24-
language_server-protocol (3.17.0.3)
25-
logger (1.6.1)
26-
minitest (5.25.1)
26+
json (2.10.2)
27+
language_server-protocol (3.17.0.4)
28+
lint_roller (1.1.0)
29+
logger (1.6.6)
30+
minitest (5.25.5)
2731
parallel (1.26.3)
28-
parser (3.3.5.0)
32+
parser (3.3.7.1)
2933
ast (~> 2.4.1)
3034
racc
3135
prettier_print (1.2.1)
3236
racc (1.8.1)
33-
rack (3.1.8)
37+
rack (3.1.12)
3438
rainbow (3.1.1)
35-
regexp_parser (2.9.2)
36-
rubocop (1.67.0)
39+
regexp_parser (2.10.0)
40+
rubocop (1.74.0)
3741
json (~> 2.3)
38-
language_server-protocol (>= 3.17.0)
42+
language_server-protocol (~> 3.17.0.2)
43+
lint_roller (~> 1.1.0)
3944
parallel (~> 1.10)
4045
parser (>= 3.3.0.2)
4146
rainbow (>= 2.2.2, < 4.0)
42-
regexp_parser (>= 2.4, < 3.0)
43-
rubocop-ast (>= 1.32.2, < 2.0)
47+
regexp_parser (>= 2.9.3, < 3.0)
48+
rubocop-ast (>= 1.38.0, < 2.0)
4449
ruby-progressbar (~> 1.7)
45-
unicode-display_width (>= 2.4.0, < 3.0)
46-
rubocop-ast (1.32.3)
50+
unicode-display_width (>= 2.4.0, < 4.0)
51+
rubocop-ast (1.39.0)
4752
parser (>= 3.3.1.0)
48-
rubocop-capybara (2.21.0)
49-
rubocop (~> 1.41)
50-
rubocop-discourse (3.8.2)
53+
rubocop-capybara (2.22.1)
54+
lint_roller (~> 1.1)
55+
rubocop (~> 1.72, >= 1.72.1)
56+
rubocop-discourse (3.12.1)
5157
activesupport (>= 6.1)
52-
rubocop (>= 1.59.0)
53-
rubocop-capybara (>= 2.0.0)
54-
rubocop-factory_bot (>= 2.0.0)
55-
rubocop-rails (>= 2.25.0)
58+
lint_roller (>= 1.1.0)
59+
rubocop (>= 1.73.2)
60+
rubocop-capybara (>= 2.22.0)
61+
rubocop-factory_bot (>= 2.27.0)
62+
rubocop-rails (>= 2.30.3)
5663
rubocop-rspec (>= 3.0.1)
57-
rubocop-rspec_rails (>= 2.30.0)
58-
rubocop-factory_bot (2.26.1)
59-
rubocop (~> 1.61)
60-
rubocop-rails (2.26.2)
64+
rubocop-rspec_rails (>= 2.31.0)
65+
rubocop-factory_bot (2.27.1)
66+
lint_roller (~> 1.1)
67+
rubocop (~> 1.72, >= 1.72.1)
68+
rubocop-rails (2.30.3)
6169
activesupport (>= 4.2.0)
70+
lint_roller (~> 1.1)
6271
rack (>= 1.1)
63-
rubocop (>= 1.52.0, < 2.0)
64-
rubocop-ast (>= 1.31.1, < 2.0)
65-
rubocop-rspec (3.1.0)
66-
rubocop (~> 1.61)
67-
rubocop-rspec_rails (2.30.0)
68-
rubocop (~> 1.61)
69-
rubocop-rspec (~> 3, >= 3.0.1)
72+
rubocop (>= 1.72.1, < 2.0)
73+
rubocop-ast (>= 1.38.0, < 2.0)
74+
rubocop-rspec (3.5.0)
75+
lint_roller (~> 1.1)
76+
rubocop (~> 1.72, >= 1.72.1)
77+
rubocop-rspec_rails (2.31.0)
78+
lint_roller (~> 1.1)
79+
rubocop (~> 1.72, >= 1.72.1)
80+
rubocop-rspec (~> 3.5)
7081
ruby-progressbar (1.13.0)
71-
securerandom (0.3.1)
82+
securerandom (0.4.1)
7283
syntax_tree (6.2.0)
7384
prettier_print (>= 1.2.0)
7485
tzinfo (2.0.6)
7586
concurrent-ruby (~> 1.0)
76-
unicode-display_width (2.6.0)
87+
unicode-display_width (3.1.4)
88+
unicode-emoji (~> 4.0, >= 4.0.4)
89+
unicode-emoji (4.0.4)
90+
uri (1.0.3)
7791

7892
PLATFORMS
7993
arm64-darwin-23
@@ -84,4 +98,4 @@ DEPENDENCIES
8498
syntax_tree
8599

86100
BUNDLED WITH
87-
2.5.21
101+
2.6.6

common/common.scss

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
display: none !important;
44
}
55
}
6+
67
@if $display_on_mobile == "false" {
78
.mobile-view .banner-box {
89
display: none !important;
@@ -17,11 +18,14 @@
1718
.above-site-header-outlet {
1819
order: -4;
1920
}
21+
2022
.d-header-wrap {
2123
order: -3;
2224
}
25+
2326
.below-site-header-outlet {
2427
order: -1;
28+
2529
& + .below-site-header-outlet {
2630
order: -2;
2731
}
@@ -37,6 +41,7 @@
3741
#main > div {
3842
.below-site-header-outlet {
3943
order: -2;
44+
4045
& + .below-site-header-outlet {
4146
order: -1;
4247
}
@@ -77,18 +82,20 @@
7782
svg {
7883
color: #646464;
7984
}
85+
8086
.d-button-label {
8187
font-size: 1em;
8288
color: #646464;
8389
}
8490

8591
&:hover {
8692
svg {
87-
color: #222222;
93+
color: #222;
8894
}
95+
8996
.d-button-label {
9097
font-size: 1em;
91-
color: #222222;
98+
color: #222;
9299
}
93100
}
94101

@@ -139,7 +146,7 @@
139146
float: left;
140147
position: relative;
141148
min-height: 1px;
142-
padding: 0px 15px 30px;
149+
padding: 0 15px 30px;
143150
text-align: center;
144151

145152
.icon {
@@ -157,6 +164,7 @@
157164
.banner-list {
158165
display: flex;
159166
justify-content: center;
167+
160168
ul {
161169
text-align: left;
162170
margin: 0;
@@ -177,11 +185,10 @@
177185
}
178186
}
179187

180-
//-------------------------- Setting Based Rules --------------------------//
181-
// Modified using theme settings
182-
//-------------------------------------------------------------------------//
188+
// Setting Based Rules
189+
// Modified using theme settings
183190

184-
////////////// Columns //////////////
191+
// Columns
185192

186193
// First column
187194
@if $first_column_size == "auto" {
@@ -231,7 +238,7 @@
231238
}
232239
}
233240

234-
////////////// Full Width //////////////
241+
// Full Width
235242

236243
@if $full_width_banner == "true" {
237244
#main .banner-box {
@@ -270,6 +277,7 @@
270277
button {
271278
padding: 5px 5px;
272279
}
280+
273281
.d-button-label {
274282
display: none;
275283
}
@@ -301,7 +309,6 @@
301309
// we can't animate with auto height, so we need a big max-height to cover variable content
302310
// if the content is taller than the max-height, this will need to be adjusted
303311
// but if it's too large, clicking collapse animation will feel laggy
304-
305312
#banner-content_wrap {
306313
overflow: hidden;
307314
max-height: 1000px;

javascripts/discourse/components/versatile-banner.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export default class VersatileBanner extends Component {
1111
@service router;
1212
@service site;
1313
@service currentUser;
14+
1415
@tracked bannerClosed = this.cookieClosed || false;
1516
@tracked
1617
bannerCollapsed =

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.4.0",
5-
"ember-template-lint": "6.1.0",
6-
"eslint": "9.19.0",
7-
"prettier": "2.8.8"
4+
"@discourse/lint-configs": "2.11.1",
5+
"ember-template-lint": "7.0.1",
6+
"eslint": "9.22.0",
7+
"prettier": "3.5.3",
8+
"stylelint": "16.16.0"
89
},
910
"engines": {
1011
"node": ">= 22",

0 commit comments

Comments
 (0)