DEV: Update eslint-config-discourse, use prettier for hbs (#72)

This commit is contained in:
David Taylor 2023-01-04 12:40:39 +00:00 committed by GitHub
parent 865d70323e
commit 494a7a80e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1472 additions and 414 deletions

View File

@ -41,8 +41,8 @@ jobs:
shell: bash
run: |
yarn prettier -v
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "assets/**/*.{scss,js,es6}"
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" -or -name "*.hbs" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}"
fi
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "test/**/*.{js,es6}"
@ -50,7 +50,12 @@ jobs:
- name: Ember template lint
if: ${{ !cancelled() }}
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts
# Separated due to https://github.com/ember-template-lint/ember-template-lint/issues/2758
- name: Ember template lint (admin)
if: ${{ !cancelled() }}
run: yarn ember-template-lint --no-error-on-unmatched-pattern admin/assets/javascripts
- name: Rubocop
if: ${{ !cancelled() }}

View File

@ -1 +1,4 @@
<ShowUserNotes @show={{action "showUserNotes"}} @count={{this.userNotesCount}} />
<ShowUserNotes
@show={{action "showUserNotes"}}
@count={{this.userNotesCount}}
/>

View File

@ -1,14 +1,18 @@
{{#if userNotesCount}}
<DButton @class="btn btn-flat" @translatedTitle={{userNotesTitle}} @action={{action "showUserNotes"}}>
<DButton
@class="btn btn-flat"
@translatedTitle={{userNotesTitle}}
@action={{action "showUserNotes"}}
>
{{#if emojiEnabled}}
<img
src={{emojiUrl}}
title={{userNotesTitle}}
alt="pencil"
class="emoji"
>
/>
{{else}}
{{d-icon "sticky-note"}}
{{/if}}
</DButton>
{{/if}}
{{/if}}

View File

@ -1,14 +1,18 @@
{{#if userNotesCount}}
<DButton @class="btn btn-flat" @translatedTitle={{userNotesTitle}} @action={{action "showUserNotes"}}>
<DButton
@class="btn btn-flat"
@translatedTitle={{userNotesTitle}}
@action={{action "showUserNotes"}}
>
{{#if emojiEnabled}}
<img
src={{emojiUrl}}
title={{userNotesTitle}}
alt="pencil"
class="emoji"
>
/>
{{else}}
{{d-icon "sticky-note"}}
{{/if}}
</DButton>
{{/if}}
{{/if}}

View File

@ -1 +1,4 @@
<ShowUserNotes @show={{action "showUserNotes"}} @count={{this.userNotesCount}} />
<ShowUserNotes
@show={{action "showUserNotes"}}
@count={{this.userNotesCount}}
/>

View File

@ -3,4 +3,4 @@
@action={{@show}}
@icon="pencil-alt"
@translatedLabel={{this.label}}
/>
/>

View File

@ -1,6 +1,3 @@
{{#if siteSettings.user_notes_enabled}}
<AdminReport
@dataSourceName="user_notes"
@filters={{this.args.filters}}
/>
{{/if}}
<AdminReport @dataSourceName="user_notes" @filters={{this.filters}} />
{{/if}}

View File

@ -45,4 +45,4 @@
<div class="clearfix"></div>
</div>
{{/each}}
</DModalBody>
</DModalBody>

1834
yarn.lock

File diff suppressed because it is too large Load Diff