Skip to content

Commit c14b223

Browse files
authored
DEV: Update linting config and run gjs-codemod (#51)
1 parent afb7f74 commit c14b223

File tree

7 files changed

+450
-988
lines changed

7 files changed

+450
-988
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: afb7f74d62bac2a222ac77494c405c78e78b1c1e
12
< 3.5.0.beta1-dev: e3cf69de1ca1fcd9b05f03baa428b11da49e0f76
23
< 3.4.0.beta1-dev: fb007475e0446ff778945e02fc75f95b5f381087
34
< 3.3.0.beta1-dev: 85dc471b42495e1897c4fc07348b2b221dfaa149

Gemfile.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,41 @@ GEM
1515
tzinfo (~> 2.0, >= 2.0.5)
1616
uri (>= 0.13.1)
1717
ast (2.4.3)
18-
base64 (0.2.0)
19-
benchmark (0.4.0)
20-
bigdecimal (3.1.9)
18+
base64 (0.3.0)
19+
benchmark (0.4.1)
20+
bigdecimal (3.2.2)
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)
2929
logger (1.7.0)
3030
minitest (5.25.5)
31-
parallel (1.26.3)
32-
parser (3.3.7.3)
31+
parallel (1.27.0)
32+
parser (3.3.8.0)
3333
ast (~> 2.4.1)
3434
racc
3535
prettier_print (1.2.1)
3636
prism (1.4.0)
3737
racc (1.8.1)
38-
rack (3.1.12)
38+
rack (3.1.16)
3939
rainbow (3.1.1)
4040
regexp_parser (2.10.0)
41-
rubocop (1.75.1)
41+
rubocop (1.76.0)
4242
json (~> 2.3)
4343
language_server-protocol (~> 3.17.0.2)
4444
lint_roller (~> 1.1.0)
4545
parallel (~> 1.10)
4646
parser (>= 3.3.0.2)
4747
rainbow (>= 2.2.2, < 4.0)
4848
regexp_parser (>= 2.9.3, < 3.0)
49-
rubocop-ast (>= 1.43.0, < 2.0)
49+
rubocop-ast (>= 1.45.0, < 2.0)
5050
ruby-progressbar (~> 1.7)
5151
unicode-display_width (>= 2.4.0, < 4.0)
52-
rubocop-ast (1.43.0)
52+
rubocop-ast (1.45.0)
5353
parser (>= 3.3.7.2)
5454
prism (~> 1.4)
5555
rubocop-capybara (2.22.1)
@@ -67,13 +67,13 @@ GEM
6767
rubocop-factory_bot (2.27.1)
6868
lint_roller (~> 1.1)
6969
rubocop (~> 1.72, >= 1.72.1)
70-
rubocop-rails (2.30.3)
70+
rubocop-rails (2.32.0)
7171
activesupport (>= 4.2.0)
7272
lint_roller (~> 1.1)
7373
rack (>= 1.1)
74-
rubocop (>= 1.72.1, < 2.0)
75-
rubocop-ast (>= 1.38.0, < 2.0)
76-
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)
7777
lint_roller (~> 1.1)
7878
rubocop (~> 1.72, >= 1.72.1)
7979
rubocop-rspec_rails (2.31.0)
@@ -100,4 +100,4 @@ DEPENDENCIES
100100
syntax_tree
101101

102102
BUNDLED WITH
103-
2.6.6
103+
2.6.9

common/common.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ body textarea {
3030
@mixin boxShadow {
3131
// Matched from https://material.io/components/cards/
3232
box-shadow:
33-
0 2px 1px -1px rgba(0, 0, 0, 0.2),
34-
0 1px 1px 0 rgba(0, 0, 0, 0.14),
35-
0 1px 3px 0 rgba(0, 0, 0, 0.12);
33+
0 2px 1px -1px rgb(0, 0, 0, 0.2),
34+
0 1px 1px 0 rgb(0, 0, 0, 0.14),
35+
0 1px 3px 0 rgb(0, 0, 0, 0.12);
3636
}
3737

3838
@mixin buttonShadow {
3939
// Matched from https://material.io/components/buttons/
4040
box-shadow:
41-
0 3px 1px -2px rgba(0, 0, 0, 0.2),
42-
0 2px 2px 0 rgba(0, 0, 0, 0.14),
43-
0 1px 5px 0 rgba(0, 0, 0, 0.12);
41+
0 3px 1px -2px rgb(0, 0, 0, 0.2),
42+
0 2px 2px 0 rgb(0, 0, 0, 0.14),
43+
0 1px 5px 0 rgb(0, 0, 0, 0.12);
4444
}
4545

4646
@import "sidebar";
@@ -86,8 +86,8 @@ body textarea {
8686
border: none;
8787
border-radius: 4px;
8888
box-shadow:
89-
0 2px 5px 0 rgba(0, 0, 0, 0.16),
90-
0 0 0 0 rgba(0, 0, 0, 0.12);
89+
0 2px 5px 0 rgb(0, 0, 0, 0.16),
90+
0 0 0 0 rgb(0, 0, 0, 0.12);
9191
max-width: 754px;
9292
padding-left: 20px;
9393

@@ -172,8 +172,8 @@ body.has-sidebar-page.has-full-page-chat #main-outlet-wrapper {
172172
border: none;
173173
border-radius: 4px;
174174
box-shadow:
175-
0 2px 5px 0 rgba(0, 0, 0, 0.16),
176-
0 0 0 0 rgba(0, 0, 0, 0.12);
175+
0 2px 5px 0 rgb(0, 0, 0, 0.16),
176+
0 0 0 0 rgb(0, 0, 0, 0.12);
177177

178178
.desktop-view & {
179179
padding: 15px 30px;

desktop/desktop.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
@mixin boxShadow {
55
box-shadow:
6-
0 2px 5px 0 rgba(0, 0, 0, 0.16),
7-
0 0 0 0 rgba(0, 0, 0, 0.12);
6+
0 2px 5px 0 rgb(0, 0, 0, 0.16),
7+
0 0 0 0 rgb(0, 0, 0, 0.12);
88
}
99

1010
@mixin buttonShadow {
1111
box-shadow:
12-
0 0 4px rgba(0, 0, 0, 0.14),
13-
0 4px 8px rgba(0, 0, 0, 0.28);
12+
0 0 4px rgb(0, 0, 0, 0.14),
13+
0 4px 8px rgb(0, 0, 0, 0.28);
1414
}
1515

1616
@mixin buttonTransition {
@@ -113,7 +113,7 @@
113113

114114
// darken color, remove shadow and border when pressed
115115
.btn:active {
116-
background-color: rgba(0, 0, 0, 0.4);
116+
background-color: rgb(0, 0, 0, 0.4);
117117
box-shadow: none;
118118
}
119119

@@ -144,7 +144,7 @@
144144
bottom: 60px;
145145
}
146146

147-
@media screen and (max-width: 1520px) {
147+
@media screen and (width <= 1520px) {
148148
body:has(#reply-control.draft.show-preview) & {
149149
bottom: 60px;
150150
}
@@ -216,7 +216,7 @@
216216
}
217217

218218
// Proper spacing for iPad portrait
219-
@media only screen and (min-width: 768px) and (max-width: 1250px) {
219+
@media only screen and (width >= 768px) and (width <= 1250px) {
220220
.timeline-container {
221221
margin-left: 820px;
222222
}
@@ -298,7 +298,7 @@
298298
}
299299

300300
// RTL Overrides
301-
@media only screen and (min-width: 768px) and (max-width: 1250px) {
301+
@media only screen and (width >= 768px) and (width <= 1250px) {
302302
.rtl {
303303
.timeline-container {
304304
margin-left: initial;
@@ -331,7 +331,7 @@
331331
#main-chat-outlet {
332332
margin-top: 1.5em;
333333
box-shadow:
334-
0 2px 1px -1px rgba(0, 0, 0, 0.2),
335-
0 1px 1px 0 rgba(0, 0, 0, 0.14),
336-
0 1px 3px 0 rgba(0, 0, 0, 0.12);
334+
0 2px 1px -1px rgb(0, 0, 0, 0.2),
335+
0 1px 1px 0 rgb(0, 0, 0, 0.14),
336+
0 1px 3px 0 rgb(0, 0, 0, 0.12);
337337
}

mobile/mobile.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@mixin boxShadow {
22
box-shadow:
3-
0 2px 5px 0 rgba(0, 0, 0, 0.16),
4-
0 0 0 0 rgba(0, 0, 0, 0.12);
3+
0 2px 5px 0 rgb(0, 0, 0, 0.16),
4+
0 0 0 0 rgb(0, 0, 0, 0.12);
55
}
66

77
.list-controls .container {

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.25.0",
5+
"ember-template-lint": "7.8.1",
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)