Skip to content

Commit def8ece

Browse files
authored
DEV: Update linting config and run gjs-codemod (#89)
1 parent 98a570a commit def8ece

File tree

6 files changed

+504
-490
lines changed

6 files changed

+504
-490
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: 9834dba01aff6644bd2fb9d1ed700854394a4bdf
12
< 3.5.0.beta1-dev: 46f0eec457a4f01a60566eb31f2c0f16b83ddc01
23
< 3.4.0.beta1-dev: e0f24180bbf475a0f8f836363120425d9fc2e717
34
< 3.3.0.beta1-dev: 47ec4d03d96a5658f43ede013d64e41814bd5c6d

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.0)
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.75.8)
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.44.0, < 2.0)
4950
ruby-progressbar (~> 1.7)
5051
unicode-display_width (>= 2.4.0, < 4.0)
51-
rubocop-ast (1.38.1)
52-
parser (>= 3.3.1.0)
52+
rubocop-ast (1.44.1)
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)
@@ -97,4 +99,4 @@ DEPENDENCIES
9799
syntax_tree
98100

99101
BUNDLED WITH
100-
2.6.6
102+
2.6.9
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import Component, { Input } from "@ember/component";
2+
import { classNames, tagName } from "@ember-decorators/component";
3+
import DEditor from "discourse/components/d-editor";
4+
import { i18n } from "discourse-i18n";
5+
6+
@tagName("div")
7+
@classNames("user-custom-preferences-outlet", "signature-preferences")
8+
export default class SignaturePreferences extends Component {
9+
<template>
10+
{{#if this.siteSettings.signatures_enabled}}
11+
<div class="control-group signatures">
12+
<label class="control-label">{{i18n
13+
"signatures.enable_signatures"
14+
}}</label>
15+
<div class="controls">
16+
<label class="checkbox-label">
17+
<Input @type="checkbox" @checked={{this.model.see_signatures}} />
18+
{{i18n "signatures.show_signatures"}}
19+
</label>
20+
</div>
21+
</div>
22+
<div class="control-group signatures">
23+
<label class="control-label">{{i18n "signatures.my_signature"}}</label>
24+
{{#if this.siteSettings.signatures_advanced_mode}}
25+
<DEditor
26+
@value={{this.model.custom_fields.signature_raw}}
27+
@showUploadModal="showUploadModal"
28+
/>
29+
{{else}}
30+
<Input
31+
@type="text"
32+
class="input-xxlarge"
33+
placeholder={{i18n "signatures.signature_placeholder"}}
34+
@value={{this.model.custom_fields.signature_url}}
35+
/>
36+
{{/if}}
37+
</div>
38+
{{/if}}
39+
</template>
40+
}

assets/javascripts/discourse/connectors/user-custom-preferences/signature-preferences.hbs

Lines changed: 0 additions & 27 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.23.0",
5+
"ember-template-lint": "7.7.0",
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)