build: disable html trailing commas to avoid cherry-pick conflicts (#…

…2540)
blackbaud · Jul 23, 2024 · 03e6062 · 03e6062
1 parent b384178
commit 03e6062
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 32 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -6,5 +6,13 @@
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,
   "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
-  "plugins": ["@trivago/prettier-plugin-sort-imports"]
+  "plugins": ["@trivago/prettier-plugin-sort-imports"],
+  "overrides": [
+    {
+      "files": ["*.html"],
+      "options": {
+        "trailingComma": "none"
+      }
+    }
+  ]
 }
diff --git a/libs/components/ag-grid/src/lib/modules/ag-grid/ag-grid-row-delete.component.ts b/libs/components/ag-grid/src/lib/modules/ag-grid/ag-grid-row-delete.component.ts
@@ -31,7 +31,7 @@ import { SkyInlineDeleteModule } from '@skyux/layout';
         [ngStyle]="{
           height: row.rowHeight + 'px',
           position: 'fixed',
-          width: tableWidth + 'px'
+          width: tableWidth + 'px',
         }"
         #inlineDeleteRef
       >

diff --git a/libs/components/core/src/lib/modules/affix/affixer.spec.ts b/libs/components/core/src/lib/modules/affix/affixer.spec.ts
@@ -17,21 +17,21 @@ import { SkyAffixer } from './affixer';
       class="affixer-layer"
       [ngClass]="{
         'affix-layer-fixed': fixedLayer1,
-        'affix-layer-overflow': overflowLayer1
+        'affix-layer-overflow': overflowLayer1,
       }"
     >
       <div
         class="affixer-layer"
         [ngClass]="{
           'affix-layer-fixed': fixedLayer2,
-          'affix-layer-overflow': overflowLayer2
+          'affix-layer-overflow': overflowLayer2,
         }"
       >
         <div
           class="affixer-layer"
           [ngClass]="{
             'affix-layer-fixed': fixedLayer3,
-            'affix-layer-overflow': overflowLayer3
+            'affix-layer-overflow': overflowLayer3,
           }"
         >
           <div class="affixer-container">

diff --git a/libs/components/forms/src/lib/modules/file-attachment/file-attachment.component.html b/libs/components/forms/src/lib/modules/file-attachment/file-attachment.component.html
@@ -3,15 +3,15 @@
     class="sky-file-attachment-label-wrapper"
     [attr.id]="labelElementId"
     [ngClass]="{
-      'sky-control-label-required': !labelText && required && hasLabelComponent,
+      'sky-control-label-required': !labelText && required && hasLabelComponent
     }"
   >
     <ng-container *ngIf="labelText; else labelContent">
       <span
         *ngIf="!labelHidden"
         class="sky-control-label sky-margin-inline-xs"
         [ngClass]="{
-          'sky-control-label-required': required,
+          'sky-control-label-required': required
         }"
         >{{ labelText }}</span
       ><sky-help-inline
@@ -32,7 +32,7 @@
     class="sky-file-attachment-upload sky-file-attachment sky-file-attachment-target"
     [ngClass]="{
       'sky-file-attachment-accept': acceptedOver,
-      'sky-file-attachment-reject': rejectedOver,
+      'sky-file-attachment-reject': rejectedOver
     }"
     (dragenter)="fileDragEnter($event)"
     (dragover)="fileDragOver($event)"
@@ -136,7 +136,7 @@
       "
       [disabled]="disabled"
       [skyThemeClass]="{
-        'sky-btn-icon-borderless': 'modern',
+        'sky-btn-icon-borderless': 'modern'
       }"
       (click)="deleteFileAttachment()"
       #deleteButton="skyId"

diff --git a/libs/components/forms/src/lib/modules/file-attachment/file-drop.component.html b/libs/components/forms/src/lib/modules/file-attachment/file-drop.component.html
@@ -3,13 +3,13 @@
     *ngIf="labelText"
     class="sky-control-label sky-font-body-default sky-margin-stacked-xs"
     [ngClass]="{
