Skip to content

Commit 350ec34

Browse files
authored
DEV: Update linting config and run gjs-codemod (#54)
* DEV: Update linting config and run gjs-codemod * DEV: Update linting config and run gjs-codemod
1 parent 474d4f4 commit 350ec34

File tree

12 files changed

+488
-1021
lines changed

12 files changed

+488
-1021
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: 474d4f430bbe3dd08a7f2dbd80df9eff1945c9b8
12
< 3.5.0.beta1-dev: 342894f08cf2d3608042bcc9dc671696de3084ce
23
< 3.4.0.beta1-dev: 6fcb8d5605b2c18fca8dc401343441eb261f7e18
34
< 3.3.0.beta1-dev: c23bcfa51b63de3f43a08e9013e35e1246aade71

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.76.0)
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.45.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.45.0)
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

common/common.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
padding: 2em 2em 1em;
3737
border-top: 8px solid var(--tertiary);
3838
box-shadow:
39-
0 8px 60px 0 rgba(103, 151, 255, 0.1),
40-
0 12px 90px 0 rgba(133, 255, 103, 0.1);
39+
0 8px 60px 0 rgb(103, 151, 255, 0.1),
40+
0 12px 90px 0 rgb(133, 255, 103, 0.1);
4141

4242
@include mint-card-bg;
4343

@@ -90,8 +90,8 @@
9090
.container.list-container {
9191
border-radius: var(--mint-border-radius);
9292
box-shadow:
93-
0 8px 60px 0 rgba(103, 151, 255, 0.1),
94-
0 12px 90px 0 rgba(133, 255, 103, 0.1);
93+
0 8px 60px 0 rgb(103, 151, 255, 0.1),
94+
0 12px 90px 0 rgb(133, 255, 103, 0.1);
9595
padding: 2em;
9696
border-top: 8px solid var(--tertiary);
9797
margin-top: 0.8em;
@@ -134,7 +134,7 @@ a {
134134
border-top: 8px solid;
135135
background: var(--secondary);
136136
border-radius: var(--mint-border-radius);
137-
box-shadow: 0 2px 3px 0 rgba(2, 47, 57, 0.14);
137+
box-shadow: 0 2px 3px 0 rgb(2, 47, 57, 0.14);
138138

139139
.category-box-inner {
140140
border: none;
@@ -146,13 +146,13 @@ a {
146146
}
147147

148148
&:hover {
149-
box-shadow: 0 40px 30px 0 rgba(2, 47, 57, 0.1);
149+
box-shadow: 0 40px 30px 0 rgb(2, 47, 57, 0.1);
150150
transform: translateY(-2px);
151151
}
152152
}
153153
}
154154

155-
@media (max-width: 960px) {
155+
@media (width <= 960px) {
156156
.category-boxes.with-logos.with-subcategories {
157157
grid-template-columns: 1fr;
158158
}
@@ -161,7 +161,7 @@ a {
161161
.category-list-item.category {
162162
border-radius: var(--mint-border-radius);
163163
border-right: 1px solid var(--primary-low) !important;
164-
box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.1);
164+
box-shadow: 0 0 4px 0 rgb(0, 0, 0, 0.1);
165165
margin: 0 0.59em 2em 0.59em;
166166
background: var(--primary-very-low);
167167
}

desktop/desktop.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
body:not(.navigation-categories, .navigation-topics) #main-outlet {
44
border-radius: var(--mint-border-radius);
55
box-shadow:
6-
0 8px 60px 0 rgba(103, 151, 255, 0.1),
7-
0 12px 90px 0 rgba(133, 255, 103, 0.1);
6+
0 8px 60px 0 rgb(103, 151, 255, 0.1),
7+
0 12px 90px 0 rgb(133, 255, 103, 0.1);
88
padding: 2em;
99
border-top: 8px solid $tertiary;
1010
margin-top: 1em;
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import Component from "@ember/component";
2+
import { classNames } from "@ember-decorators/component";
3+
import { optionalRequire } from "discourse/lib/utilities";
4+
5+
const TwoTopicList = optionalRequire(
6+
"discourse/plugins/discourse-showcased-categories/discourse/components/two-topic-list"
7+
);
8+
const SearchBanner = optionalRequire(
9+
"discourse/plugins/discourse-search-banner/discourse/components/search-banner"
10+
);
11+
12+
@classNames("above-main-container-outlet", "mint-component-extensions")
13+
export default class MintComponentExtensions extends Component {
14+
<template>
15+
{{#if SearchBanner}}
16+
<div class="search-banner">
17+
<SearchBanner />
18+
</div>
19+
{{/if}}
20+
21+
{{#if TwoTopicList}}
22+
<TwoTopicList />
23+
{{/if}}
24+
</template>
25+
}

javascripts/discourse/connectors/above-main-container/mint-component-extensions.hbs

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

javascripts/discourse/connectors/above-main-container/mint-component-extensions.js

Lines changed: 0 additions & 13 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.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)