diff --git a/webui/package.json b/webui/package.json index e86a47a..6556b2a 100644 --- a/webui/package.json +++ b/webui/package.json @@ -20,7 +20,6 @@ "@rollup/plugin-commonjs": "20.0.0", "@rollup/plugin-node-resolve": "13.3.0", "@rollup/plugin-replace": "3.1.0", - "@vue/composition-api": "1.7.2", "esbuild": "0.23.1", "flag-icon-css": "4.1.7", "lodash-es": "4.17.21", @@ -34,7 +33,10 @@ "tailwindcss": "1.9.6", "toastify-js": "1.12.0", "vue": "2.7.16", - "vue-i18n": "8.28.2", + "vue-demi": "^0.14.10", + "vue-i18n": "8.26.1", + "vue-i18n-bridge": "^9.14.0", + "vue-loader": "^17.4.2", "vue-router": "3.6.5", "vuex": "3.6.2" }, @@ -47,7 +49,6 @@ "jest": "27.5.1", "npm-run-all": "^4.1.5", "rimraf": "3.0.2", - "typescript": "4.9.5", - "vue-template-compiler": "2.7.16" + "typescript": "4.9.5" } } diff --git a/webui/src/app.js b/webui/src/app.js index 166989c..634ab36 100644 --- a/webui/src/app.js +++ b/webui/src/app.js @@ -1,7 +1,5 @@ import Vue from 'vue' -import '@/plugins/composition-api' - import '@/styles/vendor/material-icons.css' import '@/styles/vendor/OpenSans.css' @@ -39,12 +37,13 @@ if (location.base == '<%= locationBase %>') location.base = '/' /* ===== App initialization ===== */ async function startApp () { document.getElementById('missingBundle').remove() - new Vue({ - store, - router, - i18n, - render: h => h(App) - }).$mount('#app') + const app = new Vue({ + store, + router, + i18n, + render: h => h(App) + }) + app.$mount('#app') const connectResponse = await fetchData('connect') const spotifyStatus = connectResponse.spotifyEnabled ? SPOTIFY_STATUS.ENABLED : SPOTIFY_STATUS.DISABLED diff --git a/webui/src/components/TheSearchBar.vue b/webui/src/components/TheSearchBar.vue index 3f9fc9a..ccd75c0 100644 --- a/webui/src/components/TheSearchBar.vue +++ b/webui/src/components/TheSearchBar.vue @@ -17,7 +17,7 @@