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

This commit is contained in:
David Taylor 2023-01-04 12:36:14 +00:00 committed by GitHub
parent 27b30b5efb
commit b1df914549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 1476 additions and 427 deletions

View File

@ -41,8 +41,8 @@ jobs:
shell: bash shell: bash
run: | run: |
yarn prettier -v 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 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}" yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}"
fi fi
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then 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}" yarn prettier --list-different "test/**/*.{js,es6}"
@ -50,7 +50,12 @@ jobs:
- name: Ember template lint - name: Ember template lint
if: ${{ !cancelled() }} 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 - name: Rubocop
if: ${{ !cancelled() }} if: ${{ !cancelled() }}

View File

@ -1,4 +1,6 @@
{{! template-lint-disable no-invalid-interactive }}
<li class="schema-table {{this.styles}}" {{on "click" this.toggleOpen}}> <li class="schema-table {{this.styles}}" {{on "click" this.toggleOpen}}>
{{! template-lint-enable no-invalid-interactive }}
<div class="schema-table-name"> <div class="schema-table-name">
{{#if this.open}} {{#if this.open}}
{{d-icon "caret-down"}} {{d-icon "caret-down"}}

View File

@ -88,7 +88,7 @@
</div> </div>
{{/if}} {{/if}}
{{#if (not selectedItem.destroyed)}} {{#unless selectedItem.destroyed}}
<div class="pull-left"> <div class="pull-left">
<div class="groups"> <div class="groups">
<span class="label">{{i18n "explorer.allow_groups"}}</span> <span class="label">{{i18n "explorer.allow_groups"}}</span>
@ -102,7 +102,7 @@
</span> </span>
</div> </div>
</div> </div>
{{/if}} {{/unless}}
<div class="clear"></div> <div class="clear"></div>

1834
yarn.lock

File diff suppressed because it is too large Load Diff