-      'sky-screen-reader-only': labelHidden,
+      'sky-screen-reader-only': labelHidden
     }"
   >
     <span
       class="sky-margin-inline-xs"
       [ngClass]="{
-        'sky-control-label-required': required,
+        'sky-control-label-required': required
       }"
       >{{ labelText }}</span
     ><span class="sky-screen-reader-only" *ngIf="required">{{
@@ -31,7 +31,7 @@
       class="sky-file-drop-col"
       [ngClass]="{
         'sky-file-drop-accept': acceptedOver,
-        'sky-file-drop-reject': rejectedOver,
+        'sky-file-drop-reject': rejectedOver
       }"
     >
       <button

diff --git a/libs/components/forms/src/lib/modules/input-box/input-box.component.html b/libs/components/forms/src/lib/modules/input-box/input-box.component.html
@@ -2,7 +2,7 @@
   *skyThemeIf="'default'"
   class="sky-input-box"
   [ngClass]="{
-    'sky-input-box-disabled': isDisabled,
+    'sky-input-box-disabled': isDisabled
   }"
 >
   <div class="sky-form-group">
@@ -18,7 +18,7 @@
         class="sky-input-box-input-group-inner"
         [ngClass]="{
           'sky-field-status-active': formControlHasFocus,
-          'sky-field-status-invalid': hasErrorsComputed,
+          'sky-field-status-invalid': hasErrorsComputed
         }"
         (focusin)="formControlFocusIn()"
         (focusout)="formControlFocusOut()"
@@ -39,7 +39,7 @@
   *skyThemeIf="'modern'"
   class="sky-input-box"
   [ngClass]="{
-    'sky-input-box-disabled': isDisabled,
+    'sky-input-box-disabled': isDisabled
   }"
 >
   <div class="sky-input-box-group">
@@ -48,7 +48,7 @@
       class="sky-input-box-group-form-control"
       [ngClass]="{
         'sky-input-box-group-form-control-focus': formControlHasFocus,
-        'sky-input-box-group-form-control-invalid': hasErrorsComputed,
+        'sky-input-box-group-form-control-invalid': hasErrorsComputed
       }"
       (focusin)="formControlFocusIn()"
       (focusout)="formControlFocusOut()"
@@ -90,7 +90,7 @@
     [for]="controlId"
     [id]="labelId"
     [ngClass]="{
-      'sky-control-label-required': required,
+      'sky-control-label-required': required
     }"
     >{{ labelText }}</label
   >
@@ -197,7 +197,7 @@
     class="sky-font-deemphasized sky-input-box-hint-text"
     [ngClass]="{
       'sky-input-box-hint-text-hidden': hintTextHidden,
-      'sky-screen-reader-only': hintTextScreenReaderOnly,
+      'sky-screen-reader-only': hintTextScreenReaderOnly
     }"
     [id]="hintTextId"
   >

diff --git a/libs/components/help-inline/src/lib/modules/help-inline/help-inline.component.html b/libs/components/help-inline/src/lib/modules/help-inline/help-inline.component.html
@@ -21,7 +21,7 @@
     !labelledBy ? undefined : labelTextElement.id + ' ' + labelledBy
   "
   [ngClass]="{
-    'sky-help-inline-hidden': helpKey && !helpSvc && !popoverContent,
+    'sky-help-inline-hidden': helpKey && !helpSvc && !popoverContent
   }"
   [skyPopover]="popoverContent ? popoverRef : undefined"
   (click)="onClick()"
@@ -32,11 +32,11 @@
     size="xs"
     [baseIcon]="{
       icon: 'circle-solid',
-      iconType: 'skyux',
+      iconType: 'skyux'
     }"
     [topIcon]="{
       icon: 'help-i',
-      iconType: 'skyux',
+      iconType: 'skyux'
     }"
   />
 </button>

diff --git a/libs/components/indicators/src/lib/modules/illustration/illustration.component.html b/libs/components/indicators/src/lib/modules/illustration/illustration.component.html
@@ -5,7 +5,7 @@
   [attr.data-sky-illustration-name]="name()"
   [height]="pixelSize()"
   [ngClass]="{
