chore: Adjust viteconfig for updated vite version

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud-libraries · Feb 16, 2025 · 795da89 · 795da89
1 parent 54ad228
commit 795da89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cypress.config.mjs b/cypress.config.mjs
@@ -77,9 +77,9 @@ export default defineConfig({
 							devSourcemap: true,
 							preprocessorOptions: {
 								scss: {
-									additionalData: `@use 'sass:math'; $scope_version:${SCOPE_VERSION}; @import 'variables'; @import 'material-icons';`,
+									additionalData: `@use 'sass:math'; @use 'variables.scss' as *; @use 'material-icons.css' as *; $scope_version:${SCOPE_VERSION};`,
 									sourceMapContents: false,
-									includePaths: [
+									loadPaths: [
 										resolve(__dirname, 'src/assets'),
 									],
 								},

diff --git a/src/components/NcAppNavigation/NcAppNavigation.vue b/src/components/NcAppNavigation/NcAppNavigation.vue
@@ -56,8 +56,8 @@
 </template>
 
 <script>
-	import IconCheck from 'vue-material-design-icons/Check'
-	import IconCog from 'vue-material-design-icons/Cog'
+	import IconCheck from 'vue-material-design-icons/Check.vue'
+	import IconCog from 'vue-material-design-icons/Cog.vue'
 
 	export default {
 		components: {
@@ -346,7 +346,7 @@ export default {
 
 		isFocusWithinNavigation() {
 			const activeElement = document.activeElement
-			return this.$refs.appNavigationContainer.contains(activeElement)
+			return this.$refs.appNavigationContainer?.contains(activeElement)
 		},
 	},
 }

diff --git a/src/components/NcAppSidebar/NcAppSidebar.vue b/src/components/NcAppSidebar/NcAppSidebar.vue
@@ -398,7 +398,7 @@ Note: the built-in toggle button is only available then NcAppSidebar is used in
 </template>
 
 <script>
-import Cog from 'vue-material-design-icons/Cog'
+import Cog from 'vue-material-design-icons/Cog.vue'
 
 export default {
 	components: {
@@ -479,7 +479,7 @@ If the sidebar should be shown conditionally without any explicit toggle button,
 </template>
 
 <script>
-import Cog from 'vue-material-design-icons/Cog'
+import Cog from 'vue-material-design-icons/Cog.vue'
 
 export default {
 	components: {

diff --git a/vite.config.mts b/vite.config.mts
@@ -87,9 +87,9 @@ const overrides = defineConfig({
 		devSourcemap: true,
 		preprocessorOptions: {
 			scss: {
-				additionalData: `@use 'sass:math'; $scope_version:${SCOPE_VERSION}; @import 'variables'; @import 'material-icons';`,
+				additionalData: `@use 'sass:math'; @use 'variables.scss' as *; @use 'material-icons.css' as *; $scope_version:${SCOPE_VERSION};`,
 				sourceMapContents: false,
-				includePaths: [
+				loadPaths: [
 					resolve(__dirname, 'src/assets'),
 				],
 			},