diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index f8315eaf1f9..24a3b481208 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/apps/federatedfilesharing/src/components/AdminSettings.vue @@ -73,8 +73,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation' import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch' import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'AdminSettings', diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index a9a3cbb9cef..9d4d1e0deca 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -73,8 +73,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' import NcNoteCard from '@nextcloud/vue/components/NcNoteCard' -import '@nextcloud/password-confirmation/dist/style.css' - const lastCron = loadState('settings', 'lastCron') const cronMaxAge = loadState('settings', 'cronMaxAge', '') const backgroundJobsMode = loadState('settings', 'backgroundJobsMode', 'cron') diff --git a/apps/settings/src/components/WebAuthn/AddDevice.vue b/apps/settings/src/components/WebAuthn/AddDevice.vue index db00bae451a..3d3d37dec98 100644 --- a/apps/settings/src/components/WebAuthn/AddDevice.vue +++ b/apps/settings/src/components/WebAuthn/AddDevice.vue @@ -59,8 +59,6 @@ import { finishRegistration, } from '../../service/WebAuthnRegistrationSerice.ts' -import '@nextcloud/password-confirmation/dist/style.css' - const logAndPass = (text) => (data) => { logger.debug(text) return data diff --git a/apps/settings/src/components/WebAuthn/Section.vue b/apps/settings/src/components/WebAuthn/Section.vue index fa818c24355..8930e3511e8 100644 --- a/apps/settings/src/components/WebAuthn/Section.vue +++ b/apps/settings/src/components/WebAuthn/Section.vue @@ -45,8 +45,6 @@ import Device from './Device.vue' import logger from '../../logger.ts' import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js' -import '@nextcloud/password-confirmation/dist/style.css' - const sortByName = sortBy('name') export default { diff --git a/apps/settings/src/main-personal-security.js b/apps/settings/src/main-personal-security.js index 583a375fb0e..ef51af85df6 100644 --- a/apps/settings/src/main-personal-security.js +++ b/apps/settings/src/main-personal-security.js @@ -10,8 +10,6 @@ import Vue from 'vue' import AuthTokenSection from './components/AuthTokenSection.vue' -import '@nextcloud/password-confirmation/dist/style.css' - // eslint-disable-next-line camelcase __webpack_nonce__ = getCSPNonce() diff --git a/apps/settings/src/service/PersonalInfo/EmailService.js b/apps/settings/src/service/PersonalInfo/EmailService.js index 0adbe5225bc..3d36ded3510 100644 --- a/apps/settings/src/service/PersonalInfo/EmailService.js +++ b/apps/settings/src/service/PersonalInfo/EmailService.js @@ -10,8 +10,6 @@ import axios from '@nextcloud/axios' import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts' -import '@nextcloud/password-confirmation/dist/style.css' - /** * Save the primary email of the user * diff --git a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js index f2eaac91301..38a33db4462 100644 --- a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js +++ b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js @@ -10,8 +10,6 @@ import axios from '@nextcloud/axios' import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts' -import '@nextcloud/password-confirmation/dist/style.css' - /** * Save the primary account property value for the user * diff --git a/apps/settings/src/service/ProfileService.js b/apps/settings/src/service/ProfileService.js index 3e6c7cd622f..2576e73ba93 100644 --- a/apps/settings/src/service/ProfileService.js +++ b/apps/settings/src/service/ProfileService.js @@ -7,7 +7,6 @@ import axios from '@nextcloud/axios' import { getCurrentUser } from '@nextcloud/auth' import { generateOcsUrl } from '@nextcloud/router' import { confirmPassword } from '@nextcloud/password-confirmation' -import '@nextcloud/password-confirmation/dist/style.css' /** * Save the visibility of the profile parameter diff --git a/apps/settings/src/store/api.js b/apps/settings/src/store/api.js index f36d44cc5c0..f027840c468 100644 --- a/apps/settings/src/store/api.js +++ b/apps/settings/src/store/api.js @@ -5,7 +5,6 @@ import axios from '@nextcloud/axios' import { confirmPassword } from '@nextcloud/password-confirmation' -import '@nextcloud/password-confirmation/dist/style.css' const sanitize = function(url) { return url.replace(/\/$/, '') // Remove last url slash diff --git a/apps/settings/src/store/authtoken.ts b/apps/settings/src/store/authtoken.ts index daf5583ab8c..efd3b49e32c 100644 --- a/apps/settings/src/store/authtoken.ts +++ b/apps/settings/src/store/authtoken.ts @@ -12,8 +12,6 @@ import { defineStore } from 'pinia' import axios from '@nextcloud/axios' import logger from '../logger' -import '@nextcloud/password-confirmation/dist/style.css' - const BASE_URL = generateUrl('/settings/personal/authtokens') const confirm = () => { diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue index a3f813195e7..531d5a94c17 100644 --- a/apps/sharebymail/src/components/AdminSettings.vue +++ b/apps/sharebymail/src/components/AdminSettings.vue @@ -29,8 +29,6 @@ import axios from '@nextcloud/axios' import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch' import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'AdminSettings', components: { diff --git a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue index 3e17613bb47..f2746fcb936 100644 --- a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue +++ b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue @@ -60,8 +60,6 @@ import { print } from '../service/PrintService.js' import NcButton from '@nextcloud/vue/components/NcButton' import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'PersonalSettings', components: { diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js index 84a76a644a8..b015d23922f 100644 --- a/apps/workflowengine/src/store.js +++ b/apps/workflowengine/src/store.js @@ -10,8 +10,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation' import { loadState } from '@nextcloud/initial-state' import { getApiUrl } from './helpers/api.js' -import '@nextcloud/password-confirmation/dist/style.css' - Vue.use(Vuex) const store = new Store({ diff --git a/build/WebpackSPDXPlugin.js b/build/WebpackSPDXPlugin.js index 73c2be2a896..d05da081531 100644 --- a/build/WebpackSPDXPlugin.js +++ b/build/WebpackSPDXPlugin.js @@ -201,8 +201,10 @@ class WebpackSPDXPlugin { const match = source.match(/asset\/inline\|data:image\/svg\+xml,(.+)/) if (match) { const content = decodeURI(match[1]) + // REUSE-IgnoreStart const [, license] = content.match(/SPDX-License-Identifier:\s*([^\s]+)/) ?? [] const [, author] = content.match(/SPDX-FileCopyrightText:\s*([^-]+)/) ?? [] + // REUSE-IgnoreEnd if (author && license) { authors.add(author) licenses.add(license) @@ -216,12 +218,14 @@ class WebpackSPDXPlugin { output = '' } + // REUSE-IgnoreStart for (const author of [...authors].sort()) { output = `SPDX-FileCopyrightText: ${author}\n${output}` } for (const license of [...licenses].sort()) { output = `SPDX-License-Identifier: ${license}\n${output}` } + // REUSE-IgnoreEnd compilation.emitAsset( asset.split('?', 2)[0] + '.license', diff --git a/core/css/server.scss b/core/css/server.scss index 593556a65f8..f880c0dac64 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -12,5 +12,6 @@ @use 'mobile'; @use 'tooltip'; // If you include .css, it will be imported as url -@use '../../node_modules/@nextcloud/dialogs/dist/style'; +@use '../../node_modules/@nextcloud/dialogs/dist/style' as *; +@use '../../node_modules/@nextcloud/password-confirmation/dist/style' as *; @use 'public'; diff --git a/core/src/OC/password-confirmation.js b/core/src/OC/password-confirmation.js index 621f7a0695f..488050d50d7 100644 --- a/core/src/OC/password-confirmation.js +++ b/core/src/OC/password-confirmation.js @@ -4,7 +4,6 @@ */ import { confirmPassword, isPasswordConfirmationRequired } from '@nextcloud/password-confirmation' -import '@nextcloud/password-confirmation/dist/style.css' /** * @namespace OC.PasswordConfirmation