From d6f9bc7b55318a591b189c3d078f3416eaee28ce Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Tue, 17 Jan 2023 13:44:37 +0100 Subject: [PATCH] Remove vuex-router-sync --- changelog/unreleased/change-update-vue | 1 + packages/web-runtime/package.json | 1 - packages/web-runtime/src/App.vue | 2 +- packages/web-runtime/src/container/bootstrap.ts | 3 --- pnpm-lock.yaml | 12 ------------ 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/changelog/unreleased/change-update-vue b/changelog/unreleased/change-update-vue index 588181a1f86..660cad7d849 100644 --- a/changelog/unreleased/change-update-vue +++ b/changelog/unreleased/change-update-vue @@ -15,3 +15,4 @@ https://github.com/owncloud/web/pull/8198 https://github.com/owncloud/web/pull/8213 https://github.com/owncloud/web/pull/8214 https://github.com/owncloud/web/pull/8221 +https://github.com/owncloud/web/pull/8256 diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 075da732af0..6ef6bb51f9b 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -46,7 +46,6 @@ "vue-router": "4.1.6", "vue-select": "4.0.0-beta.6", "vuex": "4.1.0", - "vuex-router-sync": "^5.0.0", "web-client": "npm:@ownclouders/web-client", "web-pkg": "npm:@ownclouders/web-pkg", "web-runtime": "workspace:*", diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue index 86576065a5f..19c27a755f6 100644 --- a/packages/web-runtime/src/App.vue +++ b/packages/web-runtime/src/App.vue @@ -71,7 +71,7 @@ export default defineComponent({ } }, computed: { - ...mapState(['route', 'user', 'modal', 'sidebar']), + ...mapState(['user', 'modal', 'sidebar']), ...mapGetters(['configuration', 'capabilities', 'getSettingsValue']), ...mapGetters('runtime/auth', ['isUserContextReady', 'isPublicLinkContextReady']), layout() { diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts index 46914aa2a9c..3f1e009b2ac 100644 --- a/packages/web-runtime/src/container/bootstrap.ts +++ b/packages/web-runtime/src/container/bootstrap.ts @@ -6,7 +6,6 @@ import { Router } from 'vue-router' import Vue from 'vue' import { loadTheme } from '../helpers/theme' import OwnCloud from 'owncloud-sdk' -import { sync as routerSync } from 'vuex-router-sync' import getTextPlugin from 'vue-gettext' import set from 'lodash-es/set' import { getBackendVersion, getWebVersion } from './versions' @@ -360,8 +359,6 @@ export const announceDefaults = ({ redirect: () => route }) } - - routerSync(store, router) } /** diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e19707d211b..c161d22ee5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -659,7 +659,6 @@ importers: vue-router: 4.1.6 vue-select: 4.0.0-beta.6 vuex: 4.1.0 - vuex-router-sync: ^5.0.0 web-client: npm:@ownclouders/web-client web-pkg: npm:@ownclouders/web-pkg web-runtime: workspace:* @@ -708,7 +707,6 @@ importers: vue-router: 4.1.6_vue@3.2.45 vue-select: 4.0.0-beta.6_vue@3.2.45 vuex: 4.1.0_vue@3.2.45 - vuex-router-sync: 5.0.0_mhkwdqbz43jpnlolybzfmh5sqi web-client: link:../web-client web-pkg: link:../web-pkg web-runtime: 'link:' @@ -22494,16 +22492,6 @@ packages: '@vue/server-renderer': 3.2.45_vue@3.2.45 '@vue/shared': 3.2.45 - /vuex-router-sync/5.0.0_mhkwdqbz43jpnlolybzfmh5sqi: - resolution: {integrity: sha512-Mry2sO4kiAG64714X1CFpTA/shUH1DmkZ26DFDtwoM/yyx6OtMrc+MxrU+7vvbNLO9LSpgwkiJ8W+rlmRtsM+w==} - peerDependencies: - vue-router: ^3.0.0 - vuex: ^3.0.0 - dependencies: - vue-router: 4.1.6_vue@3.2.45 - vuex: 4.1.0_vue@3.2.45 - dev: false - /vuex/4.1.0_vue@3.2.45: resolution: {integrity: sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==} peerDependencies: