Skip to content

Commit 7a5a1e8

Browse files
posvaposva
committed
build: bundle 3.4.5
1 parent a1a290e commit 7a5a1e8

6 files changed

+36
-44
lines changed

Diff for: ‎dist/vue-router.common.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-router v3.4.4
2+
* vue-router v3.4.5
33
* (c) 2020 Evan You
44
* @license MIT
55
*/
@@ -2152,10 +2152,10 @@ History.prototype.transitionTo = function transitionTo (
21522152
// Exception should still be thrown
21532153
throw e
21542154
}
2155+
var prev = this.current;
21552156
this.confirmTransition(
21562157
route,
21572158
function () {
2158-
var prev = this$1.current;
21592159
this$1.updateRoute(route);
21602160
onComplete && onComplete(route);
21612161
this$1.ensureURL();
@@ -2176,17 +2176,15 @@ History.prototype.transitionTo = function transitionTo (
21762176
onAbort(err);
21772177
}
21782178
if (err && !this$1.ready) {
2179-
this$1.ready = true;
2180-
// Initial redirection should still trigger the onReady onSuccess
2179+
// Initial redirection should not mark the history as ready yet
2180+
// because it's triggered by the redirection instead
21812181
// https://github.com/vuejs/vue-router/issues/3225
2182-
if (!isNavigationFailure(err, NavigationFailureType.redirected)) {
2182+
// https://github.com/vuejs/vue-router/issues/3331
2183+
if (!isNavigationFailure(err, NavigationFailureType.redirected) || prev !== START) {
2184+
this$1.ready = true;
21832185
this$1.readyErrorCbs.forEach(function (cb) {
21842186
cb(err);
21852187
});
2186-
} else {
2187-
this$1.readyCbs.forEach(function (cb) {
2188-
cb(route);
2189-
});
21902188
}
21912189
}
21922190
}
@@ -3052,7 +3050,7 @@ function createHref (base, fullPath, mode) {
30523050
}
30533051

30543052
VueRouter.install = install;
3055-
VueRouter.version = '3.4.4';
3053+
VueRouter.version = '3.4.5';
30563054
VueRouter.isNavigationFailure = isNavigationFailure;
30573055
VueRouter.NavigationFailureType = NavigationFailureType;
30583056

Diff for: ‎dist/vue-router.esm.browser.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-router v3.4.4
2+
* vue-router v3.4.5
33
* (c) 2020 Evan You
44
* @license MIT
55
*/
@@ -2149,10 +2149,10 @@ class History {
21492149
// Exception should still be thrown
21502150
throw e
21512151
}
2152+
const prev = this.current;
21522153
this.confirmTransition(
21532154
route,
21542155
() => {
2155-
const prev = this.current;
21562156
this.updateRoute(route);
21572157
onComplete && onComplete(route);
21582158
this.ensureURL();
@@ -2173,17 +2173,15 @@ class History {
21732173
onAbort(err);
21742174
}
21752175
if (err && !this.ready) {
2176-
this.ready = true;
2177-
// Initial redirection should still trigger the onReady onSuccess
2176+
// Initial redirection should not mark the history as ready yet
2177+
// because it's triggered by the redirection instead
21782178
// https://github.com/vuejs/vue-router/issues/3225
2179-
if (!isNavigationFailure(err, NavigationFailureType.redirected)) {
2179+
// https://github.com/vuejs/vue-router/issues/3331
2180+
if (!isNavigationFailure(err, NavigationFailureType.redirected) || prev !== START) {
2181+
this.ready = true;
21802182
this.readyErrorCbs.forEach(cb => {
21812183
cb(err);
21822184
});
2183-
} else {
2184-
this.readyCbs.forEach(cb => {
2185-
cb(route);
2186-
});
21872185
}
21882186
}
21892187
}
@@ -3018,7 +3016,7 @@ function createHref (base, fullPath, mode) {
30183016
}
30193017

30203018
VueRouter.install = install;
3021-
VueRouter.version = '3.4.4';
3019+
VueRouter.version = '3.4.5';
30223020
VueRouter.isNavigationFailure = isNavigationFailure;
30233021
VueRouter.NavigationFailureType = NavigationFailureType;
30243022

Diff for: ‎dist/vue-router.esm.browser.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/vue-router.esm.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-router v3.4.4
2+
* vue-router v3.4.5
33
* (c) 2020 Evan You
44
* @license MIT
55
*/
@@ -2150,10 +2150,10 @@ History.prototype.transitionTo = function transitionTo (
21502150
// Exception should still be thrown
21512151
throw e
21522152
}
2153+
var prev = this.current;
21532154
this.confirmTransition(
21542155
route,
21552156
function () {
2156-
var prev = this$1.current;
21572157
this$1.updateRoute(route);
21582158
onComplete && onComplete(route);
21592159
this$1.ensureURL();
@@ -2174,17 +2174,15 @@ History.prototype.transitionTo = function transitionTo (
21742174
onAbort(err);
21752175
}
21762176
if (err && !this$1.ready) {
2177-
this$1.ready = true;
2178-
// Initial redirection should still trigger the onReady onSuccess
2177+
// Initial redirection should not mark the history as ready yet
2178+
// because it's triggered by the redirection instead
21792179
// https://github.com/vuejs/vue-router/issues/3225
2180-
if (!isNavigationFailure(err, NavigationFailureType.redirected)) {
2180+
// https://github.com/vuejs/vue-router/issues/3331
2181+
if (!isNavigationFailure(err, NavigationFailureType.redirected) || prev !== START) {
2182+
this$1.ready = true;
21812183
this$1.readyErrorCbs.forEach(function (cb) {
21822184
cb(err);
21832185
});
2184-
} else {
2185-
this$1.readyCbs.forEach(function (cb) {
2186-
cb(route);
2187-
});
21882186
}
21892187
}
21902188
}
@@ -3050,7 +3048,7 @@ function createHref (base, fullPath, mode) {
30503048
}
30513049

30523050
VueRouter.install = install;
3053-
VueRouter.version = '3.4.4';
3051+
VueRouter.version = '3.4.5';
30543052
VueRouter.isNavigationFailure = isNavigationFailure;
30553053
VueRouter.NavigationFailureType = NavigationFailureType;
30563054

Diff for: ‎dist/vue-router.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* vue-router v3.4.4
2+
* vue-router v3.4.5
33
* (c) 2020 Evan You
44
* @license MIT
55
*/
@@ -2156,10 +2156,10 @@
21562156
// Exception should still be thrown
21572157
throw e
21582158
}
2159+
var prev = this.current;
21592160
this.confirmTransition(
21602161
route,
21612162
function () {
2162-
var prev = this$1.current;
21632163
this$1.updateRoute(route);
21642164
onComplete && onComplete(route);
21652165
this$1.ensureURL();
@@ -2180,17 +2180,15 @@
21802180
onAbort(err);
21812181
}
21822182
if (err && !this$1.ready) {
2183-
this$1.ready = true;
2184-
// Initial redirection should still trigger the onReady onSuccess
2183+
// Initial redirection should not mark the history as ready yet
2184+
// because it's triggered by the redirection instead
21852185
// https://github.com/vuejs/vue-router/issues/3225
2186-
if (!isNavigationFailure(err, NavigationFailureType.redirected)) {
2186+
// https://github.com/vuejs/vue-router/issues/3331
2187+
if (!isNavigationFailure(err, NavigationFailureType.redirected) || prev !== START) {
2188+
this$1.ready = true;
21872189
this$1.readyErrorCbs.forEach(function (cb) {
21882190
cb(err);
21892191
});
2190-
} else {
2191-
this$1.readyCbs.forEach(function (cb) {
2192-
cb(route);
2193-
});
21942192
}
21952193
}
21962194
}
@@ -3056,7 +3054,7 @@
30563054
}
30573055

30583056
VueRouter.install = install;
3059-
VueRouter.version = '3.4.4';
3057+
VueRouter.version = '3.4.5';
30603058
VueRouter.isNavigationFailure = isNavigationFailure;
30613059
VueRouter.NavigationFailureType = NavigationFailureType;
30623060

Diff for: ‎dist/vue-router.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)