From e8c9eb9f5628c4ac6870a11cb57c517b25cd9569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20=C3=96hlerking?= Date: Thu, 2 Nov 2023 16:07:09 +0100 Subject: [PATCH] fix main.ts --- src/main.ts | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/main.ts b/src/main.ts index b7ab0d05c4..d61922524c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,3 +1,7 @@ +// NUXT_REMOVAL change how global components are handled +import "@/components/base/_globals"; +import "@/plugins/directives"; +import "@/plugins/polyfills"; import { accountsModule, applicationErrorModule, @@ -8,7 +12,6 @@ import { contextExternalToolsModule, copyModule, envConfigModule, - externalToolsModule, filePathsModule, finishedTasksModule, groupModule, @@ -17,7 +20,6 @@ import { newsModule, notifierModule, privacyPolicyModule, - termsOfUseModule, roomModule, roomsModule, schoolExternalToolsModule, @@ -26,33 +28,30 @@ import { statusAlertsModule, systemsModule, tasksModule, + termsOfUseModule, userLoginMigrationModule, videoConferenceModule, } from "@/store"; -import Vue from "vue"; -import App from "./App.vue"; -import { createI18n } from "./plugins/i18n"; -import store from "./plugins/store"; -import vuetify from "./plugins/vuetify"; -import router from "./router"; + +import "@/styles/global.scss"; // NUXT_REMOVAL set this based on the tenant theme import themeConfig from "@/theme.config"; +import { htmlConfig } from "@feature-render-html"; +import axios from "axios"; +import Cookies from "universal-cookie"; +import Vue from "vue"; +import VueDOMPurifyHTML from "vue-dompurify-html"; // NUXT_REMOVAL try to solve without vue-mq dependency // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import VueMq from "vue-mq"; import Vuelidate from "vuelidate"; -import { htmlConfig } from "@feature-render-html"; -import VueDOMPurifyHTML from "vue-dompurify-html"; -// NUXT_REMOVAL change how global components are handled -import "@/components/base/_globals"; -import "@/plugins/directives"; -import "@/plugins/polyfills"; - -import "@/styles/global.scss"; -import axios from "axios"; -import Cookies from "universal-cookie"; +import App from "./App.vue"; import { handleApplicationError } from "./plugins/application-error-handler"; +import { createI18n } from "./plugins/i18n"; +import store from "./plugins/store"; +import vuetify from "./plugins/vuetify"; +import router from "./router"; import { initializeAxios } from "./utils/api"; import { @@ -60,19 +59,18 @@ import { AUTH_MODULE_KEY, CONTEXT_EXTERNAL_TOOLS_MODULE_KEY, ENV_CONFIG_MODULE_KEY, - EXTERNAL_TOOLS_MODULE_KEY, GROUP_MODULE_KEY, I18N_KEY, NOTIFIER_MODULE_KEY, + PRIVACY_POLICY_MODULE_KEY, ROOM_MODULE_KEY, SCHOOL_EXTERNAL_TOOLS_MODULE_KEY, SCHOOLS_MODULE_KEY, STATUS_ALERTS_MODULE_KEY, SYSTEMS_MODULE_KEY, + TERMS_OF_USE_MODULE_KEY, USER_LOGIN_MIGRATION_MODULE_KEY, VIDEO_CONFERENCE_MODULE_KEY, - PRIVACY_POLICY_MODULE_KEY, - TERMS_OF_USE_MODULE_KEY, } from "./utils/inject"; Vue.config.productionTip = false; @@ -152,7 +150,6 @@ Vue.use(VueDOMPurifyHTML, { [CONTEXT_EXTERNAL_TOOLS_MODULE_KEY.valueOf()]: contextExternalToolsModule, copyModule, [ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule, - [EXTERNAL_TOOLS_MODULE_KEY.valueOf()]: externalToolsModule, filePathsModule, finishedTasksModule, [GROUP_MODULE_KEY.valueOf()]: groupModule,