remove @vue/compat

This commit is contained in:
Fabio Di Stasio 2022-04-30 16:11:44 +02:00
parent 47e1f27bb8
commit cdbadbb11a
5 changed files with 8 additions and 12 deletions

View File

@ -114,7 +114,6 @@
"@mdi/font": "^6.1.95", "@mdi/font": "^6.1.95",
"@turf/helpers": "^6.5.0", "@turf/helpers": "^6.5.0",
"@vscode/vscode-languagedetection": "^1.0.21", "@vscode/vscode-languagedetection": "^1.0.21",
"@vue/compat": "^3.2.33",
"ace-builds": "^1.4.13", "ace-builds": "^1.4.13",
"better-sqlite3": "^7.5.0", "better-sqlite3": "^7.5.0",
"electron-log": "^4.4.1", "electron-log": "^4.4.1",

View File

@ -601,10 +601,13 @@ export default {
return false; return false;
}, },
hasTools () { hasTools () {
if (!this.workspace.customizations) return false;
else {
return this.workspace.customizations.processesList || return this.workspace.customizations.processesList ||
this.workspace.customizations.usersManagement || this.workspace.customizations.usersManagement ||
this.workspace.customizations.variables; this.workspace.customizations.variables;
} }
}
}, },
watch: { watch: {
queryTabs: { queryTabs: {

View File

@ -115,6 +115,8 @@
</template> </template>
<script> <script>
import { storeToRefs } from 'pinia';
import { useConnectionsStore } from '@/stores/connections'; import { useConnectionsStore } from '@/stores/connections';
import { useNotificationsStore } from '@/stores/notifications'; import { useNotificationsStore } from '@/stores/notifications';
import { useSettingsStore } from '@/stores/settings'; import { useSettingsStore } from '@/stores/settings';
@ -131,7 +133,6 @@ import TableContext from '@/components/WorkspaceExploreBarTableContext';
import MiscContext from '@/components/WorkspaceExploreBarMiscContext'; import MiscContext from '@/components/WorkspaceExploreBarMiscContext';
import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext'; import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
import ModalNewSchema from '@/components/ModalNewSchema'; import ModalNewSchema from '@/components/ModalNewSchema';
import { storeToRefs } from 'pinia';
export default { export default {
name: 'WorkspaceExploreBar', name: 'WorkspaceExploreBar',

View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
import { createApp, configureCompat } from 'vue'; import { createApp } from 'vue';
import '@mdi/font/css/materialdesignicons.css'; import '@mdi/font/css/materialdesignicons.css';
import 'leaflet/dist/leaflet.css'; import 'leaflet/dist/leaflet.css';
import '@/scss/main.scss'; import '@/scss/main.scss';
@ -10,11 +10,6 @@ import App from '@/App.vue';
import { pinia } from '@/stores'; import { pinia } from '@/stores';
import i18n from '@/i18n'; import i18n from '@/i18n';
// @TODO: remove after migrating from vue2 -> vue3
configureCompat({
MODE: 3
});
// https://github.com/probil/v-mask/issues/498#issuecomment-827027834 // https://github.com/probil/v-mask/issues/498#issuecomment-827027834
const vMaskV2 = VueMaskDirective; const vMaskV2 = VueMaskDirective;
const vMaskV3 = { const vMaskV3 = {

View File

@ -42,9 +42,7 @@ const config = {
resolve: { resolve: {
alias: { alias: {
'@': path.resolve(__dirname, 'src/renderer'), '@': path.resolve(__dirname, 'src/renderer'),
common: path.resolve(__dirname, 'src/common'), common: path.resolve(__dirname, 'src/common')
// @TODO: remove after migrating from vue2 -> vue3
vue: '@vue/compat'
}, },
extensions: ['', '.js', '.vue', '.json'], extensions: ['', '.js', '.vue', '.json'],
fallback: { fallback: {