Skip to content

Commit d2c959c

Browse files
committed
refactor(core): use consistent import style for the logger
1. move it into utils 2. do not mix default and named exports 3. adjust usage to new location + only named export Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent b888c42 commit d2c959c

29 files changed

Lines changed: 44 additions & 58 deletions

core/src/OC/capabilities.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { getCapabilities as realGetCapabilities } from '@nextcloud/capabilities'
7-
import logger from '../logger.js'
7+
import { logger } from '../utils/logger.ts'
88

99
/**
1010
* Returns the capabilities

core/src/OC/dialogs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { t } from '@nextcloud/l10n'
1111
import { spawnDialog } from '@nextcloud/vue/functions/dialog'
1212
import { basename } from 'path'
1313
import { defineAsyncComponent } from 'vue'
14-
import logger from '../logger.js'
14+
import { logger } from '../utils/logger.ts'
1515

1616
/**
1717
* this class to ease the usage of dialogs

core/src/OC/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
imagePath,
2626
linkTo,
2727
} from '@nextcloud/router'
28-
import logger from '../logger.js'
28+
import { logger } from '../utils/logger.ts'
2929
import { isUserAdmin } from './admin.js'
3030
import { appConfig } from './appconfig.js'
3131
import appswebroots from './appswebroots.js'

core/src/OC/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { formatFileSize as humanFileSize } from '@nextcloud/files'
77
import moment from 'moment'
8-
import logger from '../logger.js'
8+
import { logger } from '../utils/logger.ts'
99
import OC from './index.js'
1010
import History from './util-history.js'
1111

core/src/ajax-cron.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { getRootUrl } from '@nextcloud/router'
7-
import logger from './logger.js'
7+
import { logger } from './utils/logger.ts'
88

99
window.addEventListener('DOMContentLoaded', async () => {
1010
// When the page is loaded send GET to the cron endpoint to trigger background jobs

core/src/components/AppMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ import IconCog from 'vue-material-design-icons/Cog.vue'
103103
import IconDotsGrid from 'vue-material-design-icons/DotsGrid.vue'
104104
import AppMenuActions from './AppMenuActions.vue'
105105
import AppMenuItem from './AppMenuItem.vue'
106-
import logger from '../logger.js'
106+
import { logger } from '../utils/logger.ts'
107107
108108
// Settings IDs that represent actions, not navigable pages.
109109
const SETTINGS_ACTION_IDS = new Set(['logout'])

core/src/components/PublicPageMenu/PublicPageMenuExternalDialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
3838
import NcDialog from '@nextcloud/vue/components/NcDialog'
3939
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
4040
import NcTextField from '@nextcloud/vue/components/NcTextField'
41-
import logger from '../../logger.js'
41+
import { logger } from '../../utils/logger.ts'
4242
4343
defineProps<{
4444
label: string

core/src/components/UnifiedSearch/UnifiedSearchModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ import FilterChip from './SearchFilterChip.vue'
285285
import SearchResult from './SearchResult.vue'
286286
import SearchResultSkeleton from './SearchResultSkeleton.vue'
287287
import { useUnifiedSearch } from '../../composables/useUnifiedSearch.ts'
288-
import { unifiedSearchLogger } from '../../logger.js'
289288
import { getContacts, getProviders } from '../../services/UnifiedSearchService.js'
290289
import { useSearchStore } from '../../store/unified-search-external-filters.js'
290+
import { unifiedSearchLogger } from '../../utils/logger.ts'
291291
292292
/**
293293
* Rows shown per category in the aggregate list. A view-only cap: the controller keeps

core/src/components/login/PasswordLessLoginForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ import NcTextField from '@nextcloud/vue/components/NcTextField'
5959
import InformationIcon from 'vue-material-design-icons/InformationOutline.vue'
6060
import LockOpenIcon from 'vue-material-design-icons/LockOpen.vue'
6161
import LoginButton from './LoginButton.vue'
62-
import logger from '../../logger.js'
6362
import {
6463
finishAuthentication,
6564
NoValidCredentials,
6665
startAuthentication,
6766
} from '../../services/WebAuthnAuthenticationService.ts'
67+
import { logger } from '../../utils/logger.ts'
6868
6969
export default defineComponent({
7070
name: 'PasswordLessLoginForm',

core/src/components/login/ResetPassword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ import NcButton from '@nextcloud/vue/components/NcButton'
5151
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
5252
import NcTextField from '@nextcloud/vue/components/NcTextField'
5353
import LoginButton from './LoginButton.vue'
54-
import logger from '../../logger.js'
5554
import AuthMixin from '../../mixins/auth.js'
55+
import { logger } from '../../utils/logger.ts'
5656
5757
export default defineComponent({
5858
name: 'ResetPassword',

0 commit comments

Comments
 (0)