-    'sky-illustration-img-loaded': !!url(),
+    'sky-illustration-img-loaded': !!url()
   }"
   [src]="url()"
   [width]="pixelSize()"

diff --git a/libs/components/layout/src/lib/modules/box/box.component.html b/libs/components/layout/src/lib/modules/box/box.component.html
@@ -5,7 +5,7 @@
   [attr.role]="ariaRole"
   [skyThemeClass]="{
     'sky-shadow sky-border-dark': 'default',
-    'sky-elevation-1-bordered': 'modern',
+    'sky-elevation-1-bordered': 'modern'
   }"
 >
   <div class="sky-box-header-content">

diff --git a/libs/components/lookup/src/lib/modules/lookup/lookup.component.html b/libs/components/lookup/src/lib/modules/lookup/lookup.component.html
@@ -8,7 +8,7 @@
     [ngClass]="{
       'sky-lookup-focused': isInputFocused,
       'sky-lookup-disabled': disabled,
-      'sky-lookup-single': selectMode === 'single',
+      'sky-lookup-single': selectMode === 'single'
     }"
     #lookupWrapper
   >
@@ -39,7 +39,7 @@
         <div
           class="sky-lookup-search"
           [ngClass]="{
-            'sky-field-status-active': isInputFocused && !disabled,
+            'sky-field-status-active': isInputFocused && !disabled
           }"
         >
           <sky-tokens

diff --git a/libs/components/phone-field/src/lib/modules/phone-field/phone-field.component.html b/libs/components/phone-field/src/lib/modules/phone-field/phone-field.component.html
@@ -91,7 +91,7 @@
         [ngClass]="{
           'sky-btn-default':
             (themeSvc?.settingsChange | async)?.currentSettings?.theme?.name ===
-            'modern',
+            'modern'
         }"
         (click)="toggleCountrySearch(false)"
       >

diff --git a/libs/components/tiles/src/lib/modules/tiles/tile/tile.component.html b/libs/components/tiles/src/lib/modules/tiles/tile/tile.component.html
@@ -1,10 +1,10 @@
 <section
   class="sky-tile"
   [ngClass]="{
-    'sky-tile-collapsed': isCollapsed,
+    'sky-tile-collapsed': isCollapsed
   }"
   [skyThemeClass]="{
-    'sky-box sky-elevation-1-bordered sky-padding-even-xl': 'modern',
+    'sky-box sky-elevation-1-bordered sky-padding-even-xl': 'modern'
   }"
 >
   <header class="sky-tile-header">
@@ -37,7 +37,7 @@
                 : ('skyux_tile_help_default' | skyLibResources)
             "
             [skyThemeClass]="{
-              'sky-btn-icon-borderless': 'modern',
+              'sky-btn-icon-borderless': 'modern'
             }"
             (click)="helpButtonClicked()"
           >
@@ -54,7 +54,7 @@
           [direction]="isCollapsed ? 'down' : 'up'"
           [skyThemeClass]="{
             'sky-tile-tools-control': 'default',
-            'sky-margin-inline-default': 'modern',
+            'sky-margin-inline-default': 'modern'
           }"
           (directionChange)="chevronDirectionChange($event)"
         >
@@ -70,7 +70,7 @@
           "
           [skyThemeClass]="{
             'sky-tile-tools-control': 'default',
-            'sky-btn-icon-borderless sky-margin-inline-default': 'modern',
+            'sky-btn-icon-borderless sky-margin-inline-default': 'modern'
           }"
           (click)="settingsButtonClicked()"
         >
@@ -88,7 +88,7 @@
           [attr.aria-describedby]="ariaDescribedBy"
           [skyThemeClass]="{
             'sky-tile-tools-control': 'default',
-            'sky-btn-icon-borderless': 'modern',
+            'sky-btn-icon-borderless': 'modern'
           }"
           (click)="$event.stopPropagation()"
           (keydown)="moveTile($event)"