Skip to content

Commit 867c6e1

Browse files
authored
fix duplicate vue issues (#1702)
1 parent 2b63804 commit 867c6e1

3 files changed

Lines changed: 23 additions & 3 deletions

File tree

client/electron.vite.config.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export default defineConfig(({ mode }) => {
7373
resolve: {
7474
dedupe: ['axios', 'vue', 'vuetify'],
7575
alias: {
76+
vue: resolve(__dirname, 'node_modules/vue/dist/vue.runtime.esm.js'),
7677
'dive-common': resolve(__dirname, 'dive-common'),
7778
'vue-media-annotator': resolve(__dirname, 'src'),
7879
platform: resolve(__dirname, 'platform'),
@@ -104,7 +105,15 @@ export default defineConfig(({ mode }) => {
104105
},
105106
},
106107
optimizeDeps: {
107-
include: ['axios', 'qs', 'markdown-it', 'js-cookie'],
108+
include: [
109+
'axios',
110+
'qs',
111+
'markdown-it',
112+
'js-cookie',
113+
'vue',
114+
'vuetify',
115+
'@girder/components/src',
116+
],
108117
},
109118
build: {
110119
outDir: 'dist_desktop',

client/platform/desktop/plugins/vuetify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Vue from 'vue';
2-
import Vuetify from 'vuetify';
2+
import Vuetify from 'vuetify/lib';
33
import colors from 'vuetify/es5/util/colors';
44
import { vuetifyConfig as girderVuetifyConfig } from '@girder/components/src';
55
import { merge } from 'lodash';

client/vite.config.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ export default defineConfig(({ mode }) => {
4343
resolve: {
4444
dedupe: ['axios', 'vue', 'vuetify'],
4545
alias: {
46+
// Force a single Vue build; production Rollup can otherwise bundle both
47+
// vue.runtime.esm.js (from vuetify/lib) and vue.runtime.common.prod.js (from vuetify dist).
48+
vue: resolve(__dirname, 'node_modules/vue/dist/vue.runtime.esm.js'),
4649
'dive-common': resolve(__dirname, 'dive-common'),
4750
'vue-media-annotator': resolve(__dirname, 'src'),
4851
platform: resolve(__dirname, 'platform'),
@@ -75,7 +78,15 @@ export default defineConfig(({ mode }) => {
7578
},
7679
},
7780
optimizeDeps: {
78-
include: ['axios', 'qs', 'markdown-it', 'js-cookie'],
81+
include: [
82+
'axios',
83+
'qs',
84+
'markdown-it',
85+
'js-cookie',
86+
'vue',
87+
'vuetify',
88+
'@girder/components/src',
89+
],
7990
},
8091
build: {
8192
sourcemap: true,

0 commit comments

Comments
 (0)