release: v4.0.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d42e09471ecdf0b52d77e21958ed5609b57517..a5e8c4114d3cd2648113335b0de1d9aa4e4b00ea 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# [4.0.0](https://github.com/vuejs/vue-router-next/compare/v4.0.0-rc.6...v4.0.0) (2020-12-07)
+
+### Bug Fixes
+
+- **router-view:** properly use route prop when nested ([b74051a](https://github.com/vuejs/vue-router-next/commit/b74051a6bde7524d1a7cc6cc1daacb213987faa0))
+- **router-view:** return one node when possible ([d18e500](https://github.com/vuejs/vue-router-next/commit/d18e500da2ed017be30871628a5cc59324bec15c)), closes [#537](https://github.com/vuejs/vue-router-next/issues/537)
+
+### Features
+
+- expose routerViewLocationKey as internal ([f498646](https://github.com/vuejs/vue-router-next/commit/f498646c3bc2ad480be7a3d0f11aa11710729911))
+
 # [4.0.0-rc.6](https://github.com/vuejs/vue-router-next/compare/v4.0.0-rc.5...v4.0.0-rc.6) (2020-11-30)
 
 ### Bug Fixes

diff --git a/package.json b/package.json
index 10eca28a1b640d3ba3187f8699b73e9e37386677..60e2e5ed6f2997d03403cb0cb5d3ff2143ac6928 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-router",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0",
   "main": "dist/vue-router.cjs.js",
   "unpkg": "dist/vue-router.global.js",
   "jsdelivr": "dist/vue-router.global.js",