Upgrading prettier svelte plugin until found a version that works for our formatting without breaking on some syntax.
This commit is contained in:
parent
7ee64e8abd
commit
e33dd65768
|
@ -10,7 +10,7 @@
|
||||||
"eslint-plugin-svelte3": "^2.7.3",
|
"eslint-plugin-svelte3": "^2.7.3",
|
||||||
"lerna": "3.14.1",
|
"lerna": "3.14.1",
|
||||||
"prettier": "^1.19.1",
|
"prettier": "^1.19.1",
|
||||||
"prettier-plugin-svelte": "^0.7.0",
|
"prettier-plugin-svelte": "^1.1.0",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"rollup-plugin-replace": "^2.2.0",
|
"rollup-plugin-replace": "^2.2.0",
|
||||||
"svelte": "^3.28.0"
|
"svelte": "^3.28.0"
|
||||||
|
|
|
@ -30,12 +30,13 @@
|
||||||
function showModal() {
|
function showModal() {
|
||||||
const screens = $store.allScreens
|
const screens = $store.allScreens
|
||||||
templateScreens = screens.filter(screen => screen.props.table === table._id)
|
templateScreens = screens.filter(screen => screen.props.table === table._id)
|
||||||
willBeDeleted = ["All table data"].concat(templateScreens.map(screen => `Screen ${screen.props._instanceName}`))
|
willBeDeleted = ["All table data"].concat(
|
||||||
|
templateScreens.map(screen => `Screen ${screen.props._instanceName}`)
|
||||||
|
)
|
||||||
hideEditor()
|
hideEditor()
|
||||||
confirmDeleteDialog.show()
|
confirmDeleteDialog.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function deleteTable() {
|
async function deleteTable() {
|
||||||
await backendUiStore.actions.tables.delete(table)
|
await backendUiStore.actions.tables.delete(table)
|
||||||
store.deleteScreens(templateScreens)
|
store.deleteScreens(templateScreens)
|
||||||
|
@ -91,13 +92,15 @@
|
||||||
okText="Delete Table"
|
okText="Delete Table"
|
||||||
onOk={deleteTable}
|
onOk={deleteTable}
|
||||||
title="Confirm Delete">
|
title="Confirm Delete">
|
||||||
Are you sure you wish to delete the table <i>{table.name}?</i> The following will also be deleted:
|
Are you sure you wish to delete the table
|
||||||
|
<i>{table.name}?</i>
|
||||||
|
The following will also be deleted:
|
||||||
<b>
|
<b>
|
||||||
<div class="delete-items">
|
<div class="delete-items">
|
||||||
{#each willBeDeleted as item}
|
{#each willBeDeleted as item}
|
||||||
<div>{item}</div>
|
<div>{item}</div>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</b>
|
</b>
|
||||||
This action cannot be undone.
|
This action cannot be undone.
|
||||||
</ConfirmDialog>
|
</ConfirmDialog>
|
||||||
|
@ -122,7 +125,7 @@
|
||||||
|
|
||||||
div.delete-items div {
|
div.delete-items div {
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
font-weight: 500
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
|
|
|
@ -20,7 +20,10 @@
|
||||||
|
|
||||||
<Modal bind:this={modal} on:hide={onCancel}>
|
<Modal bind:this={modal} on:hide={onCancel}>
|
||||||
<ModalContent onConfirm={onOk} {title} confirmText={okText} {cancelText} red>
|
<ModalContent onConfirm={onOk} {title} confirmText={okText} {cancelText} red>
|
||||||
<div class="body">{body}<slot/></div>
|
<div class="body">
|
||||||
|
{body}
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
</ModalContent>
|
</ModalContent>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
||||||
|
|
11
yarn.lock
11
yarn.lock
|
@ -3690,11 +3690,10 @@ prettier-linter-helpers@^1.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
fast-diff "^1.1.2"
|
fast-diff "^1.1.2"
|
||||||
|
|
||||||
prettier-plugin-svelte@^0.7.0:
|
prettier-plugin-svelte@^1.1.0:
|
||||||
version "0.7.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-0.7.0.tgz#5ac0b9f194e0450c88ff1e167cbf3b32d2642df2"
|
resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.1.0.tgz#e6ec282d8457598b0c02164083b11ad8cb8ab304"
|
||||||
dependencies:
|
integrity sha512-wmIggG/ryV0wcmE9D5p+k5TwKDpS2SGKJpF6IV1aYHK7dkBJD+di1w47Ci00DRsI4RrXZRC2Ef37DSyrTb6Zqg==
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
prettier@^1.19.1:
|
prettier@^1.19.1:
|
||||||
version "1.19.1"
|
version "1.19.1"
|
||||||
|
@ -4529,7 +4528,7 @@ trim-off-newlines@^1.0.0:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
|
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"
|
version "1.10.0"
|
||||||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
|
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue