From: Eduardo San Martin Morote Date: Mon, 6 Apr 2020 08:59:28 +0000 (+0200) Subject: chore: up vue X-Git-Tag: v4.0.0-alpha.5~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d5159eb2e77757a50c670036abc080b2dc1160d;p=thirdparty%2Fvuejs%2Frouter.git chore: up vue --- diff --git a/__tests__/RouterView.spec.ts b/__tests__/RouterView.spec.ts index 9fdfe5ff..2bd39b3b 100644 --- a/__tests__/RouterView.spec.ts +++ b/__tests__/RouterView.spec.ts @@ -12,7 +12,13 @@ import { mockWarn } from 'jest-mock-warn' function createRoutes>( routes: T ): T { - return routes + let nonReactiveRoutes: T = {} as T + + for (let key in routes) { + nonReactiveRoutes[key] = markNonReactive(routes[key]) + } + + return nonReactiveRoutes } const routes = createRoutes({ @@ -212,7 +218,10 @@ describe('RouterView', () => { } const { el, router } = factory(noPropsWithParams) expect(el.innerHTML).toBe(`
User: default
`) - router.currentRoute.value = { ...noPropsWithParams, params: { id: '4' } } + router.currentRoute.value = markNonReactive({ + ...noPropsWithParams, + params: { id: '4' }, + }) await tick() expect(el.innerHTML).toBe(`
User: default
`) }) @@ -220,7 +229,10 @@ describe('RouterView', () => { it('passes params as props with props: true', async () => { const { el, router } = factory(routes.withParams) expect(el.innerHTML).toBe(`
User: 1
`) - router.currentRoute.value = { ...routes.withParams, params: { id: '4' } } + router.currentRoute.value = markNonReactive({ + ...routes.withParams, + params: { id: '4' }, + }) await tick() expect(el.innerHTML).toBe(`
User: 4
`) }) diff --git a/package.json b/package.json index cd1d54dd..f5d87ec9 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ ] }, "peerDependencies": { - "vue": "^3.0.0-alpha.6" + "vue": "^3.0.0-alpha.11" }, "devDependencies": { "@microsoft/api-documenter": "^7.7.16", @@ -57,7 +57,7 @@ "@types/jsdom": "^16.2.0", "@types/webpack": "^4.41.9", "@types/webpack-env": "^1.15.0", - "@vue/compiler-sfc": "3.0.0-alpha.9", + "@vue/compiler-sfc": "3.0.0-alpha.11", "axios": "^0.19.2", "browserstack-local": "^1.4.5", "chalk": "^4.0.0", @@ -84,7 +84,7 @@ "ts-loader": "^6.2.2", "ts-node": "^8.8.1", "typescript": "^3.8.3", - "vue": "3.0.0-alpha.9", + "vue": "3.0.0-alpha.11", "vue-loader": "^16.0.0-alpha.3", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", diff --git a/playground/router.ts b/playground/router.ts index 70447a6e..e8f589d4 100644 --- a/playground/router.ts +++ b/playground/router.ts @@ -29,7 +29,7 @@ export const router = createRouter({ }), }, { path: '/users/:id', name: 'user', component: User, props: true }, - { path: '/documents/:id', name: 'docs', component: User }, + { path: '/documents/:id', name: 'docs', component: User, props: true }, { path: encodeURI('/n/€'), name: 'euro', component }, { path: '/n/:n', name: 'increment', component }, { path: '/multiple/:a/:b', name: 'multiple', component }, diff --git a/yarn.lock b/yarn.lock index 824b4575..12fba8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -755,34 +755,34 @@ dependencies: "@types/yargs-parser" "*" -"@vue/compiler-core@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-alpha.9.tgz#d54cee813bb444afbf347da7f49056e523197b70" - integrity sha512-Hx4yr83DwIS4B6WfEXWJYcD5EjGoBLQKx7EfoKTvp7++ssO574J/BgasJSUbw/DOm3sHumXZtWRDTn/SKSTs7Q== +"@vue/compiler-core@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-alpha.11.tgz#6b208950c70b9c1bf4e9d3479d7b72a1c98a3d4d" + integrity sha512-4M+i82PT9FaxeqxIDwkXls2f52iDtifUZkfsNqVdf8Q5YBgeLL5D7O7ZpCqIz8LL+cwNUQCEkhf/JfxKu5nAfQ== dependencies: "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" - "@vue/shared" "3.0.0-alpha.9" + "@vue/shared" "3.0.0-alpha.11" estree-walker "^0.8.1" source-map "^0.6.1" -"@vue/compiler-dom@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-alpha.9.tgz#cb93b9f25eaabaf084bcbae5518cd91565b09ba3" - integrity sha512-LgYtgKTcjjRWX41EMpjAdcvNTM1mSvV6Z9iXcGQs348PzcbihboFvaVqOkK14f9R1d5WsnCaYvUNuIGSNV0Xig== +"@vue/compiler-dom@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-alpha.11.tgz#cc19b0cb56890e704606eb574b1b2d963e4fcc7b" + integrity sha512-MxyMBbag78Jq17Lwt2sO/mqxzAP6HZC6Qbc6OrgoDE8ChhvidL3SmhXhmwGjMXaWjQ36trKaqMDcVMiuPdAHqQ== dependencies: - "@vue/compiler-core" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/compiler-core" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" -"@vue/compiler-sfc@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-alpha.9.tgz#5d28d9d18fd0c4fb7fbe0e08f85f333fd7ecc8b1" - integrity sha512-Wr4O0J/lO4Q5Li6RfhZFZNIuYlBkmhk6UxxgCWdW1iPko3/C/oI9/k2SBSiRQcGCE+J5N3l/x1elYlq77YHvHA== +"@vue/compiler-sfc@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-alpha.11.tgz#aab056a24900c7e8fdd3bc6083dbf8ccaa8f0734" + integrity sha512-4/iBR/dUFVnR+6csWruBgOBZwQcYb3YzN3shbC7GslXUVVU29OOozTBjN/6y7tOfDwHe3lo/WRHYNq6gYQW0VQ== dependencies: - "@vue/compiler-core" "3.0.0-alpha.9" - "@vue/compiler-dom" "3.0.0-alpha.9" - "@vue/compiler-ssr" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/compiler-core" "3.0.0-alpha.11" + "@vue/compiler-dom" "3.0.0-alpha.11" + "@vue/compiler-ssr" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" consolidate "^0.15.1" hash-sum "^2.0.0" lru-cache "^5.1.1" @@ -791,42 +791,42 @@ postcss-selector-parser "^6.0.2" source-map "^0.6.1" -"@vue/compiler-ssr@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-alpha.9.tgz#e5b64601dfa24437a0e7b5c56b98de4458fa5334" - integrity sha512-BW3rpZyy6xxrvjGEM5vsadQrYH8kiG1MAO/8aKW4mgW+4Rj34MUATrWwYdmk+yVsgnaMirfUYuc4gRZbcTZCYw== +"@vue/compiler-ssr@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-alpha.11.tgz#702e1683b92e73b2550bd3d4dae3caca6d5e57c0" + integrity sha512-paECju5rSjgAmlZbdy2ScTRoyjrOnn4dbdlfCn6OZwzZsbMqoq9EfByJhde5HHPM4u0cPpT3TCbkowLFxGd75w== dependencies: - "@vue/compiler-dom" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/compiler-dom" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" -"@vue/reactivity@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-alpha.9.tgz#e8c8b5ecaad3a60978a503e4fdfd277644c49738" - integrity sha512-Z9jlQ2yjNQIcVBg1SSViUQH8UgVhXHFblw4c6Xrf7vgejjxAqJwk6DKNbAJlneeA3Z84Ul+1Q8JY4zClLagW/A== +"@vue/reactivity@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-alpha.11.tgz#4837aa6b8c6d63f333bcca9be82f461f169f7bf1" + integrity sha512-SsI4PoF7iMp4skNds0NDSiiXvC3cWlNiAScB8gnENm7naiBmLq4R2EVzZRt3YaRTr9uWzkUOlStDJdxaCEahdg== dependencies: - "@vue/shared" "3.0.0-alpha.9" + "@vue/shared" "3.0.0-alpha.11" -"@vue/runtime-core@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-alpha.9.tgz#295884f0cbec22be3fbcfce0ff1a2493e33abb67" - integrity sha512-mqTQ2kpKtUKwvMT23VDm6HEIt+8SxvOaL47aLs5uROs7Jamgp0K2oNkGH/MltWpaDkXVSsbSBBgijgYDsKlbZw== +"@vue/runtime-core@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-alpha.11.tgz#00089131200dcc974ed9db724b0ecdbdee0ff422" + integrity sha512-sx0AKWaVEis0TGg2UAN5KTVAHXTW363wH8O03ANtJvWo0lFDPAxIdAwqy+TBUOp3W+G1dhDyNXT30pWagHQD1A== dependencies: - "@vue/reactivity" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/reactivity" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" -"@vue/runtime-dom@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-alpha.9.tgz#dfbfcbd4e3bf69a74736c1c3d79780a31434ad6f" - integrity sha512-zWDW7Lg38PDoW+grQsSPzBauMMeY6A9yw/qaAzzgeN71EXJRInmv1fog/dVuWbD7/ZNc8E4jzDUJL16ryGbSmg== +"@vue/runtime-dom@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-alpha.11.tgz#477468e7f430f4b4818f7d315b263404fb5bbc6c" + integrity sha512-2ag5O2E1I00XqSRGLBfXhFPOxDMNRQEB31RXR1Gx+Vom9v1VQEXpZ7YpU3w+mctNvN3s+kg4G+EFUu4sF4MIHA== dependencies: - "@vue/runtime-core" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/runtime-core" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" csstype "^2.6.8" -"@vue/shared@3.0.0-alpha.9": - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-alpha.9.tgz#681053df422dea1c8c2f54e860ef7c4b949b9852" - integrity sha512-34jsIMNwXJ6V6qlGx5ATw4YHTRxoKCyKN8MulRrUxo4BDhzEl1T1nsh6A9dsmJ8MGki/4MtYyxStTnPBQCLNfA== +"@vue/shared@3.0.0-alpha.11": + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-alpha.11.tgz#aa2d5cc711c76c9da1da72217e917ec9c3a812d1" + integrity sha512-vzzz/JUqEgjeRRk3SHV+kcDrFtBI6E+p5RUjXLRAQR62XIFfDpTmqpfrx+SEpOyhN7lgAXOsWPkrb9xl8Jw0XQ== "@webassemblyjs/ast@1.9.0": version "1.9.0" @@ -8873,14 +8873,14 @@ vue-loader@^16.0.0-alpha.3: merge-source-map "^1.1.0" source-map "^0.6.1" -vue@3.0.0-alpha.9: - version "3.0.0-alpha.9" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-alpha.9.tgz#f84b6b52caf6753a8cefda370bd6bbd298b5b06a" - integrity sha512-zZrfbchyCQXF/+9B5fD4djlqzZ2XB39MxDzTaJKfuMjs/CgD2CTDiEVrOcP9HwMjr48cpARiFH13vvl4/F73RA== +vue@3.0.0-alpha.11: + version "3.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-alpha.11.tgz#bde2f5f23c5217815d4b01f13dbcbff58bc170c0" + integrity sha512-+MmVjmYzT9pKWzT6Qo0pwtePIDgJQdQScSEZxDzuAw9gxKyUrVpMeGemqZ4MBwJf+S7fSg931PC5SEyASP5IBA== dependencies: - "@vue/compiler-dom" "3.0.0-alpha.9" - "@vue/runtime-dom" "3.0.0-alpha.9" - "@vue/shared" "3.0.0-alpha.9" + "@vue/compiler-dom" "3.0.0-alpha.11" + "@vue/runtime-dom" "3.0.0-alpha.11" + "@vue/shared" "3.0.0-alpha.11" w3c-hr-time@^1.0.1: version "1.0.2"