Skip to content

Commit 8614d1c

Browse files
committed
DEV: Update linting
1 parent 77b74be commit 8614d1c

File tree

5 files changed

+1179
-1289
lines changed

5 files changed

+1179
-1289
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

desktop/desktop.scss

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ $sidebar-width: #{$sidebar_width}em;
2020

2121
body.has-sidebar-page & {
2222
grid-template-columns: 1fr minmax(0, var(--d-max-width)) 1fr; // overriding core
23+
2324
.sidebar-wrapper {
2425
width: var(--d-sidebar-width);
2526
}
@@ -79,6 +80,7 @@ $sidebar-width: #{$sidebar_width}em;
7980
.d-header-mode {
8081
grid-area: extra-info;
8182
white-space: nowrap;
83+
8284
@include breakpoint("tablet") {
8385
display: none;
8486
}
@@ -98,9 +100,10 @@ $sidebar-width: #{$sidebar_width}em;
98100
minmax(0, calc(var(--d-max-width)))
99101
1fr
100102
minmax(0, calc(var(--d-sidebar-width) - 11px));
103+
gap: 1em;
101104

102105
// at narrower widths, when 1fr = 0
103-
// we can center without mataching the sidebar's width
106+
// we can center without matching the sidebar's width
104107
// which allows the title to take up the remaining width
105108
@media screen and (max-width: 1400px) {
106109
grid-template-columns:
@@ -110,37 +113,44 @@ $sidebar-width: #{$sidebar_width}em;
110113
1fr
111114
auto;
112115
}
113-
gap: 1em;
116+
114117
@media screen and (max-width: 1000px) {
115118
gap: 0.5em;
116119
}
120+
117121
.d-header-mode {
118122
grid-area: extra-info;
119123
}
120124
}
121125
}
122126
}
127+
123128
.header-sidebar-toggle {
124129
grid-area: logo;
125130
}
131+
126132
.before-header-panel-outlet {
127133
grid-area: extra-info;
128134
}
135+
129136
.d-header-mode {
130137
.bootstrap-mode {
131138
margin: 0;
132139
}
133140
}
141+
134142
.home-logo-wrapper-outlet {
135143
grid-area: logo;
136144
margin-left: 3.7em; // 2.7em hamburger width + 1em for margin
137145
margin-right: 0.725em;
138146
display: flex;
139147
overflow: visible;
148+
140149
.title {
141150
flex: 1 0 auto;
142151
}
143152
}
153+
144154
.panel {
145155
grid-area: panel;
146156
}
@@ -169,6 +179,7 @@ body.has-sidebar-page {
169179
margin-left: auto;
170180
margin-right: auto;
171181
}
182+
172183
.sidebar-container {
173184
height: auto;
174185
}
@@ -178,16 +189,18 @@ body.has-sidebar-page {
178189
#reply-control.show-preview:not(.fullscreen) {
179190
margin-left: $sidebar-width;
180191
width: auto;
181-
//overruling new core composer changes
192+
193+
// overruling new core composer changes
182194
max-width: $reply-area-max-width;
183195
transform: none;
184196
}
197+
185198
.sidebar-container {
186199
height: auto;
187200
}
188201
}
189202

190-
//overruling new core composer changes
203+
// overruling new core composer changes
191204
@media screen and (min-width: $reply-area-max-width) {
192205
#reply-control.show-preview:not(.fullscreen) {
193206
max-width: $reply-area-max-width;
@@ -200,6 +213,7 @@ body.sidebar-animate {
200213
#main-outlet-wrapper {
201214
transition: none;
202215
}
216+
203217
.d-header-wrap .wrap {
204218
transition: none;
205219
}

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)