[Vue3][Quasar2] Removed old composition-api, now included in Vue

src/components/about/Developer.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'Developer',
   props: {

src/components/loading/CircularProgress.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'CircularProgress',
 });

src/components/loading/DarkCircularProgress.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'DarkCircularProgress',
 });

src/components/navigation/EmptyParent.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'EmptyParent',

src/components/navigation/EssentialLink.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({

src/components/navigation/ShortCutLink.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({

src/components/utils/IsoDateInput.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import { date } from 'quasar';
 interface Props {
   value?: Date;

src/layouts/OutLayout.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 import ShortCutLink from 'components/navigation/ShortCutLink.vue';
 
 export default defineComponent({

src/pages/Dashboard.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, ref } from '@vue/composition-api';
+import { defineComponent, onMounted, ref } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 import { AsyncComponentPromise } from 'vue/types/options';
 

src/pages/Login.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Loading, Notify } from 'quasar';
 import { setBaseUrl } from 'boot/axios';
 

src/pages/Offline.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onUnmounted } from '@vue/composition-api';
+import { defineComponent, ref, onUnmounted } from 'vue';
 
 export default defineComponent({
   name: 'Offline',

src/pages/PluginError.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'PluginError.vue',

src/pages/Reset.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Loading, Notify } from 'quasar';
 import { AxiosResponse } from 'axios';
 

src/pages/about/About.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 import Developer from 'components/about/Developer.vue';
 
 const developers = [

src/plugins/balance/components/BalanceAdd.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts">
-import { computed, ref, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, ref, defineComponent, onBeforeMount } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';

src/plugins/balance/components/BalanceHeader.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { ref, computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { ref, computed, defineComponent, onBeforeMount } from 'vue';
 import UserSelector from 'src/plugins/user/components/UserSelector.vue';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';

src/plugins/balance/components/BalanceTransfer.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts">
-import { computed, ref, defineComponent } from '@vue/composition-api';
+import { computed, ref, defineComponent } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';

src/plugins/balance/components/Transaction.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts">
-import { ref, computed, defineComponent, onUnmounted, onMounted } from '@vue/composition-api';
+import { ref, computed, defineComponent, onUnmounted, onMounted } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { formatDateTime } from 'src/utils/datetime';
 import { StateInterfaceBalance } from 'src/plugins/balance/store/balance';

src/plugins/balance/components/Widget.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount } from 'vue';
 import { StateInterfaceBalance } from 'src/plugins/balance/store/balance';
 import { Store } from 'vuex';
 

src/plugins/balance/pages/Admin.vue

@@ -13,7 +13,7 @@
 <script lang="ts">
 // TODO: Fill usefull data
 
-import { ref, defineComponent, onMounted } from '@vue/composition-api';
+import { ref, defineComponent, onMounted } from 'vue';
 import { StateInterfaceBalance, BalancesResponse } from '../store/balance';
 import { Store } from 'vuex';
 export default defineComponent({

src/plugins/balance/pages/MainPage.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onMounted } from '@vue/composition-api';
+import { computed, defineComponent, ref, onMounted } from 'vue';
 import { Store } from 'vuex';
 import { hasPermissions, hasSomePermissions } from 'src/utils/permission';
 import PERMISSIONS from '../permissions';

src/plugins/balance/pages/Overview.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref } from '@vue/composition-api';
+import { computed, defineComponent, onMounted, ref } from 'vue';
 import { StateInterfaceBalance, TransactionsResponse } from '../store/balance';
 import { Store } from 'vuex';
 import { formatDateTime } from 'src/utils/datetime';

src/plugins/schedule/components/Widget.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'DummyWidget',

src/plugins/schedule/components/management/CreateEvent.vue

@@ -64,7 +64,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onBeforeMount, computed } from '@vue/composition-api';
+import { defineComponent, ref, onBeforeMount, computed } from 'vue';
 import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
 import Job from './Job.vue';
 import { Store } from 'vuex';

src/plugins/schedule/components/management/Eventtypes.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, onBeforeMount } from '@vue/composition-api';
+import { defineComponent, ref, computed, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { ScheduleInterface, EventType } from '../../store/schedule';

src/plugins/schedule/components/management/Job.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref } from '@vue/composition-api';
+import { defineComponent, computed, ref } from 'vue';
 import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';

src/plugins/schedule/components/management/JobTypes.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, onBeforeMount } from '@vue/composition-api';
+import { defineComponent, ref, computed, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { ScheduleInterface, JobType } from '../../store/schedule';

src/plugins/schedule/pages/MainPage.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import EssentialLink from 'src/components/navigation/EssentialLink.vue';
 import mainRoutes from 'src/plugins/schedule/routes';
 import { Store } from 'vuex';

src/plugins/schedule/pages/Management.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import Eventtypes from '../components/management/Eventtypes.vue';
 import JobTypes from '../components/management/JobTypes.vue';
 import CreateEvent from '../components/management/CreateEvent.vue';

src/plugins/user/components/NewUser.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import MainUserSettings from 'src/plugins/user/components/settings/MainUserSettings.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';

src/plugins/user/components/UpdateUser.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from '../../../store';
 import UserSelector from '../components/UserSelector.vue';

src/plugins/user/components/UserSelector.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 

src/plugins/user/components/Widget.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref } from '@vue/composition-api';
+import { computed, defineComponent, onMounted, ref } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 

src/plugins/user/components/settings/MainUserSettings.vue

@@ -107,7 +107,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, ref, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { hasPermission } from 'src/utils/permission';

src/plugins/user/components/settings/RoleSettings.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, ref, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 

src/plugins/user/components/settings/Sessions.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed } from '@vue/composition-api';
+import { defineComponent, ref, computed } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 

src/plugins/user/pages/AdminSettings.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import RoleSettings from '../components/settings/RoleSettings.vue';
 import UpdateUser from '../components/UpdateUser.vue';
 import NewUser from '../components/NewUser.vue';

src/plugins/user/pages/MainPage.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import EssentialLink from 'src/components/navigation/EssentialLink.vue';
 import mainRoutes from 'src/plugins/user/routes';
 export default defineComponent({

src/plugins/user/pages/Settings.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount, ref } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount, ref } from 'vue';
 import Sessions from '../components/settings/Sessions.vue';
 import MainUserSettings from '../components/settings/MainUserSettings.vue';
 import { Store } from 'vuex';
@@ -24,7 +24,7 @@ import setLoadingBar from 'src/utils/loading';
 export default defineComponent({
   // name: 'PageName'
   components: { Sessions, MainUserSettings },
-  setup(_, { root }) {
+  setup(_, _,  {
     const store = <Store<StateInterface>>root.$store;
 
     onBeforeMount(() => {

src/utils/loading.ts

@@ -1,4 +1,4 @@
-import { watch, WatchSource } from '@vue/composition-api';
+import { watch, WatchSource } from 'vue';
 import { LoadingBar } from 'quasar';
 
 function setLoadingBar(loading: WatchSource<boolean>) {