Skip to content

Commit

Permalink
remove @vue/compat
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabio286 committed Apr 30, 2022
1 parent 47e1f27 commit cdbadbb
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"@mdi/font": "^6.1.95",
"@turf/helpers": "^6.5.0",
"@vscode/vscode-languagedetection": "^1.0.21",
"@vue/compat": "^3.2.33",
"ace-builds": "^1.4.13",
"better-sqlite3": "^7.5.0",
"electron-log": "^4.4.1",
Expand Down
5 changes: 4 additions & 1 deletion src/renderer/components/Workspace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,12 @@ export default {
return false;
},
hasTools () {
return this.workspace.customizations.processesList ||
if (!this.workspace.customizations) return false;
else {
return this.workspace.customizations.processesList ||
this.workspace.customizations.usersManagement ||
this.workspace.customizations.variables;
}
}
},
watch: {
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/WorkspaceExploreBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
</template>

<script>
import { storeToRefs } from 'pinia';
import { useConnectionsStore } from '@/stores/connections';
import { useNotificationsStore } from '@/stores/notifications';
import { useSettingsStore } from '@/stores/settings';
Expand All @@ -131,7 +133,6 @@ import TableContext from '@/components/WorkspaceExploreBarTableContext';
import MiscContext from '@/components/WorkspaceExploreBarMiscContext';
import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
import ModalNewSchema from '@/components/ModalNewSchema';
import { storeToRefs } from 'pinia';
export default {
name: 'WorkspaceExploreBar',
Expand Down
7 changes: 1 addition & 6 deletions src/renderer/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
import { createApp, configureCompat } from 'vue';
import { createApp } from 'vue';
import '@mdi/font/css/materialdesignicons.css';
import 'leaflet/dist/leaflet.css';
import '@/scss/main.scss';
Expand All @@ -10,11 +10,6 @@ import App from '@/App.vue';
import { pinia } from '@/stores';
import i18n from '@/i18n';

// @TODO: remove after migrating from vue2 -> vue3
configureCompat({
MODE: 3
});

// https://github.com/probil/v-mask/issues/498#issuecomment-827027834
const vMaskV2 = VueMaskDirective;
const vMaskV3 = {
Expand Down
4 changes: 1 addition & 3 deletions webpack.renderer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ const config = {
resolve: {
alias: {
'@': path.resolve(__dirname, 'src/renderer'),
common: path.resolve(__dirname, 'src/common'),
// @TODO: remove after migrating from vue2 -> vue3
vue: '@vue/compat'
common: path.resolve(__dirname, 'src/common')
},
extensions: ['', '.js', '.vue', '.json'],
fallback: {
Expand Down

0 comments on commit cdbadbb

Please sign in to comment.