From bc30ee2bdeaa92497669c0079b6b8c9650db7ff7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 10:38:42 -0400 Subject: [PATCH] Bump prettier from 2.2.1 to 2.3.0 (#5593) * Bump prettier from 2.2.1 to 2.3.0 Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.3.0) Signed-off-by: dependabot[bot] * Fix lint issues for updated prettier * Lets remove dev: true again so we can auto-add it later why don't we Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: rijkvanzanten --- api/src/utils/to-array.ts | 2 +- app/package.json | 2 +- app/src/components/v-menu/v-menu.vue | 8 +++++++- app/src/displays/related-values/index.ts | 4 ++-- .../displays/related-values/related-values.vue | 2 +- app/src/interfaces/list-m2a/list-m2a.vue | 11 ++--------- app/src/interfaces/list-m2m/list-m2m.vue | 11 ++--------- app/src/interfaces/list-m2m/use-preview.ts | 5 ++--- app/src/layouts/tabular/tabular.vue | 11 ++--------- app/src/modules/collections/routes/item.vue | 10 +++++++--- .../components/relationship-o2m.vue | 9 ++------- .../fields/components/field-select.vue | 11 ++--------- .../modules/settings/routes/presets/item.vue | 12 ++---------- .../components/drawer-item/drawer-item.vue | 8 ++------ package-lock.json | 18 +++++++++--------- package.json | 2 +- 16 files changed, 45 insertions(+), 81 deletions(-) diff --git a/api/src/utils/to-array.ts b/api/src/utils/to-array.ts index ae20f6862b..50cd447e3d 100644 --- a/api/src/utils/to-array.ts +++ b/api/src/utils/to-array.ts @@ -1,6 +1,6 @@ export function toArray(val: T | T[]): T[] { if (typeof val === 'string') { - return (val.split(',') as unknown) as T[]; + return val.split(',') as unknown as T[]; } return Array.isArray(val) ? val : [val]; diff --git a/app/package.json b/app/package.json index 396a2e68ad..5c2c01b948 100644 --- a/app/package.json +++ b/app/package.json @@ -75,7 +75,7 @@ "nanoid": "^3.1.22", "pinia": "^0.0.7", "portal-vue": "^2.1.7", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "pretty-ms": "^7.0.1", "qrcode": "^1.4.4", "raw-loader": "^4.0.2", diff --git a/app/src/components/v-menu/v-menu.vue b/app/src/components/v-menu/v-menu.vue index c6d50fc934..2967739186 100644 --- a/app/src/components/v-menu/v-menu.vue +++ b/app/src/components/v-menu/v-menu.vue @@ -118,7 +118,13 @@ export default defineComponent({ const id = computed(() => nanoid()); const popper = ref(null); - const { start, stop, styles, arrowStyles, placement: popperPlacement } = usePopper( + const { + start, + stop, + styles, + arrowStyles, + placement: popperPlacement, + } = usePopper( reference, popper, computed(() => ({ diff --git a/app/src/displays/related-values/index.ts b/app/src/displays/related-values/index.ts index 6c30d6a1fa..6bb47e3127 100644 --- a/app/src/displays/related-values/index.ts +++ b/app/src/displays/related-values/index.ts @@ -22,12 +22,12 @@ export default defineDisplay(() => ({ groups: ['m2m', 'm2o', 'o2m'], fields: (options: Options | null, { field, collection }) => { const relatedCollection = getRelatedCollection(collection, field); - const { primaryKeyField } = useCollection(ref((relatedCollection as unknown) as string)); + const { primaryKeyField } = useCollection(ref(relatedCollection as unknown as string)); if (!relatedCollection) return []; const fields = options?.template - ? adjustFieldsForDisplays(getFieldsFromTemplate(options.template), (relatedCollection as unknown) as string) + ? adjustFieldsForDisplays(getFieldsFromTemplate(options.template), relatedCollection as unknown as string) : []; if (primaryKeyField.value && !fields.includes(primaryKeyField.value.field)) { diff --git a/app/src/displays/related-values/related-values.vue b/app/src/displays/related-values/related-values.vue index ddb270cd75..3961a4b024 100644 --- a/app/src/displays/related-values/related-values.vue +++ b/app/src/displays/related-values/related-values.vue @@ -67,7 +67,7 @@ export default defineComponent({ const primaryKeyField = computed(() => { if (relatedCollection.value !== null) { - return useCollection((relatedCollection as unknown) as Ref).primaryKeyField.value; + return useCollection(relatedCollection as unknown as Ref).primaryKeyField.value; } return null; }); diff --git a/app/src/interfaces/list-m2a/list-m2a.vue b/app/src/interfaces/list-m2a/list-m2a.vue index adbc2d39f2..dbb0b92eb5 100644 --- a/app/src/interfaces/list-m2a/list-m2a.vue +++ b/app/src/interfaces/list-m2a/list-m2a.vue @@ -177,15 +177,8 @@ export default defineComponent({ const { fetchValues, previewValues, loading: previewLoading, junctionRowMap, relatedItemValues } = useValues(); const { collections, templates, primaryKeys } = useCollections(); const { selectingFrom, stageSelection, deselect } = useSelection(); - const { - currentlyEditing, - relatedPrimaryKey, - editsAtStart, - stageEdits, - cancelEdit, - editExisting, - createNew, - } = useEdits(); + const { currentlyEditing, relatedPrimaryKey, editsAtStart, stageEdits, cancelEdit, editExisting, createNew } = + useEdits(); const { onSort } = useManualSort(); watch(props, fetchValues, { immediate: true, deep: true }); diff --git a/app/src/interfaces/list-m2m/list-m2m.vue b/app/src/interfaces/list-m2m/list-m2m.vue index cb0c823b9a..dc0399b243 100644 --- a/app/src/interfaces/list-m2m/list-m2m.vue +++ b/app/src/interfaces/list-m2m/list-m2m.vue @@ -185,15 +185,8 @@ export default defineComponent({ getPrimaryKeys ); - const { - currentlyEditing, - editItem, - editsAtStart, - stageEdits, - cancelEdit, - relatedPrimaryKey, - editModalActive, - } = useEdit(value, relationInfo, emitter); + const { currentlyEditing, editItem, editsAtStart, stageEdits, cancelEdit, relatedPrimaryKey, editModalActive } = + useEdit(value, relationInfo, emitter); const { stageSelection, selectModalActive, selectionFilters } = useSelection(value, items, relationInfo, emitter); const { sort, sortItems, sortedItems } = useSort(relationInfo, fields, items, emitter); diff --git a/app/src/interfaces/list-m2m/use-preview.ts b/app/src/interfaces/list-m2m/use-preview.ts index 5e78e8ead4..d46dd4838e 100644 --- a/app/src/interfaces/list-m2m/use-preview.ts +++ b/app/src/interfaces/list-m2m/use-preview.ts @@ -97,9 +97,8 @@ export default function usePreview( () => { const { junctionField, junctionCollection } = relation.value; - tableHeaders.value = (fields.value.length > 0 - ? fields.value - : getDefaultFields().map((field) => `${junctionField}.${field}`) + tableHeaders.value = ( + fields.value.length > 0 ? fields.value : getDefaultFields().map((field) => `${junctionField}.${field}`) ) .map((fieldKey) => { const field = fieldsStore.getField(junctionCollection, fieldKey); diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue index 042ca47c47..d986f832d5 100644 --- a/app/src/layouts/tabular/tabular.vue +++ b/app/src/layouts/tabular/tabular.vue @@ -239,15 +239,8 @@ export default defineComponent({ } ); - const { - tableSort, - tableHeaders, - tableRowHeight, - onRowClick, - onSortChange, - activeFields, - tableSpacing, - } = useTable(); + const { tableSort, tableHeaders, tableRowHeight, onRowClick, onSortChange, activeFields, tableSpacing } = + useTable(); const showingCount = computed(() => { if ((itemCount.value || 0) < (totalCount.value || 0)) { diff --git a/app/src/modules/collections/routes/item.vue b/app/src/modules/collections/routes/item.vue index 7106ac8b81..3b37cbd218 100644 --- a/app/src/modules/collections/routes/item.vue +++ b/app/src/modules/collections/routes/item.vue @@ -246,9 +246,13 @@ export default defineComponent({ const revisionsDrawerDetail = ref(null); - const { info: collectionInfo, defaults, primaryKeyField, isSingleton, accountabilityScope } = useCollection( - collection - ); + const { + info: collectionInfo, + defaults, + primaryKeyField, + isSingleton, + accountabilityScope, + } = useCollection(collection); const { isNew, diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue index b14236635e..e7ad5ba9d8 100644 --- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue +++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue @@ -188,13 +188,8 @@ export default defineComponent({ const collectionsStore = useCollectionsStore(); const fieldsStore = useFieldsStore(); - const { - availableCollections, - systemCollections, - fields, - currentCollectionPrimaryKey, - collectionMany, - } = useRelation(); + const { availableCollections, systemCollections, fields, currentCollectionPrimaryKey, collectionMany } = + useRelation(); const { hasCorresponding, correspondingLabel } = useCorresponding(); const relatedCollectionExists = computed(() => { diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue index ff558b5063..09815165e3 100644 --- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue +++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue @@ -224,15 +224,8 @@ export default defineComponent({ const editActive = ref(false); const { deleteActive, deleting, deleteField } = useDeleteField(); - const { - duplicateActive, - duplicateName, - collections, - duplicateTo, - saveDuplicate, - duplicating, - duplicable, - } = useDuplicate(); + const { duplicateActive, duplicateName, collections, duplicateTo, saveDuplicate, duplicating, duplicable } = + useDuplicate(); const interfaceName = computed(() => { return interfaces.value.find((inter: InterfaceConfig) => inter.id === props.field.meta?.interface)?.name; diff --git a/app/src/modules/settings/routes/presets/item.vue b/app/src/modules/settings/routes/presets/item.vue index f74388c4ab..44d3fb738a 100644 --- a/app/src/modules/settings/routes/presets/item.vue +++ b/app/src/modules/settings/routes/presets/item.vue @@ -151,16 +151,8 @@ export default defineComponent({ const { loading, preset } = usePreset(); const { fields } = useForm(); - const { - edits, - hasEdits, - initialValues, - values, - layoutQuery, - layoutOptions, - updateFilters, - searchQuery, - } = useValues(); + const { edits, hasEdits, initialValues, values, layoutQuery, layoutOptions, updateFilters, searchQuery } = + useValues(); const { save, saving } = useSave(); const { deleting, deleteAndQuit, confirmDelete } = useDelete(); diff --git a/app/src/views/private/components/drawer-item/drawer-item.vue b/app/src/views/private/components/drawer-item/drawer-item.vue index 234d7f047d..57e357a8c1 100644 --- a/app/src/views/private/components/drawer-item/drawer-item.vue +++ b/app/src/views/private/components/drawer-item/drawer-item.vue @@ -109,12 +109,8 @@ export default defineComponent({ const relationsStore = useRelationsStore(); const { _active } = useActiveState(); - const { - junctionFieldInfo, - junctionRelatedCollection, - junctionRelatedCollectionInfo, - setJunctionEdits, - } = useJunction(); + const { junctionFieldInfo, junctionRelatedCollection, junctionRelatedCollectionInfo, setJunctionEdits } = + useJunction(); const { _edits, loading, item } = useItem(); const { save, cancel } = useActions(); diff --git a/package-lock.json b/package-lock.json index 9acc133c1b..0e79f0b7b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "npm-run-all": "^4.1.5", "oracledb": "^5.1.0", "pg": "^8.6.0", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "simple-git-hooks": "^2.4.1", "sqlite3": "^5.0.2", "stylelint": "^13.12.0", @@ -301,7 +301,7 @@ "nanoid": "^3.1.22", "pinia": "^0.0.7", "portal-vue": "^2.1.7", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "pretty-ms": "^7.0.1", "qrcode": "^1.4.4", "raw-loader": "^4.0.2", @@ -33805,9 +33805,9 @@ } }, "node_modules/prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "bin": { "prettier": "bin-prettier.js" }, @@ -51349,7 +51349,7 @@ "nanoid": "^3.1.22", "pinia": "^0.0.7", "portal-vue": "^2.1.7", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "pretty-ms": "^7.0.1", "qrcode": "^1.4.4", "raw-loader": "^4.0.2", @@ -79167,9 +79167,9 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==" }, "prettier-bytes": { "version": "1.0.4", diff --git a/package.json b/package.json index c1cca58929..0213080e3a 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "npm-run-all": "^4.1.5", "oracledb": "^5.1.0", "pg": "^8.6.0", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "simple-git-hooks": "^2.4.1", "sqlite3": "^5.0.2", "stylelint": "^13.12.0",