Backport of #2250 manually applied

CHANGELOG.md

@@ -22,6 +22,8 @@
 - Update dependencies (stylelint-config-idiomatic-ordering) by @dependabot
 - Update code styling by @dependabot
 - Update dependency @nextcloud/router by @dependabot
+- Backport of #2250 to use correct imports of NC core components
+  [#2252](https://github.com/nextcloud/cookbook/pull/2252) @seyfeb
 
 
 ## 0.10.4 - 2023-12-05

src/components/AppControls/AppControls.vue

@@ -194,12 +194,13 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router/composables';
-import NcActions from '@nextcloud/vue/dist/Components/NcActions';
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton';
-// Cannot use `Button` else get `vue/no-reserved-component-names` eslint errors
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput';
-import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon';
+import {
+    NcActions,
+    NcActionButton,
+    NcActionInput,
+    NcLoadingIcon,
+    NcButton,
+} from '@nextcloud/vue';
 
 import PencilIcon from 'icons/Pencil.vue';
 import LoadingIcon from 'icons/Loading.vue';

src/components/AppInvalidGuest.vue

@@ -24,8 +24,7 @@
 </template>
 
 <script setup>
-import NcContent from '@nextcloud/vue/dist/Components/NcContent';
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent';
+import { NcContent, NcAppContent } from '@nextcloud/vue';
 import { getFilePickerBuilder, FilePickerType } from '@nextcloud/dialogs';
 
 const selectFolder = () => {

src/components/AppMain.vue

@@ -22,8 +22,7 @@
 
 <script setup>
 import { getCurrentInstance, onMounted, onUnmounted, ref } from 'vue';
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent';
-import NcContent from '@nextcloud/vue/dist/Components/NcContent';
+import { NcAppContent, NcContent } from '@nextcloud/vue';
 import AppControls from 'cookbook/components/AppControls/AppControls.vue';
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus';
 import AppNavi from './AppNavi.vue';

src/components/AppNavi.vue

@@ -98,12 +98,14 @@ import {
 } from 'vue';
 
 import { emit } from '@nextcloud/event-bus';
-import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput';
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation';
-import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption';
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem';
-import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew';
-import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble';
+import {
+    NcActionInput,
+    NcAppNavigation,
+    NcAppNavigationCaption,
+    NcAppNavigationItem,
+    NcAppNavigationNew,
+    NcCounterBubble,
+} from '@nextcloud/vue';
 
 import PlusIcon from 'icons/Plus.vue';
 

src/components/FormComponents/EditMultiselect.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script setup>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect';
+import { NcMultiselect } from '@nextcloud/vue';
 
 defineProps({
     fieldLabel: {

src/components/FormComponents/EditMultiselectInputGroup.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script setup>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect';
+import { NcMultiselect } from '@nextcloud/vue';
 import { ref, defineProps, defineEmits, nextTick, watch } from 'vue';
 
 const emits = defineEmits(['input']);

src/components/List/EmptyList.vue

@@ -38,8 +38,7 @@
 <script setup>
 import { computed } from 'vue';
 import RecipeIcon from 'vue-material-design-icons/ChefHat.vue';
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent';
+import { NcButton, NcEmptyContent } from '@nextcloud/vue';
 import { useRoute } from 'vue-router/composables';
 import useDelayedDisplay, {
     DelayedDisplayProps,

src/components/List/RecipeList.vue

@@ -66,7 +66,7 @@
 
 <script setup>
 import { computed, onMounted, ref } from 'vue';
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect';
+import { NcMultiselect } from '@nextcloud/vue';
 import { useStore } from '../../store';
 import { normalize as normalizeString } from '../../js/string-utils';
 import EmptyList from './EmptyList.vue';

src/components/Modals/SettingsDialog.vue

@@ -187,10 +187,12 @@ import {
 import { subscribe, unsubscribe } from '@nextcloud/event-bus';
 import { getFilePickerBuilder } from '@nextcloud/dialogs';
 
-import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog';
-import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection';
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
-import { NcLoadingIcon as LoadingIcon } from '@nextcloud/vue';
+import {
+    NcAppSettingsDialog,
+    NcAppSettingsSection,
+    NcButton,
+    NcLoadingIcon as LoadingIcon,
+} from '@nextcloud/vue';
 import ReloadIcon from 'icons/Cached.vue';
 
 import api from 'cookbook/js/api-interface';

src/components/Modals/SimpleAlertModal.vue

@@ -12,8 +12,7 @@
 </template>
 
 <script setup>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal';
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
+import { NcModal, NcButton } from '@nextcloud/vue';
 </script>
 
 <script>

src/components/Modals/SimpleConfirmModal.vue

@@ -15,8 +15,7 @@
 </template>
 
 <script setup>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal';
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
+import { NcModal, NcButton } from '@nextcloud/vue';
 </script>
 
 <script>

src/components/RecipeEdit.vue

@@ -143,8 +143,7 @@ import {
     useRoute,
 } from 'vue-router/composables';
 
-import NcActions from '@nextcloud/vue/dist/Components/NcActions';
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton';
+import { NcActions, NcActionButton } from '@nextcloud/vue';
 
 import api from 'cookbook/js/api-interface';
 import helpers from 'cookbook/js/helper';

src/components/RecipeView/RecipeView.vue

@@ -362,7 +362,7 @@ import normalizeMarkdown from 'cookbook/js/title-rename';
 import { showSimpleAlertModal } from 'cookbook/js/modals';
 import yieldCalculator from 'cookbook/js/yieldCalculator';
 import ContentCopyIcon from 'icons/ContentCopy.vue';
-import NcButton from '@nextcloud/vue/dist/Components/NcButton';
+import { NcButton } from '@nextcloud/vue';
 import { useStore } from '../../store';
 import emitter from '../../bus';
 import { parseDateTime } from '../../composables/dateTimeHandling';