From 97d9e2a10951c97782b2fbf3053c5e9ec9bd863c Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Sun, 23 Oct 2022 13:02:56 -0800
Subject: [PATCH] chore: lint-and-fix-vue-demi-imports (#1762)

* lint for 'vue-demi' imports

* fix invalid imports
---
 frontend/.eslintrc.js                                |  5 ++++-
 .../RecipeOcrEditorPageCanvas.vue                    |  3 +--
 .../Domain/Recipe/RecipeOrganizerSelector.vue        |  3 +--
 .../Domain/Recipe/RecipePage/RecipePage.vue          | 12 ++++++++++--
 frontend/pages/admin/backups.vue                     |  3 +--
 frontend/pages/admin/maintenance/logs.vue            |  3 +--
 frontend/pages/group/data/foods.vue                  |  3 +--
 frontend/pages/recipe/create/url.vue                 | 12 ++++++++++--
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 3caa7297..f44d006f 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -52,7 +52,10 @@ module.exports = {
         "ts-ignore": "allow-with-description",
       },
     ],
-    "no-restricted-imports": ["error", { paths: ["@vue/reactivity", "@vue/runtime-dom", "@vue/composition-api"] }],
+    "no-restricted-imports": [
+      "error",
+      { paths: ["@vue/reactivity", "@vue/runtime-dom", "@vue/composition-api", "vue-demi"] },
+    ],
 
     // TODO Gradually activate all rules
     "@typescript-eslint/no-unsafe-assignment": "off",
diff --git a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
index afd6c181..840341b9 100644
--- a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
+++ b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
@@ -39,8 +39,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, useContext, ref, toRefs, watch } from "@nuxtjs/composition-api";
-import { onMounted } from "vue-demi";
+import { defineComponent, reactive, useContext, ref, toRefs, watch, onMounted } from "@nuxtjs/composition-api";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { OcrTsvResponse as NullableOcrTsvResponse } from "~/lib/api/types/ocr";
 import { CanvasModes, SelectedTextSplitModes, ImagePosition, Mouse, CanvasRect, ToolbarIcons } from "~/types/ocr-types";
diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
index 87b8cf9f..8999a8fd 100644
--- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
@@ -39,8 +39,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, useContext } from "@nuxtjs/composition-api";
-import { computed, onMounted } from "vue-demi";
+import { defineComponent, ref, useContext, computed, onMounted } from "@nuxtjs/composition-api";
 import RecipeOrganizerDialog from "./RecipeOrganizerDialog.vue";
 import { RecipeCategory, RecipeTag } from "~/lib/api/types/user";
 import { RecipeTool } from "~/lib/api/types/admin";
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
index fa076820..89028b89 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -75,9 +75,17 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, useContext, useRouter, computed, ref, useMeta } from "@nuxtjs/composition-api";
+import {
+  defineComponent,
+  useContext,
+  useRouter,
+  computed,
+  ref,
+  useMeta,
+  onMounted,
+  onUnmounted,
+} from "@nuxtjs/composition-api";
 import { invoke, until, useWakeLock } from "@vueuse/core";
-import { onMounted, onUnmounted } from "vue-demi";
 import RecipePageEditorToolbar from "./RecipePageParts/RecipePageEditorToolbar.vue";
 import RecipePageFooter from "./RecipePageParts/RecipePageFooter.vue";
 import RecipePageHeader from "./RecipePageParts/RecipePageHeader.vue";
diff --git a/frontend/pages/admin/backups.vue b/frontend/pages/admin/backups.vue
index 2f309c15..82c210e6 100644
--- a/frontend/pages/admin/backups.vue
+++ b/frontend/pages/admin/backups.vue
@@ -114,8 +114,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
-import { onMounted } from "vue-demi";
+import { defineComponent, reactive, ref, toRefs, useContext, onMounted } from "@nuxtjs/composition-api";
 import { useAdminApi } from "~/composables/api";
 import { AllBackups } from "~/lib/api/types/admin";
 
diff --git a/frontend/pages/admin/maintenance/logs.vue b/frontend/pages/admin/maintenance/logs.vue
index 7d110985..4a598f82 100644
--- a/frontend/pages/admin/maintenance/logs.vue
+++ b/frontend/pages/admin/maintenance/logs.vue
@@ -32,8 +32,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from "@nuxtjs/composition-api";
-import { computed, onMounted, reactive } from "vue-demi";
+import { defineComponent, ref, computed, onMounted, reactive } from "@nuxtjs/composition-api";
 import { useAdminApi } from "~/composables/api";
 
 export default defineComponent({
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index f9d07800..5d8df34a 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -154,8 +154,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, ref } from "@nuxtjs/composition-api";
-import { computed } from "vue-demi";
+import { defineComponent, onMounted, ref, computed } from "@nuxtjs/composition-api";
 import type { LocaleObject } from "@nuxtjs/i18n";
 import { validators } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
diff --git a/frontend/pages/recipe/create/url.vue b/frontend/pages/recipe/create/url.vue
index 2f78fff2..6fbed1c4 100644
--- a/frontend/pages/recipe/create/url.vue
+++ b/frontend/pages/recipe/create/url.vue
@@ -63,9 +63,17 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, ref, useRouter, computed, useRoute } from "@nuxtjs/composition-api";
+import {
+  defineComponent,
+  reactive,
+  toRefs,
+  ref,
+  useRouter,
+  computed,
+  useRoute,
+  onMounted,
+} from "@nuxtjs/composition-api";
 import { AxiosResponse } from "axios";
-import { onMounted } from "vue-demi";
 import { useUserApi } from "~/composables/api";
 import { validators } from "~/composables/use-validators";
 import { VForm } from "~/types/vuetify";