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

.github/workflows/plugin-linting.yml

@@ -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
+          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
           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() }}

assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs

@@ -1,9 +1,7 @@
 {{#if model.unconfigured}}
   <p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
   <p>
-    <a
+    <a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
-      href="https://meta.discourse.org/t/discourse-subscriptions/140818/"
-    >
       {{i18n "discourse_subscriptions.admin.on_meta"}}
     </a>
   </p>

assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs

@@ -135,7 +135,7 @@
 </form>
 
 <section>
-  <hr>
+  <hr />
 
   <p class="control-instructions">
     {{i18n "discourse_subscriptions.admin.plans.operations.create_help"}}

assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs

@@ -124,7 +124,7 @@
         {{else}}
           <tr>
             <td colspan="8">
-              <hr>
+              <hr />
               {{i18n
                 "discourse_subscriptions.admin.products.product.plan_help"
               }}

assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs

@@ -35,7 +35,7 @@
     }}
   </ul>
 
-  <hr>
+  <hr />
 
   <div id="discourse-subscriptions-admin">
     {{outlet}}

assets/javascripts/discourse/templates/subscribe.hbs

@@ -5,7 +5,7 @@
     </h1>
   </div>
 
-  <hr>
+  <hr />
 
   {{outlet}}
 </div>

assets/javascripts/discourse/templates/subscribe/show.hbs

@@ -4,7 +4,7 @@
       {{model.product.name}}
     </h2>
 
-    <hr>
+    <hr />
 
     <p>
       {{html-safe model.product.description}}
@@ -17,11 +17,11 @@
         {{i18n "discourse_subscriptions.subscribe.card.title"}}
       </h2>
 
-      <hr>
+      <hr />
 
       {{payment-options plans=model.plans selectedPlan=selectedPlan}}
 
-      <hr>
+      <hr />
 
       {{subscribe-card cardElement=cardElement}}
 

assets/javascripts/discourse/templates/user/billing/subscriptions/card.hbs

@@ -1,11 +1,11 @@
-<h3>{{i18n "discourse_subscriptions.user.subscriptions.update_card.heading" sub_id=model}}</h3>
+<h3>{{i18n
+    "discourse_subscriptions.user.subscriptions.update_card.heading"
+    sub_id=model
+  }}</h3>
 
 <div class="form-vertical">
   <div class="control-group">
-    {{subscribe-card
+    {{subscribe-card cardElement=cardElement class="input-xxlarge"}}
-    cardElement=cardElement
-    class="input-xxlarge"
-    }}
   </div>
 
   {{save-controls

assets/javascripts/discourse/templates/user/billing/subscriptions/index.hbs

@@ -31,7 +31,7 @@
                 }}
               {{else}}
                 {{d-button
-                  action= (route-action "updateCard" subscription.id)
+                  action=(route-action "updateCard" subscription.id)
                   icon="far-edit"
                   class="btn no-text btn-icon"
                 }}

assets/stylesheets/common/campaign.scss

@@ -423,7 +423,9 @@ body:not(.archetype-regular):not(.success-animation-off) {
   }
 }
 
-body.subscription-campaign-sidebar:not(.archetype-regular):not(.success-animation-off) {
+body.subscription-campaign-sidebar:not(.archetype-regular):not(
+    .success-animation-off
+  ) {
   .fireworks > .before,
   .fireworks > .after {
     position: absolute;