Skip to content

Commit 0eda72d

Browse files
Antreesybackportbot[bot]
authored andcommitted
chore(eslint): sorting rules
- perfectionist/sort-imports - perfectionist/sort-named-exports - perfectionist/sort-named-imports - vue/define-macros-order Signed-off-by: Maksim Sukharev <[email protected]>
1 parent 48684a8 commit 0eda72d

32 files changed

+93
-102
lines changed

eslint.config.mjs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ export default [
2727
'curly': 'off',
2828
'jsdoc/tag-lines': 'off',
2929
'import-extensions/extensions': 'off',
30-
'perfectionist/sort-imports': 'off',
31-
'perfectionist/sort-named-exports': 'off',
32-
'perfectionist/sort-named-imports': 'off',
3330
'vue/first-attribute-linebreak': 'off',
34-
'vue/define-macros-order': 'off',
3531
'vue/no-boolean-default': 'off',
3632
'vue/no-required-prop-with-default': 'off',
3733
'vue/no-unused-properties': 'off',

src/App.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,17 @@
4949
</template>
5050

5151
<script lang="ts" setup>
52-
import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue'
5352
import { translate as t } from '@nextcloud/l10n'
54-
import { useLogStore } from './store/logging'
55-
import { useSettingsStore } from './store/settings.js'
56-
5753
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
5854
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
5955
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
56+
import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue'
6057
import IconCog from 'vue-material-design-icons/CogOutline.vue'
6158
import IconFormatList from 'vue-material-design-icons/FormatListBulletedSquare.vue'
6259
import AppSettingsDialog from './components/settings/AppSettingsDialog.vue'
6360
import LogTable from './components/table/LogTable.vue'
61+
import { useLogStore } from './store/logging'
62+
import { useSettingsStore } from './store/settings.js'
6463
6564
import '@nextcloud/dialogs/style.css'
6665

src/api.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { expect, describe, it, vi, afterEach } from 'vitest'
6+
import { afterEach, describe, expect, it, vi } from 'vitest'
77
import { getAppSettings, getLog, pollLog, setAppSetting } from './api'
88

99
const mocks = vi.hoisted(() => {

src/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import type { AxiosRequestConfig, AxiosResponse } from '@nextcloud/axios'
77
import type { IAppSettings, INextcloud22LogEntry } from './interfaces'
88

9-
import { generateUrl } from '@nextcloud/router'
109
import axios from '@nextcloud/axios'
10+
import { generateUrl } from '@nextcloud/router'
1111

1212
interface ApiGetLog {
1313
offset?: number

src/components/IntersectionObserver.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,20 @@
1313
<script lang="ts" setup>
1414
import { onMounted, onUnmounted, ref } from 'vue'
1515
16-
const emit = defineEmits<{
16+
const props = defineProps<{
1717
/**
18-
* Emitted when an intersection is observed
18+
* Optional options used to initialize the IntersectionObserver
1919
*/
20-
(event: 'intersection'): void
20+
options?: IntersectionObserverInit
2121
}>()
2222
23-
const props = defineProps<{
23+
const emit = defineEmits<{
2424
/**
25-
* Optional options used to initialize the IntersectionObserver
25+
* Emitted when an intersection is observed
2626
*/
27-
options?: IntersectionObserverInit
27+
(event: 'intersection'): void
2828
}>()
29+
2930
/**
3031
* The observed element
3132
*/

src/components/LogDetailsModal.vue

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,29 @@
5959
<script setup lang="ts">
6060
import type { ILogEntry } from '../interfaces'
6161
62-
import { translate as t } from '@nextcloud/l10n'
6362
import { showSuccess } from '@nextcloud/dialogs'
64-
import { computed, ref, watchEffect } from 'vue'
65-
import { copyToCipboard } from '../utils/clipboard'
66-
import { useLogFormatting } from '../utils/format'
67-
import { LOGGING_LEVEL, LOGGING_LEVEL_NAMES } from '../constants'
68-
63+
import { translate as t } from '@nextcloud/l10n'
6964
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
7065
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
71-
import IconContentCopy from 'vue-material-design-icons/ContentCopy.vue'
7266
import hljs from 'highlight.js/lib/core'
7367
import json from 'highlight.js/lib/languages/json'
74-
75-
import 'highlight.js/styles/base16/material-darker.css'
68+
import { computed, ref, watchEffect } from 'vue'
69+
import IconContentCopy from 'vue-material-design-icons/ContentCopy.vue'
7670
import LogException from './exception/LogException.vue'
71+
import { LOGGING_LEVEL, LOGGING_LEVEL_NAMES } from '../constants'
72+
import { copyToCipboard } from '../utils/clipboard'
73+
import { useLogFormatting } from '../utils/format'
7774
78-
hljs.registerLanguage('json', json)
75+
import 'highlight.js/styles/base16/material-darker.css'
7976
8077
const props = defineProps<{
8178
open: boolean
8279
currentEntry: ILogEntry
8380
logEntries: readonly ILogEntry[]
8481
}>()
8582
83+
hljs.registerLanguage('json', json)
84+
8685
const { formatTime, formatLogEntry } = useLogFormatting()
8786
8887
/**

src/components/LogSearch.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
</template>
2828

2929
<script setup lang="ts">
30-
import { computed, onMounted, onUnmounted, ref } from 'vue'
3130
import { translate as t } from '@nextcloud/l10n'
32-
import { useLogStore } from '../store/logging'
33-
34-
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
3531
import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
36-
import IconTextSearch from 'vue-material-design-icons/TextSearch.vue'
32+
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
33+
import { computed, onMounted, onUnmounted, ref } from 'vue'
3734
import IconMagnify from 'vue-material-design-icons/Magnify.vue'
35+
import IconTextSearch from 'vue-material-design-icons/TextSearch.vue'
36+
import { useLogStore } from '../store/logging'
3837
3938
declare global {
4039
interface Window {

src/components/exception/LogException.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<script setup lang="ts">
2020
import type { IException } from '../../interfaces'
2121
22-
import { computed } from 'vue'
2322
import { translate as t } from '@nextcloud/l10n'
24-
23+
import { computed } from 'vue'
2524
import StackTrace from './StackTrace.vue'
2625
2726
const props = withDefaults(defineProps<{

src/components/exception/StackTrace.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<script setup lang="ts">
1313
import type { ITraceLine } from '../../interfaces'
14+
1415
import TraceLine from './TraceLine.vue'
1516
1617
const props = defineProps<{

src/components/exception/TraceLine.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<script setup lang="ts">
1919
import type { ITraceLine } from '../../interfaces'
2020
21-
import { computed } from 'vue'
2221
import { translate as t } from '@nextcloud/l10n'
22+
import { computed } from 'vue'
2323
2424
const props = defineProps<{
2525
line: ITraceLine

0 commit comments

Comments
 (0)