Skip to content

Commit b223491

Browse files
authored
DEV: Update linting config and run gjs-codemod (#30)
* DEV: Update linting config and run gjs-codemod * DEV: Update linting config and run gjs-codemod
1 parent 4a8ce65 commit b223491

File tree

8 files changed

+472
-994
lines changed

8 files changed

+472
-994
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: 4a8ce655efed28530bf3622c2d829a30023f1bcb
12
< 3.5.0.beta1-dev: ebce5dd94347ec1824842e6846ffd7ed6d9336f1
23
< 3.4.0.beta1-dev: e5be2939e575f2eb5675d5d2a01b8d6457e860ef
34
< 3.3.0.beta1-dev: 55dcf9110a79e7798c3baa9108e01457565a5702

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

javascripts/discourse/components/poll-banner.js renamed to javascripts/discourse/components/poll-banner.gjs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Component from "@ember/component";
22
import { action } from "@ember/object";
33
import { classNameBindings } from "@ember-decorators/component";
4+
import DButton from "discourse/components/d-button";
5+
import htmlSafe from "discourse/helpers/html-safe";
46
import { ajax } from "discourse/lib/ajax";
57
import PostCooked from "discourse/widgets/post-cooked";
68

@@ -107,4 +109,17 @@ export default class PollBanner extends Component {
107109
.classList.remove("visible-poll");
108110
this.set("showPoll", false);
109111
}
112+
113+
<template>
114+
<div class="poll-banner-content">
115+
{{htmlSafe this.cooked}}
116+
<DButton
117+
class="btn-flat"
118+
@action={{action "closePoll"}}
119+
@icon="times"
120+
@label="share.close"
121+
/>
122+
<div class="poll-banner-key">{{settings.poll_key}}</div>
123+
</div>
124+
</template>
110125
}

javascripts/discourse/components/poll-banner.hbs

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Component from "@ember/component";
2+
import { classNames } from "@ember-decorators/component";
3+
import PollBanner from "../../components/poll-banner";
4+
5+
@classNames("above-main-container-outlet", "poll-banner-connector")
6+
export default class PollBannerConnector extends Component {
7+
<template>
8+
{{#if this.currentUser}}
9+
<PollBanner />
10+
{{/if}}
11+
</template>
12+
}

javascripts/discourse/connectors/above-main-container/poll-banner-connector.hbs

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