Skip to content

Commit b9ac4e7

Browse files
Antreesybackportbot[bot]
Antreesy
authored and
backportbot[bot]
committed
chore(eslint): @nextcloud/vue rules
- @nextcloud/vue/no-deprecated-exports - @nextcloud/vue/no-deprecated-props Signed-off-by: Maksim Sukharev <[email protected]>
1 parent 11a04be commit b9ac4e7

12 files changed

+27
-29
lines changed

‎eslint.config.mjs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ export default [
1010
{
1111
name: 'logreader/disabled-during-migration',
1212
rules: {
13-
'@nextcloud/vue/no-deprecated-exports': 'off',
14-
'@nextcloud/vue/no-deprecated-props': 'off',
1513
'@typescript-eslint/no-unsafe-function-type': 'off',
1614
'@typescript-eslint/no-unused-vars': 'off',
1715
'@typescript-eslint/no-use-before-define': 'off',

‎src/App.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<NcButton
1212
:aria-label="t('logreader', 'Open log reader settings')"
1313
class="settings-toggle"
14-
type="tertiary"
14+
variant="tertiary"
1515
@click="areSettingsShown = true">
1616
<template #icon>
1717
<IconCog :size="20" />
@@ -23,7 +23,7 @@
2323
<NcNoteCard v-if="settingsStore.localFile" type="info" class="info-note">
2424
<div class="info-note__content">
2525
<p>{{ t('logreader', 'Currently the log file {file} is shown', { file: settingsStore.localFileName }) }}</p>
26-
<NcButton type="secondary" @click="onShowServerLog">
26+
<NcButton variant="secondary" @click="onShowServerLog">
2727
{{ t('logreader', 'Show server log') }}
2828
</NcButton>
2929
</div>
@@ -51,10 +51,10 @@
5151

5252
<script lang="ts" setup>
5353
import { translate as t } from '@nextcloud/l10n'
54-
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
55-
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
56-
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
5754
import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue'
55+
import NcButton from '@nextcloud/vue/components/NcButton'
56+
import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
57+
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
5858
import IconCog from 'vue-material-design-icons/CogOutline.vue'
5959
import IconFormatList from 'vue-material-design-icons/FormatListBulletedSquare.vue'
6060
import AppSettingsDialog from './components/settings/AppSettingsDialog.vue'

‎src/components/LogDetailsModal.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<dd>{{ timeString }}</dd>
2626
</dl>
2727
<div class="log-details__actions">
28-
<NcButton :aria-label="t('logreader', 'Copy raw entry')" type="tertiary" @click="copyRaw">
28+
<NcButton :aria-label="t('logreader', 'Copy raw entry')" variant="tertiary" @click="copyRaw">
2929
<template #icon>
3030
<IconContentCopy />
3131
</template>
3232
{{ t('logreader', 'Copy raw entry') }}
3333
</NcButton>
34-
<NcButton :aria-label="t('logreader', 'Copy formatted entry')" type="tertiary" @click="copyFormatted">
34+
<NcButton :aria-label="t('logreader', 'Copy formatted entry')" variant="tertiary" @click="copyFormatted">
3535
<template #icon>
3636
<IconContentCopy />
3737
</template>
@@ -63,11 +63,11 @@ import type { ILogEntry } from '../interfaces'
6363
6464
import { showSuccess } from '@nextcloud/dialogs'
6565
import { translate as t } from '@nextcloud/l10n'
66-
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
67-
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
6866
import hljs from 'highlight.js/lib/core'
6967
import json from 'highlight.js/lib/languages/json'
7068
import { computed, ref, watchEffect } from 'vue'
69+
import NcButton from '@nextcloud/vue/components/NcButton'
70+
import NcModal from '@nextcloud/vue/components/NcModal'
7171
import IconContentCopy from 'vue-material-design-icons/ContentCopy.vue'
7272
import LogException from './exception/LogException.vue'
7373
import { LOGGING_LEVEL, LOGGING_LEVEL_NAMES } from '../constants'

‎src/components/LogSearch.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
<script setup lang="ts">
3232
import { translate as t } from '@nextcloud/l10n'
33-
import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
34-
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
3533
import { computed, onMounted, onUnmounted, ref } from 'vue'
34+
import NcActionInput from '@nextcloud/vue/components/NcActionInput'
35+
import NcActions from '@nextcloud/vue/components/NcActions'
3636
import IconMagnify from 'vue-material-design-icons/Magnify.vue'
3737
import IconTextSearch from 'vue-material-design-icons/TextSearch.vue'
3838
import { useLogStore } from '../store/logging'

‎src/components/settings/AppSettingsDialog.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<script setup lang="ts">
3131
import { translate as t } from '@nextcloud/l10n'
32-
import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
33-
import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
32+
import NcAppSettingsDialog from '@nextcloud/vue/components/NcAppSettingsDialog'
33+
import NcAppSettingsSection from '@nextcloud/vue/components/NcAppSettingsSection'
3434
import SettingsActions from './SettingsActions.vue'
3535
import SettingsDatetimeFormat from './SettingsDatetimeFormat.vue'
3636
import SettingsLiveView from './SettingsLiveView.vue'

‎src/components/settings/SettingsActions.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import { showError } from '@nextcloud/dialogs'
3838
import { translate as t } from '@nextcloud/l10n'
3939
import { generateUrl } from '@nextcloud/router'
40-
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
41-
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
4240
import { ref } from 'vue'
41+
import NcButton from '@nextcloud/vue/components/NcButton'
42+
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
4343
import IconDownload from 'vue-material-design-icons/TrayArrowDown.vue'
4444
import IconUpload from 'vue-material-design-icons/TrayArrowUp.vue'
4545
import { useLogStore } from '../../store/logging'

‎src/components/settings/SettingsDatetimeFormat.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ import type { IAppSettings } from '../../interfaces'
4949
5050
import { showError } from '@nextcloud/dialogs'
5151
import { translate as t } from '@nextcloud/l10n'
52-
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
5352
import { computed } from 'vue'
53+
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
5454
import { useSettingsStore } from '../../store/settings'
5555
import { logger } from '../../utils/logger'
5656

‎src/components/settings/SettingsLiveView.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<script setup lang="ts">
2020
import { showError } from '@nextcloud/dialogs'
2121
import { translate as t } from '@nextcloud/l10n'
22-
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
23-
import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
2422
import { computed } from 'vue'
23+
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
24+
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
2525
import { useSettingsStore } from '../../store/settings.js'
2626
import { logger } from '../../utils/logger'
2727

‎src/components/settings/SettingsLogLevels.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import type { IAppSettings } from '../../interfaces'
2525
2626
import { showError } from '@nextcloud/dialogs'
2727
import { translate as t } from '@nextcloud/l10n'
28-
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
2928
import { computed } from 'vue'
29+
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
3030
import { LOGGING_LEVEL_NAMES } from '../../constants'
3131
import { useSettingsStore } from '../../store/settings'
3232
import { debounce } from '../../utils/debounce'

‎src/components/settings/SettingsSetLogLevel.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import type { IAppSettings } from '../../interfaces'
2424
2525
import { showError } from '@nextcloud/dialogs'
2626
import { translate as t } from '@nextcloud/l10n'
27-
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
2827
import { computed } from 'vue'
28+
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
2929
import { LOGGING_LEVEL_NAMES } from '../../constants'
3030
import { useSettingsStore } from '../../store/settings'
3131
import { logger } from '../../utils/logger'

0 commit comments

Comments
 (0)