build: bundle 3.1.6

vuejs · Feb 26, 2020 · 02d2488 · 02d2488
1 parent f2024d5
commit 02d2488
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 20 deletions.
diff --git a/dist/vue-router.common.js b/dist/vue-router.common.js
@@ -1,5 +1,5 @@
 /*!
-  * vue-router v3.1.5
+  * vue-router v3.1.6
   * (c) 2020 Evan You
   * @license MIT
   */
@@ -944,7 +944,8 @@ function fillParams (
       (regexpCompileCache[path] = pathToRegexp_1.compile(path));
 
     // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
-    if (params.pathMatch) { params[0] = params.pathMatch; }
+    // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
+    if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; }
 
     return filler(params, { pretty: true })
   } catch (e) {
@@ -1692,7 +1693,10 @@ function setupScroll () {
   // location.host contains the port and location.hostname doesn't
   var protocolAndPath = window.location.protocol + '//' + window.location.host;
   var absolutePath = window.location.href.replace(protocolAndPath, '');
-  window.history.replaceState({ key: getStateKey() }, '', absolutePath);
+  // preserve existing history state as it could be overriden by the user
+  var stateCopy = extend({}, window.history.state);
+  stateCopy.key = getStateKey();
+  window.history.replaceState(stateCopy, '', absolutePath);
   window.addEventListener('popstate', function (e) {
     saveScrollPosition();
     if (e.state && e.state.key) {
@@ -2907,7 +2911,7 @@ function createHref (base, fullPath, mode) {
 }
 
 VueRouter.install = install;
-VueRouter.version = '3.1.5';
+VueRouter.version = '3.1.6';
 
 if (inBrowser && window.Vue) {
   window.Vue.use(VueRouter);

diff --git a/dist/vue-router.esm.browser.js b/dist/vue-router.esm.browser.js
@@ -1,5 +1,5 @@
 /*!
-  * vue-router v3.1.5
+  * vue-router v3.1.6
   * (c) 2020 Evan You
   * @license MIT
   */
@@ -928,7 +928,8 @@ function fillParams (
       (regexpCompileCache[path] = pathToRegexp_1.compile(path));
 
     // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
-    if (params.pathMatch) params[0] = params.pathMatch;
+    // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
+    if (typeof params.pathMatch === 'string') params[0] = params.pathMatch;
 
     return filler(params, { pretty: true })
   } catch (e) {
@@ -1668,7 +1669,10 @@ function setupScroll () {
   // location.host contains the port and location.hostname doesn't
   const protocolAndPath = window.location.protocol + '//' + window.location.host;
   const absolutePath = window.location.href.replace(protocolAndPath, '');
-  window.history.replaceState({ key: getStateKey() }, '', absolutePath);
+  // preserve existing history state as it could be overriden by the user
+  const stateCopy = extend({}, window.history.state);
+  stateCopy.key = getStateKey();
+  window.history.replaceState(stateCopy, '', absolutePath);
   window.addEventListener('popstate', e => {
     saveScrollPosition();
     if (e.state && e.state.key) {
@@ -2857,7 +2861,7 @@ function createHref (base, fullPath, mode) {
 }
 
 VueRouter.install = install;
-VueRouter.version = '3.1.5';
+VueRouter.version = '3.1.6';
 
 if (inBrowser && window.Vue) {
   window.Vue.use(VueRouter);

diff --git a/dist/vue-router.esm.browser.min.js b/dist/vue-router.esm.browser.min.js
diff --git a/dist/vue-router.esm.js b/dist/vue-router.esm.js
@@ -1,5 +1,5 @@
 /*!
-  * vue-router v3.1.5
+  * vue-router v3.1.6
   * (c) 2020 Evan You
   * @license MIT
   */
@@ -942,7 +942,8 @@ function fillParams (
       (regexpCompileCache[path] = pathToRegexp_1.compile(path));
 
     // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
-    if (params.pathMatch) { params[0] = params.pathMatch; }
+    // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
+    if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; }
 
     return filler(params, { pretty: true })
   } catch (e) {
@@ -1690,7 +1691,10 @@ function setupScroll () {
   // location.host contains the port and location.hostname doesn't
   var protocolAndPath = window.location.protocol + '//' + window.location.host;
   var absolutePath = window.location.href.replace(protocolAndPath, '');
-  window.history.replaceState({ key: getStateKey() }, '', absolutePath);
+  // preserve existing history state as it could be overriden by the user
+  var stateCopy = extend({}, window.history.state);
+  stateCopy.key = getStateKey();
+  window.history.replaceState(stateCopy, '', absolutePath);
   window.addEventListener('popstate', function (e) {
     saveScrollPosition();
     if (e.state && e.state.key) {
@@ -2905,7 +2909,7 @@ function createHref (base, fullPath, mode) {
 }
 
 VueRouter.install = install;
-VueRouter.version = '3.1.5';
+VueRouter.version = '3.1.6';
 
 if (inBrowser && window.Vue) {
   window.Vue.use(VueRouter);

diff --git a/dist/vue-router.js b/dist/vue-router.js
@@ -1,5 +1,5 @@
 /*!
-  * vue-router v3.1.5
+  * vue-router v3.1.6
   * (c) 2020 Evan You
   * @license MIT
   */
@@ -948,7 +948,8 @@
         (regexpCompileCache[path] = pathToRegexp_1.compile(path));
 
       // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
-      if (params.pathMatch) { params[0] = params.pathMatch; }
+      // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
+      if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; }
 
       return filler(params, { pretty: true })
     } catch (e) {
@@ -1696,7 +1697,10 @@
     // location.host contains the port and location.hostname doesn't
     var protocolAndPath = window.location.protocol + '//' + window.location.host;
     var absolutePath = window.location.href.replace(protocolAndPath, '');
-    window.history.replaceState({ key: getStateKey() }, '', absolutePath);
+    // preserve existing history state as it could be overriden by the user
+    var stateCopy = extend({}, window.history.state);
+    stateCopy.key = getStateKey();
+    window.history.replaceState(stateCopy, '', absolutePath);
     window.addEventListener('popstate', function (e) {
       saveScrollPosition();
       if (e.state && e.state.key) {
@@ -2911,7 +2915,7 @@
   }
 
   VueRouter.install = install;
-  VueRouter.version = '3.1.5';
+  VueRouter.version = '3.1.6';
 
   if (inBrowser && window.Vue) {
     window.Vue.use(VueRouter);

diff --git a/dist/vue-router.min.js b/dist/vue-router.min.js