From b55c50cf64924aff0515036f65efb72867ceaa64 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Thu, 6 Oct 2022 11:41:12 -0400 Subject: [PATCH] Chore/update linter (#1355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 Update editor config settings * chore: 🤖 Add back ember-template-lint-plugin-prettier * style: 💄 Format admin * style: 💄 Format desktop * style: 💄 Format rose * style: 💄 Format core * style: 💄 Format api --- addons/api/.editorconfig | 3 + addons/api/addon/abilities/credential.js | 4 +- addons/api/addon/models/credential.js | 2 +- addons/api/app/abilities/credential.js | 2 +- .../tests/dummy/app/templates/application.hbs | 2 +- .../api/tests/dummy/app/templates/index.hbs | 2 +- .../unit/models/credential-library-test.js | 4 +- addons/auth/.editorconfig | 3 + addons/core/.editorconfig | 3 + addons/core/.template-lintrc.js | 8 +-- .../core/addon/components/doc-link/index.hbs | 2 +- .../addon/components/error/message/index.hbs | 2 +- .../components/form/authenticate/index.hbs | 2 +- .../form/authenticate/oidc/index.hbs | 2 +- .../form/authenticate/password/index.hbs | 2 +- addons/core/addon/components/image/index.hbs | 2 +- .../addon/components/loading-button/index.hbs | 2 +- .../pending-confirmations/index.hbs | 2 +- .../components/toolbar-refresher/index.hbs | 2 +- addons/core/package.json | 3 +- .../tests/dummy/app/templates/application.hbs | 2 +- addons/rose/.editorconfig | 3 + addons/rose/.template-lintrc.js | 9 +-- .../addon/components/rose/anonymous/index.hbs | 2 +- .../addon/components/rose/badge/index.hbs | 4 +- .../addon/components/rose/button/index.hbs | 10 +-- .../addon/components/rose/card/link/index.hbs | 2 +- .../addon/components/rose/cards/index.hbs | 2 +- .../rose/code-editor/field-editor/index.hbs | 2 +- .../components/rose/code-editor/index.hbs | 2 +- .../rose/code-editor/toolbar/index.hbs | 2 +- .../components/rose/dialog/body/index.hbs | 2 +- .../components/rose/dialog/cover/index.hbs | 2 +- .../addon/components/rose/dialog/index.hbs | 10 +-- .../components/rose/dropdown/button/index.hbs | 6 +- .../addon/components/rose/dropdown/index.hbs | 10 +-- .../rose/dropdown/key-value/index.hbs | 2 +- .../components/rose/dropdown/link/index.hbs | 10 +-- .../rose/dropdown/section/index.hbs | 2 +- .../components/rose/footer/brand/index.hbs | 2 +- .../rose/footer/copyright/index.hbs | 2 +- .../addon/components/rose/footer/index.hbs | 2 +- .../components/rose/footer/nav/index.hbs | 2 +- .../components/rose/footer/nav/link/index.hbs | 2 +- .../components/rose/footer/product/index.hbs | 2 +- .../rose/form/actions/edit-toggle/index.hbs | 2 +- .../components/rose/form/actions/index.hbs | 2 +- .../rose/form/checkbox/group/index.hbs | 2 +- .../components/rose/form/checkbox/index.hbs | 8 +-- .../components/rose/form/errors/index.hbs | 2 +- .../rose/form/errors/message/index.hbs | 2 +- .../components/rose/form/fieldset/index.hbs | 20 +++--- .../rose/form/helper-text/index.hbs | 4 +- .../rose/addon/components/rose/form/index.hbs | 2 +- .../components/rose/form/input/index.hbs | 6 +- .../rose/form/input/input/index.hbs | 4 +- .../components/rose/form/label/index.hbs | 4 +- .../rose/form/radio/group/index.hbs | 2 +- .../rose/form/radio/radio/index.hbs | 4 +- .../components/rose/form/select/index.hbs | 2 +- .../rose/form/select/select/index.hbs | 4 +- .../components/rose/form/textarea/index.hbs | 6 +- .../rose/form/textarea/textarea/index.hbs | 4 +- .../addon/components/rose/frame/index.hbs | 2 +- .../components/rose/header/brand/index.hbs | 2 +- .../addon/components/rose/header/index.hbs | 2 +- .../components/rose/header/nav/index.hbs | 2 +- .../rose/header/utilities/index.hbs | 2 +- .../rose/addon/components/rose/icon/index.hbs | 2 +- .../components/rose/layout/centered/index.hbs | 2 +- .../components/rose/layout/global/index.hbs | 2 +- .../components/rose/layout/page/index.hbs | 2 +- .../components/rose/layout/sidebar/index.hbs | 2 +- .../components/rose/link-button/index.hbs | 10 +-- .../components/rose/list/key-value/index.hbs | 2 +- .../rose/list/key-value/item/index.hbs | 2 +- .../addon/components/rose/message/index.hbs | 2 +- .../components/rose/nav/breadcrumbs/index.hbs | 2 +- .../addon/components/rose/nav/link/index.hbs | 2 +- .../components/rose/nav/sidebar/index.hbs | 2 +- .../addon/components/rose/nav/tabs/index.hbs | 2 +- .../components/rose/notification/index.hbs | 4 +- .../addon/components/rose/separator/index.hbs | 2 +- .../addon/components/rose/table/index.hbs | 4 +- .../components/rose/table/row/cell/index.hbs | 2 +- .../addon/components/rose/table/row/index.hbs | 6 +- .../components/rose/table/section/index.hbs | 2 +- .../addon/components/rose/toolbar/index.hbs | 2 +- .../components/rose/toolbar/info/index.hbs | 2 +- addons/rose/package.json | 3 +- .../tests/dummy/app/templates/application.hbs | 2 +- .../rose/tests/dummy/app/templates/index.hbs | 2 +- .../tests/dummy/app/templates/playground.hbs | 2 +- ui/admin/.editorconfig | 3 + ui/admin/.template-lintrc.js | 6 +- .../accounts/account/actions/index.hbs | 2 +- .../accounts/account/header/index.hbs | 2 +- .../accounts/account/nav/index.hbs | 2 +- .../auth-method/actions/index.hbs | 2 +- .../auth-methods/auth-method/header/index.hbs | 2 +- .../managed-group/actions/index.hbs | 2 +- .../managed-group/header/index.hbs | 2 +- .../managed-group/nav/index.hbs | 2 +- .../auth-methods/auth-method/nav/index.hbs | 2 +- ui/admin/app/components/bread-crumbs.hbs | 2 +- ui/admin/app/components/copyable/index.hbs | 2 +- .../cred-source-type-badge/index.hbs | 2 +- .../credential-store/actions/index.hbs | 2 +- .../credential-store/header/index.hbs | 2 +- .../credential-store/nav/index.hbs | 2 +- .../app/components/form/account/index.hbs | 2 +- .../components/form/account/oidc/index.hbs | 2 +- .../password/change-password/index.hbs | 2 +- .../form/account/password/index.hbs | 2 +- .../account/password/set-password/index.hbs | 2 +- .../app/components/form/auth-method/index.hbs | 2 +- .../form/auth-method/oidc/index.hbs | 2 +- .../form/auth-method/password/index.hbs | 2 +- .../form/credential-library/index.hbs | 6 +- .../form/credential-store/index.hbs | 2 +- .../form/credential-store/static/index.hbs | 2 +- .../form/credential-store/vault/index.hbs | 2 +- .../app/components/form/credential/index.hbs | 2 +- .../form/credential/ssh_private_key/index.hbs | 2 +- .../credential/username_password/index.hbs | 2 +- .../form/group/add-members/index.hbs | 4 +- ui/admin/app/components/form/group/index.hbs | 2 +- .../form/host-catalog/aws/index.hbs | 2 +- .../form/host-catalog/azure/index.hbs | 2 +- .../components/form/host-catalog/index.hbs | 2 +- .../form/host-catalog/static/index.hbs | 2 +- .../form/host-set/add-hosts/index.hbs | 2 +- .../components/form/host-set/aws/index.hbs | 2 +- .../components/form/host-set/azure/index.hbs | 2 +- .../app/components/form/host-set/index.hbs | 2 +- .../components/form/host-set/static/index.hbs | 2 +- .../app/components/form/host/aws/index.hbs | 2 +- .../app/components/form/host/azure/index.hbs | 2 +- ui/admin/app/components/form/host/index.hbs | 2 +- .../app/components/form/host/static/index.hbs | 2 +- .../components/form/managed-group/index.hbs | 2 +- .../form/onboarding/choose-path/index.hbs | 2 +- .../onboarding/create-resources/index.hbs | 2 +- .../form/role/add-principals/index.hbs | 4 +- .../app/components/form/role/grants/index.hbs | 2 +- ui/admin/app/components/form/role/index.hbs | 6 +- ui/admin/app/components/form/scope/index.hbs | 2 +- .../add-brokered-credential-sources/index.hbs | 2 +- .../form/target/add-host-sets/index.hbs | 2 +- .../index.hbs | 2 +- .../components/form/target/details/index.hbs | 2 +- ui/admin/app/components/form/target/index.hbs | 2 +- .../app/components/form/target/ssh/index.hbs | 2 +- .../app/components/form/target/tcp/index.hbs | 2 +- .../form/user/add-accounts/index.hbs | 2 +- ui/admin/app/components/form/user/index.hbs | 2 +- .../form/worker/create-worker-led/index.hbs | 2 +- ui/admin/app/components/form/worker/index.hbs | 16 ++--- .../components/groups/group/actions/index.hbs | 2 +- .../components/groups/group/header/index.hbs | 2 +- .../app/components/groups/group/nav/index.hbs | 2 +- .../host-catalog-type-badge/index.hbs | 2 +- .../components/roles/role/actions/index.hbs | 2 +- .../components/roles/role/header/index.hbs | 2 +- .../app/components/roles/role/nav/index.hbs | 2 +- ui/admin/app/components/scope-badge/index.hbs | 2 +- .../targets/target/actions/index.hbs | 2 +- .../targets/target/header/index.hbs | 2 +- .../components/targets/target/nav/index.hbs | 2 +- .../components/users/user/actions/index.hbs | 2 +- .../components/users/user/header/index.hbs | 2 +- .../app/components/users/user/nav/index.hbs | 2 +- ui/admin/app/templates/account.hbs | 2 +- .../app/templates/account/change-password.hbs | 2 +- ui/admin/app/templates/application.hbs | 2 +- .../app/templates/authentication-complete.hbs | 2 +- .../app/templates/authentication-error.hbs | 2 +- ui/admin/app/templates/head.hbs | 2 +- ui/admin/app/templates/index.hbs | 2 +- ui/admin/app/templates/onboarding.hbs | 2 +- .../onboarding/quick-setup/choose-path.hbs | 2 +- .../quick-setup/create-resources/index.hbs | 2 +- .../quick-setup/create-resources/success.hbs | 2 +- ui/admin/app/templates/scopes.hbs | 2 +- ui/admin/app/templates/scopes/index.hbs | 2 +- ui/admin/app/templates/scopes/scope.hbs | 2 +- .../templates/scopes/scope/-header-nav.hbs | 2 +- .../app/templates/scopes/scope/-sidebar.hbs | 2 +- .../templates/scopes/scope/auth-methods.hbs | 2 +- .../scopes/scope/auth-methods/auth-method.hbs | 2 +- .../auth-method/accounts/account.hbs | 2 +- .../auth-method/accounts/account/index.hbs | 2 +- .../accounts/account/set-password.hbs | 2 +- .../auth-method/accounts/index.hbs | 2 +- .../auth-methods/auth-method/accounts/new.hbs | 2 +- .../scope/auth-methods/auth-method/index.hbs | 2 +- .../auth-method/managed-groups.hbs | 2 +- .../auth-method/managed-groups/index.hbs | 2 +- .../managed-groups/managed-group.hbs | 2 +- .../managed-groups/managed-group/index.hbs | 2 +- .../managed-groups/managed-group/members.hbs | 2 +- .../auth-method/managed-groups/new.hbs | 2 +- .../auth-methods/auth-method/members.hbs | 2 +- .../scopes/scope/auth-methods/index.hbs | 2 +- .../scopes/scope/auth-methods/new.hbs | 2 +- .../templates/scopes/scope/authenticate.hbs | 2 +- .../scopes/scope/authenticate/index.hbs | 2 +- .../scopes/scope/authenticate/method.hbs | 2 +- .../scope/authenticate/method/index.hbs | 2 +- .../scopes/scope/authenticate/method/oidc.hbs | 2 +- .../scopes/scope/credential-stores.hbs | 2 +- .../credential-stores/credential-store.hbs | 2 +- .../credential-store/credential-libraries.hbs | 2 +- .../credential-library.hbs | 2 +- .../credential-library/index.hbs | 2 +- .../credential-libraries/index.hbs | 2 +- .../credential-libraries/new.hbs | 2 +- .../credential-store/credentials.hbs | 2 +- .../credentials/credential.hbs | 2 +- .../credentials/credential/index.hbs | 2 +- .../credential-store/credentials/index.hbs | 2 +- .../credential-store/credentials/new.hbs | 2 +- .../credential-store/index.hbs | 2 +- .../scopes/scope/credential-stores/index.hbs | 2 +- .../scopes/scope/credential-stores/new.hbs | 2 +- ui/admin/app/templates/scopes/scope/edit.hbs | 2 +- ui/admin/app/templates/scopes/scope/error.hbs | 2 +- .../app/templates/scopes/scope/groups.hbs | 2 +- .../templates/scopes/scope/groups/group.hbs | 2 +- .../scopes/scope/groups/group/add-members.hbs | 10 +-- .../scopes/scope/groups/group/index.hbs | 2 +- .../scopes/scope/groups/group/members.hbs | 2 +- .../templates/scopes/scope/groups/index.hbs | 2 +- .../app/templates/scopes/scope/groups/new.hbs | 2 +- .../templates/scopes/scope/host-catalogs.hbs | 2 +- .../scope/host-catalogs/host-catalog.hbs | 2 +- .../host-catalogs/host-catalog/-actions.hbs | 2 +- .../host-catalogs/host-catalog/-header.hbs | 2 +- .../host-catalog/-navigation.hbs | 2 +- .../host-catalogs/host-catalog/host-sets.hbs | 2 +- .../host-catalog/host-sets/host-set.hbs | 2 +- .../host-sets/host-set/-actions.hbs | 2 +- .../host-sets/host-set/-header.hbs | 2 +- .../host-sets/host-set/-navigation.hbs | 2 +- .../host-sets/host-set/add-hosts.hbs | 2 +- .../host-sets/host-set/add-hosts/-header.hbs | 2 +- .../host-set/create-and-add-host.hbs | 2 +- .../host-set/create-and-add-host/-header.hbs | 2 +- .../host-catalog/host-sets/host-set/hosts.hbs | 2 +- .../host-sets/host-set/hosts/host.hbs | 2 +- .../host-sets/host-set/hosts/host/index.hbs | 2 +- .../host-sets/host-set/hosts/index.hbs | 2 +- .../host-catalog/host-sets/host-set/index.hbs | 2 +- .../host-catalog/host-sets/index.hbs | 2 +- .../host-catalog/host-sets/new.hbs | 2 +- .../host-catalog/host-sets/new/-header.hbs | 2 +- .../host-catalogs/host-catalog/hosts.hbs | 2 +- .../host-catalogs/host-catalog/hosts/host.hbs | 2 +- .../host-catalog/hosts/host/-actions.hbs | 2 +- .../host-catalog/hosts/host/-header.hbs | 2 +- .../host-catalog/hosts/host/-navigation.hbs | 2 +- .../host-catalog/hosts/host/index.hbs | 2 +- .../host-catalog/hosts/index.hbs | 2 +- .../host-catalogs/host-catalog/hosts/new.hbs | 2 +- .../host-catalog/hosts/new/-header.hbs | 2 +- .../host-catalogs/host-catalog/index.hbs | 2 +- .../scopes/scope/host-catalogs/index.hbs | 2 +- .../scopes/scope/host-catalogs/new.hbs | 2 +- ui/admin/app/templates/scopes/scope/index.hbs | 2 +- ui/admin/app/templates/scopes/scope/new.hbs | 2 +- ui/admin/app/templates/scopes/scope/roles.hbs | 2 +- .../templates/scopes/scope/roles/index.hbs | 2 +- .../app/templates/scopes/scope/roles/new.hbs | 2 +- .../app/templates/scopes/scope/roles/role.hbs | 2 +- .../scope/roles/role/add-principals.hbs | 10 +-- .../scopes/scope/roles/role/grants.hbs | 2 +- .../scopes/scope/roles/role/index.hbs | 2 +- .../scopes/scope/roles/role/principals.hbs | 2 +- .../app/templates/scopes/scope/scopes.hbs | 2 +- .../templates/scopes/scope/scopes/index.hbs | 2 +- .../app/templates/scopes/scope/sessions.hbs | 2 +- .../templates/scopes/scope/sessions/index.hbs | 2 +- .../app/templates/scopes/scope/targets.hbs | 2 +- .../templates/scopes/scope/targets/index.hbs | 2 +- .../templates/scopes/scope/targets/new.hbs | 2 +- .../templates/scopes/scope/targets/target.hbs | 2 +- .../add-brokered-credential-sources.hbs | 2 +- .../scope/targets/target/add-host-sources.hbs | 2 +- ...njected-application-credential-sources.hbs | 2 +- .../target/brokered-credential-sources.hbs | 2 +- .../scope/targets/target/host-sources.hbs | 2 +- .../scopes/scope/targets/target/index.hbs | 2 +- ...njected-application-credential-sources.hbs | 2 +- ui/admin/app/templates/scopes/scope/users.hbs | 2 +- .../templates/scopes/scope/users/index.hbs | 2 +- .../app/templates/scopes/scope/users/new.hbs | 2 +- .../app/templates/scopes/scope/users/user.hbs | 2 +- .../scopes/scope/users/user/accounts.hbs | 2 +- .../scopes/scope/users/user/add-accounts.hbs | 2 +- .../scopes/scope/users/user/index.hbs | 2 +- .../app/templates/scopes/scope/workers.hbs | 2 +- .../templates/scopes/scope/workers/index.hbs | 2 +- .../templates/scopes/scope/workers/new.hbs | 2 +- .../templates/scopes/scope/workers/worker.hbs | 2 +- .../scopes/scope/workers/worker/index.hbs | 2 +- ui/admin/package.json | 3 +- ui/desktop/.editorconfig | 3 + ui/desktop/.template-lintrc.js | 6 +- .../app/components/branded-card/index.hbs | 2 +- ui/desktop/app/components/card/index.hbs | 2 +- ui/desktop/app/components/copyable/index.hbs | 2 +- .../app/components/dialog-detail/index.hbs | 2 +- .../app/components/hidden-secret/index.hbs | 2 +- ui/desktop/app/components/reveal/index.hbs | 2 +- ui/desktop/app/templates/application.hbs | 6 +- ui/desktop/app/templates/cluster-url.hbs | 2 +- ui/desktop/app/templates/error.hbs | 2 +- ui/desktop/app/templates/index.hbs | 2 +- ui/desktop/app/templates/scopes.hbs | 2 +- ui/desktop/app/templates/scopes/index.hbs | 2 +- ui/desktop/app/templates/scopes/scope.hbs | 2 +- .../templates/scopes/scope/-header-nav.hbs | 2 +- .../templates/scopes/scope/authenticate.hbs | 2 +- .../scopes/scope/authenticate/index.hbs | 2 +- .../scopes/scope/authenticate/method.hbs | 2 +- .../scope/authenticate/method/index.hbs | 2 +- .../scopes/scope/authenticate/method/oidc.hbs | 2 +- .../app/templates/scopes/scope/index.hbs | 2 +- .../app/templates/scopes/scope/projects.hbs | 2 +- .../templates/scopes/scope/projects/error.hbs | 2 +- .../scopes/scope/projects/sessions.hbs | 2 +- .../scopes/scope/projects/sessions/index.hbs | 2 +- .../scopes/scope/projects/targets.hbs | 6 +- .../scopes/scope/projects/targets/index.hbs | 2 +- .../scopes/scope/projects/targets/target.hbs | 2 +- .../projects/targets/target/-actions.hbs | 2 +- .../scope/projects/targets/target/-header.hbs | 2 +- .../projects/targets/target/-navigation.hbs | 2 +- .../scope/projects/targets/target/hosts.hbs | 2 +- .../scope/projects/targets/target/index.hbs | 2 +- .../projects/targets/target/sessions.hbs | 2 +- .../electron-app/src/helpers/spawn-promise.js | 4 +- ui/desktop/package.json | 3 +- yarn.lock | 69 ++++++++++++------- 344 files changed, 484 insertions(+), 456 deletions(-) diff --git a/addons/api/.editorconfig b/addons/api/.editorconfig index 41302d1b0..e1681d816 100644 --- a/addons/api/.editorconfig +++ b/addons/api/.editorconfig @@ -14,3 +14,6 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false + +[*.hbs] +insert_final_newline = false diff --git a/addons/api/addon/abilities/credential.js b/addons/api/addon/abilities/credential.js index 115856118..29c86add9 100644 --- a/addons/api/addon/abilities/credential.js +++ b/addons/api/addon/abilities/credential.js @@ -1,4 +1,4 @@ -import ModelAbility from "./model"; +import ModelAbility from './model'; /** * Provides abilities for credential. */ @@ -12,4 +12,4 @@ export default class CredentialAbility extends ModelAbility { get canRead() { return !this.model.isUnknown && this.hasAuthorizedAction('read'); } -} \ No newline at end of file +} diff --git a/addons/api/addon/models/credential.js b/addons/api/addon/models/credential.js index f7b81a6cb..d7339b719 100644 --- a/addons/api/addon/models/credential.js +++ b/addons/api/addon/models/credential.js @@ -10,7 +10,7 @@ export default class CredentialModel extends GeneratedCredentialModel { /** * All Credentials are prefixed with "cred" and are considered * static due to their relation with Static Credential Stores. - * + * * True if credential starts with the "cred" prefix. * @type {boolean} */ diff --git a/addons/api/app/abilities/credential.js b/addons/api/app/abilities/credential.js index af95b315a..4c97204b7 100644 --- a/addons/api/app/abilities/credential.js +++ b/addons/api/app/abilities/credential.js @@ -1 +1 @@ -export { default } from 'api/abilities/credential'; \ No newline at end of file +export { default } from 'api/abilities/credential'; diff --git a/addons/api/tests/dummy/app/templates/application.hbs b/addons/api/tests/dummy/app/templates/application.hbs index 001b0153a..1001d149e 100644 --- a/addons/api/tests/dummy/app/templates/application.hbs +++ b/addons/api/tests/dummy/app/templates/application.hbs @@ -2,4 +2,4 @@

Welcome to Ember

-{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/addons/api/tests/dummy/app/templates/index.hbs b/addons/api/tests/dummy/app/templates/index.hbs index 9015a7a32..b2d525b29 100644 --- a/addons/api/tests/dummy/app/templates/index.hbs +++ b/addons/api/tests/dummy/app/templates/index.hbs @@ -1 +1 @@ -index +index \ No newline at end of file diff --git a/addons/api/tests/unit/models/credential-library-test.js b/addons/api/tests/unit/models/credential-library-test.js index 12610cf8c..5016b902b 100644 --- a/addons/api/tests/unit/models/credential-library-test.js +++ b/addons/api/tests/unit/models/credential-library-test.js @@ -14,7 +14,9 @@ module('Unit | Model | credential library', function (hooks) { assert.expect(2); const store = this.owner.lookup('service:store'); const modelA = store.createRecord('credential-library', { type: 'vault' }); - const modelB = store.createRecord('credential-library', { type: 'unknown' }); + const modelB = store.createRecord('credential-library', { + type: 'unknown', + }); assert.false(modelA.isUnknown); assert.true(modelB.isUnknown); diff --git a/addons/auth/.editorconfig b/addons/auth/.editorconfig index 41302d1b0..e1681d816 100644 --- a/addons/auth/.editorconfig +++ b/addons/auth/.editorconfig @@ -14,3 +14,6 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false + +[*.hbs] +insert_final_newline = false diff --git a/addons/core/.editorconfig b/addons/core/.editorconfig index 41302d1b0..e1681d816 100644 --- a/addons/core/.editorconfig +++ b/addons/core/.editorconfig @@ -14,3 +14,6 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false + +[*.hbs] +insert_final_newline = false diff --git a/addons/core/.template-lintrc.js b/addons/core/.template-lintrc.js index 5ee42f30d..d05a35dd2 100644 --- a/addons/core/.template-lintrc.js +++ b/addons/core/.template-lintrc.js @@ -1,10 +1,6 @@ 'use strict'; module.exports = { - extends: ['recommended', 'stylistic'], - rules: { - quotes: 'single', - 'self-closing-void-elements': false, - 'block-indentation': false, - }, + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'], }; diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index a06b33dfb..dcb7df4c1 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -6,4 +6,4 @@ title={{t 'actions.get-topic-help'}} > - + \ No newline at end of file diff --git a/addons/core/addon/components/error/message/index.hbs b/addons/core/addon/components/error/message/index.hbs index 382e73708..b3e27af71 100644 --- a/addons/core/addon/components/error/message/index.hbs +++ b/addons/core/addon/components/error/message/index.hbs @@ -10,4 +10,4 @@ {{#if this.helpRoute}} {{t 'actions.help'}} {{/if}} - + \ No newline at end of file diff --git a/addons/core/addon/components/form/authenticate/index.hbs b/addons/core/addon/components/form/authenticate/index.hbs index d93c795bc..d9a5fbfe1 100644 --- a/addons/core/addon/components/form/authenticate/index.hbs +++ b/addons/core/addon/components/form/authenticate/index.hbs @@ -7,4 +7,4 @@ cancel=false disabled=@disabled }} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/core/addon/components/form/authenticate/oidc/index.hbs b/addons/core/addon/components/form/authenticate/oidc/index.hbs index fc9ebde74..0ec8100df 100644 --- a/addons/core/addon/components/form/authenticate/oidc/index.hbs +++ b/addons/core/addon/components/form/authenticate/oidc/index.hbs @@ -11,4 +11,4 @@ @showCancel={{false}} /> - + \ No newline at end of file diff --git a/addons/core/addon/components/form/authenticate/password/index.hbs b/addons/core/addon/components/form/authenticate/password/index.hbs index 68e9fb90d..ec469d8a3 100644 --- a/addons/core/addon/components/form/authenticate/password/index.hbs +++ b/addons/core/addon/components/form/authenticate/password/index.hbs @@ -29,4 +29,4 @@ @showCancel={{false}} /> - + \ No newline at end of file diff --git a/addons/core/addon/components/image/index.hbs b/addons/core/addon/components/image/index.hbs index b9f544084..44eb3a54d 100644 --- a/addons/core/addon/components/image/index.hbs +++ b/addons/core/addon/components/image/index.hbs @@ -1,3 +1,3 @@ {{inline-svg @name}} - + \ No newline at end of file diff --git a/addons/core/addon/components/loading-button/index.hbs b/addons/core/addon/components/loading-button/index.hbs index b13931ced..be7070e6c 100644 --- a/addons/core/addon/components/loading-button/index.hbs +++ b/addons/core/addon/components/loading-button/index.hbs @@ -11,4 +11,4 @@ {{on 'click' this.toggleRefresh}} > {{yield}} - + \ No newline at end of file diff --git a/addons/core/addon/components/pending-confirmations/index.hbs b/addons/core/addon/components/pending-confirmations/index.hbs index 2efcdec43..c5ec18d35 100644 --- a/addons/core/addon/components/pending-confirmations/index.hbs +++ b/addons/core/addon/components/pending-confirmations/index.hbs @@ -4,4 +4,4 @@ (fn this.accept confirmation) (fn this.deny confirmation) }} -{{/each}} +{{/each}} \ No newline at end of file diff --git a/addons/core/addon/components/toolbar-refresher/index.hbs b/addons/core/addon/components/toolbar-refresher/index.hbs index 787bf4ec8..90db4508b 100644 --- a/addons/core/addon/components/toolbar-refresher/index.hbs +++ b/addons/core/addon/components/toolbar-refresher/index.hbs @@ -6,4 +6,4 @@ {{t 'actions.refresh'}} - + \ No newline at end of file diff --git a/addons/core/package.json b/addons/core/package.json index 880c84a53..43ef54a55 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -69,6 +69,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~3.28.4", "ember-template-lint": "^4.14.0", + "ember-template-lint-plugin-prettier": "^4.0.0", "eslint": "^8.18.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^10.6.1", @@ -77,7 +78,7 @@ "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.4.0", + "prettier": "^2.7.1", "qunit": "^2.17.1", "qunit-dom": "^2.0.0", "webpack": "5" diff --git a/addons/core/tests/dummy/app/templates/application.hbs b/addons/core/tests/dummy/app/templates/application.hbs index 5169fec38..a1973e25c 100644 --- a/addons/core/tests/dummy/app/templates/application.hbs +++ b/addons/core/tests/dummy/app/templates/application.hbs @@ -1,2 +1,2 @@

Welcome to Ember

-

{{relative-datetime-live this.now}}

+

{{relative-datetime-live this.now}}

\ No newline at end of file diff --git a/addons/rose/.editorconfig b/addons/rose/.editorconfig index 41302d1b0..e1681d816 100644 --- a/addons/rose/.editorconfig +++ b/addons/rose/.editorconfig @@ -14,3 +14,6 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false + +[*.hbs] +insert_final_newline = false diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index cc62eb79f..a49b44691 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -1,17 +1,14 @@ 'use strict'; module.exports = { - extends: ['recommended', 'stylistic'], - rules: { - quotes: 'single', - 'self-closing-void-elements': false, - 'block-indentation': false, - }, + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'], overrides: [ { files: [ 'addon/components/rose/anonymous/index.hbs', 'addon/components/rose/table/row/cell/index.hbs', + 'addon/components/rose/anonymous/index.hbs', ], rules: { 'no-yield-only': false, diff --git a/addons/rose/addon/components/rose/anonymous/index.hbs b/addons/rose/addon/components/rose/anonymous/index.hbs index 889d9eead..fb5c4b157 100644 --- a/addons/rose/addon/components/rose/anonymous/index.hbs +++ b/addons/rose/addon/components/rose/anonymous/index.hbs @@ -1 +1 @@ -{{yield}} +{{yield}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/badge/index.hbs b/addons/rose/addon/components/rose/badge/index.hbs index 633c2d3b6..ee258db53 100644 --- a/addons/rose/addon/components/rose/badge/index.hbs +++ b/addons/rose/addon/components/rose/badge/index.hbs @@ -1,6 +1,6 @@ {{#if @icon}} @@ -9,4 +9,4 @@ {{yield}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs index 9ea0f9839..d270f5052 100644 --- a/addons/rose/addon/components/rose/button/index.hbs +++ b/addons/rose/addon/components/rose/button/index.hbs @@ -2,10 +2,10 @@ ...attributes type={{if @submit 'submit' 'button'}} disabled={{if @disabled 'disabled'}} - class='{{if @style (concat 'rose-button-' @style)}} - {{if @iconLeft 'has-icon-left'}} - {{if @iconRight 'has-icon-right'}} - {{if @iconOnly 'has-icon-only'}}' + class='{{if @style (concat "rose-button-" @style)}} + {{if @iconLeft "has-icon-left"}} + {{if @iconRight "has-icon-right"}} + {{if @iconOnly "has-icon-only"}}' > @@ -25,4 +25,4 @@ {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/card/link/index.hbs b/addons/rose/addon/components/rose/card/link/index.hbs index 2e23e8b77..610185779 100644 --- a/addons/rose/addon/components/rose/card/link/index.hbs +++ b/addons/rose/addon/components/rose/card/link/index.hbs @@ -29,4 +29,4 @@ {{yield}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/cards/index.hbs b/addons/rose/addon/components/rose/cards/index.hbs index 83bd1727f..1df7ccb51 100644 --- a/addons/rose/addon/components/rose/cards/index.hbs +++ b/addons/rose/addon/components/rose/cards/index.hbs @@ -1,3 +1,3 @@
{{yield (hash link=(component 'rose/card/link'))}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/code-editor/field-editor/index.hbs b/addons/rose/addon/components/rose/code-editor/field-editor/index.hbs index f9032cbee..c0742c000 100644 --- a/addons/rose/addon/components/rose/code-editor/field-editor/index.hbs +++ b/addons/rose/addon/components/rose/code-editor/field-editor/index.hbs @@ -3,4 +3,4 @@ ...attributes class='rose-codemirror-container' {{code-mirror value=@value onInput=@onInput options=@options}} -> +> \ No newline at end of file diff --git a/addons/rose/addon/components/rose/code-editor/index.hbs b/addons/rose/addon/components/rose/code-editor/index.hbs index 7a685afa5..1357f73dc 100644 --- a/addons/rose/addon/components/rose/code-editor/index.hbs +++ b/addons/rose/addon/components/rose/code-editor/index.hbs @@ -5,4 +5,4 @@ toolbar=(component 'rose/code-editor/toolbar' copyText=@codeValue) ) }} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs b/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs index 613c3ce4f..0d9b1928a 100644 --- a/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs +++ b/addons/rose/addon/components/rose/code-editor/toolbar/index.hbs @@ -26,4 +26,4 @@ Copy code - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/body/index.hbs b/addons/rose/addon/components/rose/dialog/body/index.hbs index 089f4f912..e77e9c6b0 100644 --- a/addons/rose/addon/components/rose/dialog/body/index.hbs +++ b/addons/rose/addon/components/rose/dialog/body/index.hbs @@ -1,3 +1,3 @@
{{yield}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/cover/index.hbs b/addons/rose/addon/components/rose/dialog/cover/index.hbs index 8c5128045..4a75cd737 100644 --- a/addons/rose/addon/components/rose/dialog/cover/index.hbs +++ b/addons/rose/addon/components/rose/dialog/cover/index.hbs @@ -18,4 +18,4 @@
{{yield to='body'}}
- + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index b0b1db280..9398ff3c8 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -5,8 +5,8 @@ ...attributes role='dialog' class='rose-dialog - {{if @style (concat 'rose-dialog-' @style)}} - {{if @modal 'modal'}}' + {{if @style (concat "rose-dialog-" @style)}} + {{if @modal "modal"}}' id={{this.id}} aria-describedby={{concat 'dialog-header-' this.id}} {{focus-trap}} @@ -48,8 +48,8 @@ ...attributes role='dialog' class='rose-dialog - {{if @style (concat 'rose-dialog-' @style)}} - {{if @modal 'modal'}}' + {{if @style (concat "rose-dialog-" @style)}} + {{if @modal "modal"}}' > {{#if @heading}} @@ -84,4 +84,4 @@ -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/button/index.hbs b/addons/rose/addon/components/rose/dropdown/button/index.hbs index 7a5b5231f..14bbb445b 100644 --- a/addons/rose/addon/components/rose/dropdown/button/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/button/index.hbs @@ -3,8 +3,8 @@ type={{if @submit 'submit' 'button'}} disabled={{if @disabled 'disabled'}} class='rose-dropdown-button - {{if @style (concat 'rose-dropdown-button-' @style)}} - {{if @iconOnly 'has-icon-only'}}' + {{if @style (concat "rose-dropdown-button-" @style)}} + {{if @iconOnly "has-icon-only"}}' > @@ -15,4 +15,4 @@ {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/index.hbs b/addons/rose/addon/components/rose/dropdown/index.hbs index bc17af4c1..0e5b8f2f7 100644 --- a/addons/rose/addon/components/rose/dropdown/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/index.hbs @@ -1,15 +1,15 @@
@@ -58,4 +58,4 @@ {{/if}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs index 43425ddfd..b6494bb26 100644 --- a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs @@ -6,4 +6,4 @@
{{yield to='value'}}
- + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/link/index.hbs b/addons/rose/addon/components/rose/dropdown/link/index.hbs index d6104ad06..a579c7b2c 100644 --- a/addons/rose/addon/components/rose/dropdown/link/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/link/index.hbs @@ -11,7 +11,7 @@ @query={{@query}} @model={{@model}} class='rose-dropdown-link - {{if @style (concat 'rose-dropdown-link-' @style)}}' + {{if @style (concat "rose-dropdown-link-" @style)}}' > {{yield}} @@ -21,7 +21,7 @@ @route={{@route}} @model={{@model}} class='rose-dropdown-link - {{if @style (concat 'rose-dropdown-link-' @style)}}' + {{if @style (concat "rose-dropdown-link-" @style)}}' > {{yield}} @@ -33,7 +33,7 @@ @route={{@route}} @query={{@query}} class='rose-dropdown-link - {{if @style (concat 'rose-dropdown-link-' @style)}}' + {{if @style (concat "rose-dropdown-link-" @style)}}' > {{yield}} @@ -42,9 +42,9 @@ ...attributes @route={{@route}} class='rose-dropdown-link - {{if @style (concat 'rose-dropdown-link-' @style)}}' + {{if @style (concat "rose-dropdown-link-" @style)}}' > {{yield}} {{/if}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/section/index.hbs b/addons/rose/addon/components/rose/dropdown/section/index.hbs index ee8b237fd..394f5635b 100644 --- a/addons/rose/addon/components/rose/dropdown/section/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/section/index.hbs @@ -15,4 +15,4 @@ {{/if}} {{yield}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/brand/index.hbs b/addons/rose/addon/components/rose/footer/brand/index.hbs index 2088ffb24..0f8da67fd 100644 --- a/addons/rose/addon/components/rose/footer/brand/index.hbs +++ b/addons/rose/addon/components/rose/footer/brand/index.hbs @@ -9,4 +9,4 @@ {{inline-svg @logo}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/copyright/index.hbs b/addons/rose/addon/components/rose/footer/copyright/index.hbs index e50e0f55d..9925a930f 100644 --- a/addons/rose/addon/components/rose/footer/copyright/index.hbs +++ b/addons/rose/addon/components/rose/footer/copyright/index.hbs @@ -8,4 +8,4 @@ {{@text}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/index.hbs b/addons/rose/addon/components/rose/footer/index.hbs index c6a0a7fa8..aa755b113 100644 --- a/addons/rose/addon/components/rose/footer/index.hbs +++ b/addons/rose/addon/components/rose/footer/index.hbs @@ -6,4 +6,4 @@ text=(component 'rose/anonymous' class='rose-footer-text') ) }} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/nav/index.hbs b/addons/rose/addon/components/rose/footer/nav/index.hbs index e7df76ef8..7c3cd491d 100644 --- a/addons/rose/addon/components/rose/footer/nav/index.hbs +++ b/addons/rose/addon/components/rose/footer/nav/index.hbs @@ -1,3 +1,3 @@ + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/nav/link/index.hbs b/addons/rose/addon/components/rose/footer/nav/link/index.hbs index 77823e95d..00c753dbc 100644 --- a/addons/rose/addon/components/rose/footer/nav/link/index.hbs +++ b/addons/rose/addon/components/rose/footer/nav/link/index.hbs @@ -18,4 +18,4 @@ > {{yield}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/product/index.hbs b/addons/rose/addon/components/rose/footer/product/index.hbs index 22c3b22e6..e21421e7b 100644 --- a/addons/rose/addon/components/rose/footer/product/index.hbs +++ b/addons/rose/addon/components/rose/footer/product/index.hbs @@ -8,4 +8,4 @@ v{{@version}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs b/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs index f67576dd2..47fe561b5 100644 --- a/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs +++ b/addons/rose/addon/components/rose/form/actions/edit-toggle/index.hbs @@ -2,4 +2,4 @@ {{@enableEditText}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/actions/index.hbs b/addons/rose/addon/components/rose/form/actions/index.hbs index 67d2b215b..a313ec915 100644 --- a/addons/rose/addon/components/rose/form/actions/index.hbs +++ b/addons/rose/addon/components/rose/form/actions/index.hbs @@ -12,4 +12,4 @@ {{@cancelText}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/checkbox/group/index.hbs b/addons/rose/addon/components/rose/form/checkbox/group/index.hbs index 1a477dcae..987914f82 100644 --- a/addons/rose/addon/components/rose/form/checkbox/group/index.hbs +++ b/addons/rose/addon/components/rose/form/checkbox/group/index.hbs @@ -12,4 +12,4 @@ ) ) }} -{{/each}} +{{/each}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/checkbox/index.hbs b/addons/rose/addon/components/rose/form/checkbox/index.hbs index ca88e457f..ab9a18232 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.hbs +++ b/addons/rose/addon/components/rose/form/checkbox/index.hbs @@ -1,4 +1,4 @@ -
+
@@ -32,4 +32,4 @@ (hash errors=(component 'rose/form/errors' id=(concat 'errors-' this.id))) }} -
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/errors/index.hbs b/addons/rose/addon/components/rose/form/errors/index.hbs index 375ca4797..b2c4e8410 100644 --- a/addons/rose/addon/components/rose/form/errors/index.hbs +++ b/addons/rose/addon/components/rose/form/errors/index.hbs @@ -1,3 +1,3 @@
{{yield (hash message=(component 'rose/form/errors/message'))}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs index 3b42d70a6..d87d110d2 100644 --- a/addons/rose/addon/components/rose/form/errors/message/index.hbs +++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs @@ -1,4 +1,4 @@

{{yield}} -

+

\ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/fieldset/index.hbs b/addons/rose/addon/components/rose/form/fieldset/index.hbs index 36b6a0446..19cc0887d 100644 --- a/addons/rose/addon/components/rose/form/fieldset/index.hbs +++ b/addons/rose/addon/components/rose/form/fieldset/index.hbs @@ -20,16 +20,16 @@ {{/if}} {{#if @helperText}} - - {{@helperText}} - - {{/if}} + + {{@helperText}} + + {{/if}}
{{yield to='body'}}
- + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/helper-text/index.hbs b/addons/rose/addon/components/rose/form/helper-text/index.hbs index 79d86346b..4a267ae53 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -1,5 +1,5 @@ @@ -11,4 +11,4 @@ {{/if}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/index.hbs b/addons/rose/addon/components/rose/form/index.hbs index 33124730f..ff5e57f75 100644 --- a/addons/rose/addon/components/rose/form/index.hbs +++ b/addons/rose/addon/components/rose/form/index.hbs @@ -39,4 +39,4 @@ isEditable=this.isEditable ) }} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs index b668081c9..52c2921e0 100644 --- a/addons/rose/addon/components/rose/form/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/index.hbs @@ -53,8 +53,8 @@ @error={{@error}} @aria-describedby='{{if @helperText - (concat 'helper-text-' this.id) - }} {{if @error (concat 'errors-' this.id)}}' + (concat "helper-text-" this.id) + }} {{if @error (concat "errors-" this.id)}}' /> {{yield @@ -62,4 +62,4 @@ }} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/input/input/index.hbs b/addons/rose/addon/components/rose/form/input/input/index.hbs index 4ab3a69cf..64a3e5648 100644 --- a/addons/rose/addon/components/rose/form/input/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/input/index.hbs @@ -1,10 +1,10 @@ +/> \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/label/index.hbs b/addons/rose/addon/components/rose/form/label/index.hbs index c42608e44..c5a0a0526 100644 --- a/addons/rose/addon/components/rose/form/label/index.hbs +++ b/addons/rose/addon/components/rose/form/label/index.hbs @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/radio/group/index.hbs b/addons/rose/addon/components/rose/form/radio/group/index.hbs index 2d46bc5d6..8e090407d 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/group/index.hbs @@ -17,4 +17,4 @@ layout=@layout ) ) -}} +}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs index 11ca37515..43a92c875 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/radio/index.hbs @@ -1,4 +1,4 @@ -
+
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/select/index.hbs b/addons/rose/addon/components/rose/form/select/index.hbs index 31cfe9b41..742e291ea 100644 --- a/addons/rose/addon/components/rose/form/select/index.hbs +++ b/addons/rose/addon/components/rose/form/select/index.hbs @@ -54,4 +54,4 @@ }}
-{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/select/select/index.hbs b/addons/rose/addon/components/rose/form/select/select/index.hbs index 8416e9f7e..9857b6cd0 100644 --- a/addons/rose/addon/components/rose/form/select/select/index.hbs +++ b/addons/rose/addon/components/rose/form/select/select/index.hbs @@ -1,6 +1,6 @@ {{yield xs}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/textarea/index.hbs b/addons/rose/addon/components/rose/form/textarea/index.hbs index 951ed9ff3..905d256d8 100644 --- a/addons/rose/addon/components/rose/form/textarea/index.hbs +++ b/addons/rose/addon/components/rose/form/textarea/index.hbs @@ -45,9 +45,9 @@ @value={{@value}} @disabled={{@disabled}} @error={{@error}} - @aria-describedby='{{if @helperText (concat 'helper-text-' this.id)}} {{if + @aria-describedby='{{if @helperText (concat "helper-text-" this.id)}} {{if @error - (concat 'errors-' this.id) + (concat "errors-" this.id) }}' /> @@ -56,4 +56,4 @@ }} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/textarea/textarea/index.hbs b/addons/rose/addon/components/rose/form/textarea/textarea/index.hbs index 347071fed..271bbafe0 100644 --- a/addons/rose/addon/components/rose/form/textarea/textarea/index.hbs +++ b/addons/rose/addon/components/rose/form/textarea/textarea/index.hbs @@ -1,9 +1,9 @@