From 92a2dcc13f65216fb661efa4de8539718f53810f Mon Sep 17 00:00:00 2001 From: pwengerter Date: Fri, 27 Aug 2021 19:30:08 +0100 Subject: [PATCH 1/7] Add vue3 compatibility package & make it compile --- package.json | 11 +- src/main.js | 26 +- src/router/index.js | 13 +- src/views/Room.vue | 2 +- vue.config.js | 20 +- yarn.lock | 3659 +++++++++++++++++++++++++------------------ 6 files changed, 2142 insertions(+), 1589 deletions(-) diff --git a/package.json b/package.json index 7e2f15a..09d03f3 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,12 @@ "eslint-plugin-vue-a11y": "^0.0.31", "palava-client": "^2.2.1", "register-service-worker": "^1.7.1", - "vue": "^2.6.11", - "vue-i18n": "^8.17.0", + "vue": "^3.2.6", + "@vue/compat": "^3.2.6", + "vue-i18n": "^9.0.0", "vue-inline-svg": "^1.3.1", "vue-meta": "^2.3.3", - "vue-router": "^3.1.6", + "vue-router": "^4.1.6", "yyid": "2" }, "devDependencies": { @@ -35,7 +36,7 @@ "@vue/cli-plugin-router": "~4.3.0", "@vue/cli-plugin-unit-mocha": "~4.3.0", "@vue/cli-plugin-vuex": "~4.3.0", - "@vue/cli-service": "~4.3.0", + "@vue/cli-service": "~4.5.3", "@vue/eslint-config-airbnb": "^5.0.2", "@vue/test-utils": "1.0.0-beta.31", "babel-eslint": "^10.1.0", @@ -47,6 +48,6 @@ "geckodriver": "^1.19.1", "node-sass": "^4.12.0", "sass-loader": "^8.0.2", - "vue-template-compiler": "^2.6.11" + "@vue/compiler-sfc": "^3.2.6" } } diff --git a/src/main.js b/src/main.js index 29ad0a9..9519401 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,5 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' +import { createApp } from 'vue' +import { createI18n } from 'vue-i18n' import VueMeta from 'vue-meta' import { InlineSvgPlugin } from 'vue-inline-svg' @@ -10,24 +10,20 @@ import config from './config' import messages from './i18nStrings' import { detectLanguage } from './support' -Vue.config.productionTip = false -Vue.use(VueI18n) -Vue.use(VueMeta, { - refreshOnceOnNavigation: true, -}) -Vue.use(InlineSvgPlugin) - const language = detectLanguage() const locale = language && language.startsWith('de') ? 'de' : config.defaultLocale -const i18n = new VueI18n({ +const i18n = createI18n({ locale, fallbackLocale: config.defaultLocale, messages, }) -new Vue({ - router, - i18n, - render: (h) => h(App), -}).$mount('#app') +const app = createApp(App) +app + .use(router) + .use(i18n) + .use(VueMeta, { refreshOnceOnNavigation: true, }) + .use(InlineSvgPlugin) + +app.mount('#app') diff --git a/src/router/index.js b/src/router/index.js index b9c0a90..e99c004 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,4 @@ -import Vue from 'vue' -import VueRouter from 'vue-router' +import { createRouter, createWebHistory } from 'vue-router' import Home from '@/views/Home.vue' import Room from '@/views/Room.vue' @@ -11,8 +10,6 @@ import { escapeRegex } from '@/support' const validInfoPages = i18nStrings.en.infoPages.map((ip) => escapeRegex(ip.id)) -Vue.use(VueRouter) - const routes = [ { path: '/', @@ -38,10 +35,10 @@ const routes = [ }, ]; -const router = new VueRouter({ - mode: 'history', +const router = createRouter({ + history: createWebHistory(process.env.BASE_URL), base: process.env.BASE_URL, - routes, -}); + routes +}) export default router diff --git a/src/views/Room.vue b/src/views/Room.vue index 3c38bd9..b357918 100644 --- a/src/views/Room.vue +++ b/src/views/Room.vue @@ -25,9 +25,9 @@