From d2a7bf55a763bdaf9eded54fd94bcb69038f8de6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 14 Oct 2020 13:21:43 +0100 Subject: [PATCH] lint --- package.json | 2 +- .../BlockList/AutomationBlock.svelte | 4 +--- .../automation/SetupPanel/SetupPanel.svelte | 5 +---- .../components/backend/DataTable/Table.svelte | 3 ++- .../backend/DataTable/TablePagination.svelte | 17 +++++++++-------- .../Notification/NotificationDisplay.svelte | 4 +--- .../src/components/common/Switcher.svelte | 4 ---- .../src/components/settings/Integration.svelte | 4 +--- .../builder/src/components/start/AppCard.svelte | 4 +++- .../src/components/start/TemplateList.svelte | 7 +++---- .../components/userInterface/CategoryTab.svelte | 1 - .../userInterface/ComponentDropdownMenu.svelte | 4 +--- .../ComponentPropertiesPanel.svelte | 3 --- .../userInterface/ComponentSelectionList.svelte | 1 - .../userInterface/ComponentsHierarchy.svelte | 3 --- .../ComponentsHierarchyChildren.svelte | 1 - .../userInterface/ComponentsPaneSwitcher.svelte | 4 ---- .../components/userInterface/DesignView.svelte | 1 - .../EventsEditor/StateBindingCascader.svelte | 4 +--- .../EventsEditor/actions/CreateRow.svelte | 1 - .../EventsEditor/actions/SaveRow.svelte | 1 - .../EventsEditor/actions/UpdateRow.svelte | 1 - .../userInterface/IconSelect/IconSelect.svelte | 4 +--- .../userInterface/ItemTab/Item.svelte | 4 +--- .../userInterface/NewScreenModal.svelte | 2 -- .../backend/table/[selectedTable]/index.svelte | 4 +--- .../[application]/backend/table/index.svelte | 4 +--- .../backend/view/[selectedView]/index.svelte | 4 +--- packages/server/src/utilities/csvParser.js | 2 +- packages/server/src/utilities/fileProcessor.js | 17 ++++++++--------- packages/standard-components/src/Card.svelte | 4 +--- .../src/CardHorizontal.svelte | 4 +--- .../src/DataGrid/AttachmentCell/Button.svelte | 13 +------------ .../src/DataGrid/Component.svelte | 4 +++- packages/standard-components/src/Login.svelte | 4 +--- packages/standard-components/src/Text.svelte | 4 +--- .../src/attachments/AttachmentList.svelte | 4 +--- yarn.lock | 11 +++++------ 38 files changed, 52 insertions(+), 116 deletions(-) diff --git a/package.json b/package.json index 5a7d40fe1c..1ca7218bd4 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "eslint-plugin-svelte3": "^2.7.3", "lerna": "3.14.1", "prettier": "^1.19.1", - "prettier-plugin-svelte": "^0.7.0", + "prettier-plugin-svelte": "^1.4.0", "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", "svelte": "^3.28.0" diff --git a/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte b/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte index b8ac6638ae..2419999475 100644 --- a/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte @@ -23,9 +23,7 @@ class="automation-block hoverable" on:click={addBlockToAutomation} data-cy={stepId}> -
- -
+

{blockDefinition.name}

{blockDefinition.description}

diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte index f2b7a8b711..37ca1f2252 100644 --- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte +++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte @@ -62,10 +62,7 @@ {#if $automationStore.selectedBlock} {:else if $automationStore.selectedAutomation} -
- Automation - {automation.name} -
+
Automation {automation.name}
{/if}
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index dde114a76c..4c0dc06d39 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -108,7 +108,8 @@
selectRelationship(row, header)}> - {row[header] ? row[header].length : 0} related row(s) + {row[header] ? row[header].length : 0} + related row(s)
{:else if schema[header].type === 'attachment'} diff --git a/packages/builder/src/components/backend/DataTable/TablePagination.svelte b/packages/builder/src/components/backend/DataTable/TablePagination.svelte index ccb7d0fc4c..ca5a58700d 100644 --- a/packages/builder/src/components/backend/DataTable/TablePagination.svelte +++ b/packages/builder/src/components/backend/DataTable/TablePagination.svelte @@ -49,9 +49,7 @@ - {#if currentPage > 3} - - {/if} + {#if currentPage > 3}{/if} {#each pagesAroundCurrent as idx} - {/if} + {#if currentPage < numPages - 4}{/if} {/each} -
@@ -34,7 +31,6 @@ {/if}
- --> + diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte index b7a277435d..6a2a6ded61 100644 --- a/packages/standard-components/src/DataGrid/Component.svelte +++ b/packages/standard-components/src/DataGrid/Component.svelte @@ -123,7 +123,9 @@ {#if selectedRows.length > 0} - Delete {selectedRows.length} row(s) + Delete + {selectedRows.length} + row(s) {/if} diff --git a/packages/standard-components/src/Login.svelte b/packages/standard-components/src/Login.svelte index b7435def58..6f2acb2d97 100644 --- a/packages/standard-components/src/Login.svelte +++ b/packages/standard-components/src/Login.svelte @@ -42,9 +42,7 @@
{#if logo} -
- logo -
+
logo
{/if} {#if title} diff --git a/packages/standard-components/src/Text.svelte b/packages/standard-components/src/Text.svelte index 96fc09e025..55b8fb762b 100644 --- a/packages/standard-components/src/Text.svelte +++ b/packages/standard-components/src/Text.svelte @@ -33,6 +33,4 @@ {text} {:else if isTag('sup')} {text} -{:else} - {text} -{/if} +{:else}{text}{/if} diff --git a/packages/standard-components/src/attachments/AttachmentList.svelte b/packages/standard-components/src/attachments/AttachmentList.svelte index bb58d5b0a3..52f61e2d8e 100644 --- a/packages/standard-components/src/attachments/AttachmentList.svelte +++ b/packages/standard-components/src/attachments/AttachmentList.svelte @@ -12,9 +12,7 @@
{#if FILE_TYPES.IMAGE.includes(file.extension.toLowerCase())} preview of {file.name} - {:else} - - {/if} + {:else}{/if}
{file.name} diff --git a/yarn.lock b/yarn.lock index 9b84e373af..0c0f88a3d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3690,11 +3690,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier-plugin-svelte@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-0.7.0.tgz#5ac0b9f194e0450c88ff1e167cbf3b32d2642df2" - dependencies: - tslib "^1.9.3" +prettier-plugin-svelte@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.4.0.tgz#bb992759fb77ec2c3545d454a7c60f7a258cb745" + integrity sha512-KXO2He7Kql0Lz4DdlzVli1j2JTDUR9jPV/DqyfnJmY1pCeSV1qZkxgdsyYma35W6OLrCAr/G6yKdmzo+75u2Ng== prettier@^1.19.1: version "1.19.1" @@ -4529,7 +4528,7 @@ trim-off-newlines@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" -tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"