From 3234c5924f39fd9497866bfd160407256dc91bfe Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Sun, 20 Sep 2020 10:04:12 +0200 Subject: [PATCH] fix(guards): use post watcher for instances fixes the context being wrong inside components guards --- src/RouterView.ts | 3 +- yarn.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/src/RouterView.ts b/src/RouterView.ts index ebc88b25..8691f9f4 100644 --- a/src/RouterView.ts +++ b/src/RouterView.ts @@ -87,7 +87,8 @@ export const RouterViewImpl = defineComponent({ callback(instance) ) } - } + }, + { flush: 'post' } ) return () => { diff --git a/yarn.lock b/yarn.lock index 2fc682bf..c7e91fc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1161,6 +1161,17 @@ dependencies: "@types/node" "*" +"@vue/compiler-core@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0.tgz#25e4f079cf6c39f83bad23700f814c619105a0f2" + integrity sha512-XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ== + dependencies: + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" + "@vue/shared" "3.0.0" + estree-walker "^2.0.1" + source-map "^0.6.1" + "@vue/compiler-core@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.12.tgz#eb26ff2f7e0eb8b362606228b2dda59c0c914f63" @@ -1172,6 +1183,14 @@ estree-walker "^2.0.1" source-map "^0.6.1" +"@vue/compiler-dom@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz#4cbb48fcf1f852daef2babcf9953b681ac463526" + integrity sha512-ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog== + dependencies: + "@vue/compiler-core" "3.0.0" + "@vue/shared" "3.0.0" + "@vue/compiler-dom@3.0.0-rc.12", "@vue/compiler-dom@^3.0.0-rc.5": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.12.tgz#b8468cb3f81d43ca25592026482e1330b99f2b8c" @@ -1180,7 +1199,7 @@ "@vue/compiler-core" "3.0.0-rc.12" "@vue/shared" "3.0.0-rc.12" -"@vue/compiler-sfc@^3.0.0-rc.11", "@vue/compiler-sfc@^3.0.0-rc.5", "@vue/compiler-sfc@^3.0.0-rc.9": +"@vue/compiler-sfc@^3.0.0-rc.11", "@vue/compiler-sfc@^3.0.0-rc.5": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.12.tgz#eff29e9688b8ed840506d88b94336689cf2970f2" integrity sha512-lHy0LK33KjVBeu6aCX0oLUSZtatOIY/1w927Fh5nFrN1SNnqA31q2wg/IDmvNU6+Y6F3s0MZyN5H6dyZgO5r/g== @@ -1202,6 +1221,36 @@ postcss-selector-parser "^6.0.2" source-map "^0.6.1" +"@vue/compiler-sfc@^3.0.0-rc.9": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz#efa38037984bd64aae315828aa5c1248c6eadca9" + integrity sha512-1Bn4L5jNRm6tlb79YwqYUGGe+Yc9PRoRSJi67NJX6icdhf84+tRMtESbx1zCLL9QixQXu2+7aLkXHxvh4RpqAA== + dependencies: + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" + "@vue/compiler-core" "3.0.0" + "@vue/compiler-dom" "3.0.0" + "@vue/compiler-ssr" "3.0.0" + "@vue/shared" "3.0.0" + consolidate "^0.16.0" + estree-walker "^2.0.1" + hash-sum "^2.0.0" + lru-cache "^5.1.1" + magic-string "^0.25.7" + merge-source-map "^1.1.0" + postcss "^7.0.32" + postcss-modules "^3.2.2" + postcss-selector-parser "^6.0.2" + source-map "^0.6.1" + +"@vue/compiler-ssr@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz#d717abcd23a89fb38d1497228633a21bcf9a0e28" + integrity sha512-Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ== + dependencies: + "@vue/compiler-dom" "3.0.0" + "@vue/shared" "3.0.0" + "@vue/compiler-ssr@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.12.tgz#ea37bfb616d90c376a5ef40bc65c57514bb6fef3" @@ -1210,6 +1259,13 @@ "@vue/compiler-dom" "3.0.0-rc.12" "@vue/shared" "3.0.0-rc.12" +"@vue/reactivity@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0.tgz#fd15632a608650ce2a969c721787e27e2c80aa6b" + integrity sha512-mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ== + dependencies: + "@vue/shared" "3.0.0" + "@vue/reactivity@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.12.tgz#9f5c6da78729fe80cc47d23bc8b6c09b36998a29" @@ -1217,6 +1273,14 @@ dependencies: "@vue/shared" "3.0.0-rc.12" +"@vue/runtime-core@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0.tgz#480febf1bfe32798b6abbd71a88f8e8b473a51c2" + integrity sha512-3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA== + dependencies: + "@vue/reactivity" "3.0.0" + "@vue/shared" "3.0.0" + "@vue/runtime-core@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.12.tgz#021dbfabe5f50043790fb80d5235b6cedb3de4ac" @@ -1225,6 +1289,15 @@ "@vue/reactivity" "3.0.0-rc.12" "@vue/shared" "3.0.0-rc.12" +"@vue/runtime-dom@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz#e0d1f7c7e22e1318696014cc3501e06b288c2e11" + integrity sha512-f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g== + dependencies: + "@vue/runtime-core" "3.0.0" + "@vue/shared" "3.0.0" + csstype "^2.6.8" + "@vue/runtime-dom@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.12.tgz#cdc197736d6092bfcc39bdf50349a28f175d2103" @@ -1234,7 +1307,7 @@ "@vue/shared" "3.0.0-rc.12" csstype "^2.6.8" -"@vue/server-renderer@^3.0.0-rc.11", "@vue/server-renderer@^3.0.0-rc.5": +"@vue/server-renderer@^3.0.0-rc.11": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-rc.12.tgz#cf07d72ad44cd26af0b960f5d99fa3f8a12a1ff2" integrity sha512-hqsvUEWjjIN/tv22zxUvXnWrZoFOYu2mIuA8H3arPP2uF7d6tqr2LAFnCLsm+mfX58PStaVZ+kvKNOhBP38/3Q== @@ -1242,6 +1315,19 @@ "@vue/compiler-ssr" "3.0.0-rc.12" "@vue/shared" "3.0.0-rc.12" +"@vue/server-renderer@^3.0.0-rc.5": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0.tgz#d531f62f64b67481aae32034eb003a16941b1a52" + integrity sha512-Ft4kiymPdI8BOYMTVSwB2bUeVH/PsnuEc6s7i9SzQxbz5JZpzzK8ugzICxtSYc8WkNaqi0J1xqdXz2df/YXAqQ== + dependencies: + "@vue/compiler-ssr" "3.0.0" + "@vue/shared" "3.0.0" + +"@vue/shared@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0.tgz#ec089236629ecc0f10346b92f101ff4339169f1a" + integrity sha512-4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA== + "@vue/shared@3.0.0-rc.12": version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.12.tgz#b114d999d6f51191f4ff6b284fa7bddf4c8589bc" @@ -10961,7 +11047,7 @@ vue-loader@^16.0.0-beta.5: merge-source-map "^1.1.0" source-map "^0.6.1" -vue@^3.0.0-rc.11, vue@^3.0.0-rc.5, vue@^3.0.0-rc.9: +vue@^3.0.0-rc.11, vue@^3.0.0-rc.5: version "3.0.0-rc.12" resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.12.tgz#08849531c9255f290b552912ae52802c5bc323d5" integrity sha512-T/oWhPRPzIRzPvTjf9mI8oENYlAPr9ThB4JAJXJE3dlRAN7lYzH+eh4yBGR9EsyC+pIEAabP/cnM19dcJBNl3A== @@ -10970,6 +11056,15 @@ vue@^3.0.0-rc.11, vue@^3.0.0-rc.5, vue@^3.0.0-rc.9: "@vue/runtime-dom" "3.0.0-rc.12" "@vue/shared" "3.0.0-rc.12" +vue@^3.0.0-rc.9: + version "3.0.0" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0.tgz#cfb5df5c34efce319b113a1667d12b74dcfd9c90" + integrity sha512-ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw== + dependencies: + "@vue/compiler-dom" "3.0.0" + "@vue/runtime-dom" "3.0.0" + "@vue/shared" "3.0.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" -- 2.47.3