Skip to content

Commit 4e3521f

Browse files
authored
DEV: Update linting (#340)
1 parent 17d0f09 commit 4e3521f

File tree

7 files changed

+1174
-1312
lines changed

7 files changed

+1174
-1312
lines changed

Gemfile.lock

Lines changed: 60 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,93 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.3.3)
4+
activesupport (8.0.2)
55
base64
6+
benchmark (>= 0.3)
67
bigdecimal
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
89
connection_pool (>= 2.2.5)
910
drb
1011
i18n (>= 1.6, < 2)
12+
logger (>= 1.4.2)
1113
minitest (>= 5.1)
12-
mutex_m
13-
tzinfo (~> 2.0)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
1417
ast (2.4.2)
1518
base64 (0.2.0)
16-
bigdecimal (3.1.8)
17-
concurrent-ruby (1.2.3)
18-
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)
1923
drb (2.2.1)
20-
i18n (1.14.5)
24+
i18n (1.14.7)
2125
concurrent-ruby (~> 1.0)
22-
json (2.7.2)
23-
language_server-protocol (3.17.0.3)
24-
minitest (5.23.1)
25-
mutex_m (0.2.0)
26-
parallel (1.24.0)
27-
parser (3.3.1.0)
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)
31+
parallel (1.26.3)
32+
parser (3.3.7.1)
2833
ast (~> 2.4.1)
2934
racc
3035
prettier_print (1.2.1)
31-
racc (1.8.0)
32-
rack (3.0.12)
36+
racc (1.8.1)
37+
rack (3.1.12)
3338
rainbow (3.1.1)
34-
regexp_parser (2.9.2)
35-
rexml (3.3.9)
36-
rubocop (1.64.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 (>= 1.8, < 3.0)
43-
rexml (>= 3.2.5, < 4.0)
44-
rubocop-ast (>= 1.31.1, < 2.0)
47+
regexp_parser (>= 2.9.3, < 3.0)
48+
rubocop-ast (>= 1.38.0, < 2.0)
4549
ruby-progressbar (~> 1.7)
46-
unicode-display_width (>= 2.4.0, < 3.0)
47-
rubocop-ast (1.31.3)
50+
unicode-display_width (>= 2.4.0, < 4.0)
51+
rubocop-ast (1.38.1)
4852
parser (>= 3.3.1.0)
49-
rubocop-capybara (2.20.0)
50-
rubocop (~> 1.41)
51-
rubocop-discourse (3.8.0)
53+
rubocop-capybara (2.22.1)
54+
lint_roller (~> 1.1)
55+
rubocop (~> 1.72, >= 1.72.1)
56+
rubocop-discourse (3.12.1)
5257
activesupport (>= 6.1)
53-
rubocop (>= 1.59.0)
54-
rubocop-capybara (>= 2.0.0)
55-
rubocop-factory_bot (>= 2.0.0)
56-
rubocop-rails (>= 2.25.0)
57-
rubocop-rspec (>= 2.25.0)
58-
rubocop-factory_bot (2.25.1)
59-
rubocop (~> 1.41)
60-
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)
63+
rubocop-rspec (>= 3.0.1)
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.33.0, < 2.0)
64-
rubocop-ast (>= 1.31.1, < 2.0)
65-
rubocop-rspec (2.29.2)
66-
rubocop (~> 1.40)
67-
rubocop-capybara (~> 2.17)
68-
rubocop-factory_bot (~> 2.22)
69-
rubocop-rspec_rails (~> 2.28)
70-
rubocop-rspec_rails (2.28.3)
71-
rubocop (~> 1.40)
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)
7281
ruby-progressbar (1.13.0)
82+
securerandom (0.4.1)
7383
syntax_tree (6.2.0)
7484
prettier_print (>= 1.2.0)
7585
tzinfo (2.0.6)
7686
concurrent-ruby (~> 1.0)
77-
unicode-display_width (2.5.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)
7891

7992
PLATFORMS
8093
ruby
@@ -84,4 +97,4 @@ DEPENDENCIES
8497
syntax_tree
8598

8699
BUNDLED WITH
87-
2.5.10
100+
2.6.6

assets/javascripts/discourse/initializers/add-topic-list-class.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
1-
import TopicListItem from "discourse/components/topic-list-item";
2-
import discourseComputed from "discourse/lib/decorators";
3-
import { withSilencedDeprecations } from "discourse/lib/deprecated";
41
import { withPluginApi } from "discourse/lib/plugin-api";
52

63
export default {
74
name: "add-topic-list-class",
85

96
initialize() {
107
withPluginApi("1.39.0", (api) => {
11-
// TODO: cvx - remove after the glimmer topic list transition
12-
withSilencedDeprecations("discourse.hbr-topic-list-overrides", () => {
13-
TopicListItem.reopen({
14-
@discourseComputed()
15-
unboundClassNames() {
16-
let classList = this._super(...arguments);
17-
if (this.topic.has_accepted_answer) {
18-
classList += " status-solved";
19-
}
20-
return classList;
21-
},
22-
});
23-
});
24-
258
api.registerValueTransformer(
269
"topic-list-item-class",
2710
({ value, context }) => {

assets/stylesheets/mobile/solutions.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
white-space: nowrap;
1111
}
1212
}
13+
1314
&.expanded {
1415
.accepted,
1516
.unaccepted {

assets/stylesheets/solutions.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $solved-color: green;
44
&.solved-status-filter {
55
min-width: auto;
66
margin-right: 0.5em;
7+
78
.select-kit-header {
89
color: var(--primary-high);
910
}
@@ -18,6 +19,7 @@ $solved-color: green;
1819
// anon text
1920
.accepted-text {
2021
white-space: nowrap;
22+
2123
.d-icon,
2224
.accepted-label {
2325
color: $solved-color;
@@ -36,10 +38,12 @@ $solved-color: green;
3638
.post-controls span.accepted-text {
3739
padding: 8px 10px;
3840
font-size: $font-up-1;
41+
3942
span {
4043
display: inline-block;
4144
padding: 8px 1px;
4245
}
46+
4347
.accepted-label {
4448
margin-left: 7px;
4549
}
@@ -53,9 +57,8 @@ $solved-color: green;
5357
.by {
5458
display: none;
5559
}
56-
5760
margin-top: 20px;
58-
margin-bottom: 0px;
61+
margin-bottom: 0;
5962
font-size: 13px;
6063
}
6164

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)