refactor(core): use consistent import style for the logger

core/src/OC/capabilities.js

@@ -4,7 +4,7 @@
  */
 
 import { getCapabilities as realGetCapabilities } from '@nextcloud/capabilities'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 /**
  * Returns the capabilities

core/src/OC/dialogs.js

@@ -11,7 +11,7 @@ import { t } from '@nextcloud/l10n'
 import { spawnDialog } from '@nextcloud/vue/functions/dialog'
 import { basename } from 'path'
 import { defineAsyncComponent } from 'vue'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 /**
  * this class to ease the usage of dialogs

core/src/OC/index.js

@@ -25,7 +25,7 @@ import {
 	imagePath,
 	linkTo,
 } from '@nextcloud/router'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 import { isUserAdmin } from './admin.js'
 import { appConfig } from './appconfig.js'
 import appswebroots from './appswebroots.js'

core/src/OC/util.js

@@ -5,7 +5,7 @@
 
 import { formatFileSize as humanFileSize } from '@nextcloud/files'
 import moment from 'moment'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 import OC from './index.js'
 import History from './util-history.js'
 

core/src/ajax-cron.ts

@@ -4,7 +4,7 @@
  */
 
 import { getRootUrl } from '@nextcloud/router'
-import logger from './logger.js'
+import { logger } from './utils/logger.ts'
 
 window.addEventListener('DOMContentLoaded', async () => {
 	// When the page is loaded send GET to the cron endpoint to trigger background jobs

core/src/components/AppMenu.vue

@@ -103,7 +103,7 @@ import IconCog from 'vue-material-design-icons/Cog.vue'
 import IconDotsGrid from 'vue-material-design-icons/DotsGrid.vue'
 import AppMenuActions from './AppMenuActions.vue'
 import AppMenuItem from './AppMenuItem.vue'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 // Settings IDs that represent actions, not navigable pages.
 const SETTINGS_ACTION_IDS = new Set(['logout'])

core/src/components/PublicPageMenu/PublicPageMenuExternalDialog.vue

@@ -38,7 +38,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcDialog from '@nextcloud/vue/components/NcDialog'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
-import logger from '../../logger.js'
+import { logger } from '../../utils/logger.ts'
 
 defineProps<{
 	label: string

core/src/components/UnifiedSearch/UnifiedSearchModal.vue

@@ -285,9 +285,9 @@ import FilterChip from './SearchFilterChip.vue'
 import SearchResult from './SearchResult.vue'
 import SearchResultSkeleton from './SearchResultSkeleton.vue'
 import { useUnifiedSearch } from '../../composables/useUnifiedSearch.ts'
-import { unifiedSearchLogger } from '../../logger.js'
 import { getContacts, getProviders } from '../../services/UnifiedSearchService.js'
 import { useSearchStore } from '../../store/unified-search-external-filters.js'
+import { unifiedSearchLogger } from '../../utils/logger.ts'
 
 /**
  * Rows shown per category in the aggregate list. A view-only cap: the controller keeps

core/src/components/login/PasswordLessLoginForm.vue

@@ -59,12 +59,12 @@ import NcTextField from '@nextcloud/vue/components/NcTextField'
 import InformationIcon from 'vue-material-design-icons/InformationOutline.vue'
 import LockOpenIcon from 'vue-material-design-icons/LockOpen.vue'
 import LoginButton from './LoginButton.vue'
-import logger from '../../logger.js'
 import {
 	finishAuthentication,
 	NoValidCredentials,
 	startAuthentication,
 } from '../../services/WebAuthnAuthenticationService.ts'
+import { logger } from '../../utils/logger.ts'
 
 export default defineComponent({
 	name: 'PasswordLessLoginForm',

core/src/components/login/ResetPassword.vue

@@ -51,8 +51,8 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 import LoginButton from './LoginButton.vue'
-import logger from '../../logger.js'
 import AuthMixin from '../../mixins/auth.js'
+import { logger } from '../../utils/logger.ts'
 
 export default defineComponent({
 	name: 'ResetPassword',

core/src/components/setup/RecommendedApps.vue

@@ -67,7 +67,7 @@ import { t } from '@nextcloud/l10n'
 import { imagePath } from '@nextcloud/router'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
-import logger from '../../logger.js'
+import { logger } from '../../utils/logger.ts'
 import * as appstoreApi from '~/apps/appstore/src/service/api.ts'
 import { canInstall } from '~/apps/appstore/src/utils/appStatus.js'
 

core/src/maintenance.js

@@ -5,7 +5,7 @@
 
 import Axios from '@nextcloud/axios'
 import { getRootUrl } from '@nextcloud/router'
-import logger from './logger.js'
+import { logger } from './utils/logger.ts'
 
 const url = getRootUrl() + '/status.php'
 

core/src/recommendedapps.js

@@ -9,7 +9,7 @@ import { translate as t } from '@nextcloud/l10n'
 import { addPasswordConfirmationInterceptors } from '@nextcloud/password-confirmation'
 import Vue from 'vue'
 import RecommendedApps from './components/setup/RecommendedApps.vue'
-import logger from './logger.js'
+import { logger } from './utils/logger.ts'
 
 addPasswordConfirmationInterceptors(axios)
 

core/src/services/LegacyUnifiedSearchService.js

@@ -6,7 +6,7 @@
 import axios from '@nextcloud/axios'
 import { loadState } from '@nextcloud/initial-state'
 import { generateOcsUrl } from '@nextcloud/router'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 export const defaultLimit = loadState('unified-search', 'limit-default')
 export const minSearchLength = loadState('unified-search', 'min-search-length', 1)

core/src/services/UnifiedSearchService.js

@@ -6,7 +6,7 @@
 import { getCurrentUser } from '@nextcloud/auth'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl, generateUrl } from '@nextcloud/router'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 /**
  * Create a cancel token

core/src/services/WebAuthnAuthenticationService.ts

@@ -8,7 +8,7 @@ import type { AuthenticationResponseJSON, PublicKeyCredentialRequestOptionsJSON
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { startAuthentication as startWebauthnAuthentication } from '@simplewebauthn/browser'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 export class NoValidCredentials extends Error {}
 

core/src/session-heartbeat.ts

@@ -7,11 +7,11 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { emit } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl } from '@nextcloud/router'
-import logger from './logger.js'
 import {
 	fetchRequestToken,
 	getRequestToken,
 } from './OC/requesttoken.ts'
+import { logger } from './utils/logger.ts'
 
 interface OcJsConfig {
 	auto_logout: boolean

core/src/tests/components/UnifiedSearchModal.spec.ts

@@ -39,7 +39,7 @@ vi.mock('../../store/unified-search-external-filters.js', () => ({
 // The real module builds a logger at import time (detectUser() and all), and the modal
 // logs on provider init. Stubbed to keep the unit off that dependency and out of the
 // test output; the vi.fn()s also leave log calls assertable if a test ever needs them.
-vi.mock('../../logger.js', () => ({
+vi.mock('../../utils/logger.ts', () => ({
 	unifiedSearchLogger: { debug: vi.fn(), error: vi.fn() },
 }))
 

core/src/tests/utils/RedirectUnsupportedBrowsers.spec.ts

@@ -12,8 +12,8 @@ vi.mock('@nextcloud/router', () => ({
 }))
 
 // Mock the logger to suppress output
-vi.mock('../../logger.js', () => ({
-	default: { debug: vi.fn() },
+vi.mock('../../utils/logger.ts', () => ({
+	logger: { debug: vi.fn() },
 }))
 
 const browserStorage = vi.hoisted(() => ({ getItem: vi.fn(() => null) }))

core/src/utils/ClipboardFallback.ts

@@ -4,7 +4,7 @@
  */
 
 import { t } from '@nextcloud/l10n'
-import logger from '../logger.js'
+import { logger } from './logger.ts'
 
 /**
  *

core/src/utils/RedirectUnsupportedBrowsers.js

@@ -4,9 +4,9 @@
  */
 
 import { generateUrl } from '@nextcloud/router'
-import logger from '../logger.js'
 import { supportedBrowsersRegExp } from '../services/BrowsersListService.js'
 import browserStorage from '../services/BrowserStorageService.js'
+import { logger } from './logger.ts'
 
 export const browserStorageKey = 'unsupported-browser-ignore'
 const redirectPath = generateUrl('/unsupported')

core/src/utils/logger.ts

@@ -0,0 +1,16 @@
+/*!
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { getLoggerBuilder } from '@nextcloud/logger'
+
+export const logger = getLoggerBuilder()
+	.setApp('core')
+	.detectUser()
+	.build()
+
+export const unifiedSearchLogger = getLoggerBuilder()
+	.setApp('unified-search')
+	.detectUser()
+	.build()

core/src/utils/xhr-request.js

@@ -5,7 +5,7 @@
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl, getRootUrl } from '@nextcloud/router'
-import logger from '../logger.js'
+import { logger } from './logger.ts'
 
 /**
  *

core/src/views/AccountMenu.vue

@@ -51,7 +51,7 @@ import NcAvatar from '@nextcloud/vue/components/NcAvatar'
 import NcHeaderMenu from '@nextcloud/vue/components/NcHeaderMenu'
 import AccountMenuEntry from '../components/AccountMenu/AccountMenuEntry.vue'
 import AccountMenuProfileEntry from '../components/AccountMenu/AccountMenuProfileEntry.vue'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 interface ISettingsNavigationEntry {
 	/**

core/src/views/ContactsMenu.vue

@@ -21,7 +21,7 @@ import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 import ContactMenuEntry from '../components/ContactsMenu/ContactMenuEntry.vue'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 const storage = getBuilder('core:contacts')
 	.persist(true)

core/src/views/LegacyUnifiedSearch.vue

@@ -124,8 +124,8 @@ import NcTextField from '@nextcloud/vue/components/NcTextField'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import SearchResult from '../components/UnifiedSearch/LegacySearchResult.vue'
 import SearchResultPlaceholders from '../components/UnifiedSearch/SearchResultPlaceholders.vue'
-import logger from '../logger.js'
 import { defaultLimit, enableLiveSearch, getTypes, minSearchLength, regexFilterIn, regexFilterNot, search } from '../services/LegacyUnifiedSearchService.js'
+import { logger } from '../utils/logger.ts'
 
 const REQUEST_FAILED = 0
 const REQUEST_OK = 1

core/src/views/UnifiedSearch.vue

@@ -39,7 +39,7 @@ import debounce from 'debounce'
 import { defineComponent } from 'vue'
 import UnifiedSearchInput from '../components/UnifiedSearch/UnifiedSearchInput.vue'
 import UnifiedSearchModal from '../components/UnifiedSearch/UnifiedSearchModal.vue'
-import logger from '../logger.js'
+import { logger } from '../utils/logger.ts'
 
 export default defineComponent({
 	name: 'UnifiedSearch',

core/src/views/UnsupportedBrowser.vue

@@ -37,9 +37,9 @@ import { agents } from 'caniuse-lite/dist/unpacker/agents.js'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import Web from 'vue-material-design-icons/Web.vue'
-import logger from '../logger.js'
 import { supportedBrowsers } from '../services/BrowsersListService.js'
 import browserStorage from '../services/BrowserStorageService.js'
+import { logger } from '../utils/logger.ts'
 import { browserStorageKey } from '../utils/RedirectUnsupportedBrowsers.js'
 
 logger.debug('Supported browsers', { supportedBrowsers })