Skip to content

Commit

Permalink
chore(build): 3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@posva
posva committed Apr 8, 2019
1 parent f9da191 commit e50e29e
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 30 deletions.
29 changes: 20 additions & 9 deletions dist/vue-router.common.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* vue-router v3.0.2
* (c) 2018 Evan You
* vue-router v3.0.3
* (c) 2019 Evan You
* @license MIT
*/
'use strict';
Expand Down Expand Up @@ -1084,16 +1084,24 @@ function fillParams (
params,
routeMsg
) {
params = params || {};
try {
var filler =
regexpCompileCache[path] ||
(regexpCompileCache[path] = pathToRegexp_1.compile(path));
return filler(params || {}, { pretty: true })

// Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
if (params.pathMatch) { params[0] = params.pathMatch; }

return filler(params, { pretty: true })
} catch (e) {
if (process.env.NODE_ENV !== 'production') {
warn(false, ("missing param for " + routeMsg + ": " + (e.message)));
}
return ''
} finally {
// delete the 0 if it was added
delete params[0];
}
}

Expand Down Expand Up @@ -1272,8 +1280,10 @@ function normalizeLocation (
) {
var next = typeof raw === 'string' ? { path: raw } : raw;
// named target
if (next.name || next._normalized) {
if (next._normalized) {
return next
} else if (next.name) {
return extend({}, raw)
}

// relative params
Expand Down Expand Up @@ -2130,7 +2140,7 @@ function poll (

/* */

var HTML5History = (function (History$$1) {
var HTML5History = /*@__PURE__*/(function (History$$1) {
function HTML5History (router, base) {
var this$1 = this;

Expand Down Expand Up @@ -2218,7 +2228,7 @@ function getLocation (base) {

/* */

var HashHistory = (function (History$$1) {
var HashHistory = /*@__PURE__*/(function (History$$1) {
function HashHistory (router, base, fallback) {
History$$1.call(this, router, base);
// check history fallback deeplinking
Expand Down Expand Up @@ -2355,7 +2365,7 @@ function replaceHash (path) {

/* */

var AbstractHistory = (function (History$$1) {
var AbstractHistory = /*@__PURE__*/(function (History$$1) {
function AbstractHistory (router, base) {
History$$1.call(this, router, base);
this.stack = [];
Expand Down Expand Up @@ -2568,9 +2578,10 @@ VueRouter.prototype.resolve = function resolve (
current,
append
) {
current = current || this.history.current;
var location = normalizeLocation(
to,
current || this.history.current,
current,
append,
this
);
Expand Down Expand Up @@ -2611,7 +2622,7 @@ function createHref (base, fullPath, mode) {
}

VueRouter.install = install;
VueRouter.version = '3.0.2';
VueRouter.version = '3.0.3';

if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
Expand Down
29 changes: 20 additions & 9 deletions dist/vue-router.esm.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* vue-router v3.0.2
* (c) 2018 Evan You
* vue-router v3.0.3
* (c) 2019 Evan You
* @license MIT
*/
/* */
Expand Down Expand Up @@ -1082,16 +1082,24 @@ function fillParams (
params,
routeMsg
) {
params = params || {};
try {
var filler =
regexpCompileCache[path] ||
(regexpCompileCache[path] = pathToRegexp_1.compile(path));
return filler(params || {}, { pretty: true })

// Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
if (params.pathMatch) { params[0] = params.pathMatch; }

return filler(params, { pretty: true })
} catch (e) {
if (process.env.NODE_ENV !== 'production') {
warn(false, ("missing param for " + routeMsg + ": " + (e.message)));
}
return ''
} finally {
// delete the 0 if it was added
delete params[0];
}
}

Expand Down Expand Up @@ -1270,8 +1278,10 @@ function normalizeLocation (
) {
var next = typeof raw === 'string' ? { path: raw } : raw;
// named target
if (next.name || next._normalized) {
if (next._normalized) {
return next
} else if (next.name) {
return extend({}, raw)
}

// relative params
Expand Down Expand Up @@ -2128,7 +2138,7 @@ function poll (

/* */

var HTML5History = (function (History$$1) {
var HTML5History = /*@__PURE__*/(function (History$$1) {
function HTML5History (router, base) {
var this$1 = this;

Expand Down Expand Up @@ -2216,7 +2226,7 @@ function getLocation (base) {

/* */

var HashHistory = (function (History$$1) {
var HashHistory = /*@__PURE__*/(function (History$$1) {
function HashHistory (router, base, fallback) {
History$$1.call(this, router, base);
// check history fallback deeplinking
Expand Down Expand Up @@ -2353,7 +2363,7 @@ function replaceHash (path) {

/* */

var AbstractHistory = (function (History$$1) {
var AbstractHistory = /*@__PURE__*/(function (History$$1) {
function AbstractHistory (router, base) {
History$$1.call(this, router, base);
this.stack = [];
Expand Down Expand Up @@ -2566,9 +2576,10 @@ VueRouter.prototype.resolve = function resolve (
current,
append
) {
current = current || this.history.current;
var location = normalizeLocation(
to,
current || this.history.current,
current,
append,
this
);
Expand Down Expand Up @@ -2609,7 +2620,7 @@ function createHref (base, fullPath, mode) {
}

VueRouter.install = install;
VueRouter.version = '3.0.2';
VueRouter.version = '3.0.3';

if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
Expand Down
29 changes: 20 additions & 9 deletions dist/vue-router.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* vue-router v3.0.2
* (c) 2018 Evan You
* vue-router v3.0.3
* (c) 2019 Evan You
* @license MIT
*/
(function (global, factory) {
Expand Down Expand Up @@ -1088,16 +1088,24 @@ function fillParams (
params,
routeMsg
) {
params = params || {};
try {
var filler =
regexpCompileCache[path] ||
(regexpCompileCache[path] = pathToRegexp_1.compile(path));
return filler(params || {}, { pretty: true })

// Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
if (params.pathMatch) { params[0] = params.pathMatch; }

return filler(params, { pretty: true })
} catch (e) {
{
warn(false, ("missing param for " + routeMsg + ": " + (e.message)));
}
return ''
} finally {
// delete the 0 if it was added
delete params[0];
}
}

Expand Down Expand Up @@ -1276,8 +1284,10 @@ function normalizeLocation (
) {
var next = typeof raw === 'string' ? { path: raw } : raw;
// named target
if (next.name || next._normalized) {
if (next._normalized) {
return next
} else if (next.name) {
return extend({}, raw)
}

// relative params
Expand Down Expand Up @@ -2134,7 +2144,7 @@ function poll (

/* */

var HTML5History = (function (History$$1) {
var HTML5History = /*@__PURE__*/(function (History$$1) {
function HTML5History (router, base) {
var this$1 = this;

Expand Down Expand Up @@ -2222,7 +2232,7 @@ function getLocation (base) {

/* */

var HashHistory = (function (History$$1) {
var HashHistory = /*@__PURE__*/(function (History$$1) {
function HashHistory (router, base, fallback) {
History$$1.call(this, router, base);
// check history fallback deeplinking
Expand Down Expand Up @@ -2359,7 +2369,7 @@ function replaceHash (path) {

/* */

var AbstractHistory = (function (History$$1) {
var AbstractHistory = /*@__PURE__*/(function (History$$1) {
function AbstractHistory (router, base) {
History$$1.call(this, router, base);
this.stack = [];
Expand Down Expand Up @@ -2572,9 +2582,10 @@ VueRouter.prototype.resolve = function resolve (
current,
append
) {
current = current || this.history.current;
var location = normalizeLocation(
to,
current || this.history.current,
current,
append,
this
);
Expand Down Expand Up @@ -2615,7 +2626,7 @@ function createHref (base, fullPath, mode) {
}

VueRouter.install = install;
VueRouter.version = '3.0.2';
VueRouter.version = '3.0.3';

if (inBrowser && window.Vue) {
window.Vue.use(VueRouter);
Expand Down
Loading

0 comments on commit e50e29e

Please sign in to comment.