Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.common.js

 /*!
   * vue-router v3.0.1
-  * (c) 2018 Evan You
+  * (c) 2019 Evan You
   * @license MIT
   */
 'use strict';
@@ -1671,7 +1671,7 @@ function scrollToPosition (shouldScroll, position) {
 
 /*  */
 
-var supportsPushState = inBrowser && (function() {
+var supportsPushState = inBrowser && (function () {
   var ua = window.navigator.userAgent;
 
   if (
@@ -1697,15 +1697,15 @@ function genKey () {
   return Time.now().toFixed(3)
 }
 
-function getStateKey() {
+function getStateKey () {
   return _key
 }
 
-function setStateKey(key) {
+function setStateKey (key) {
   _key = key;
 }
 
-function pushState(url  , id  , replace  ) {
+function pushState (url , id , replace ) {
   saveScrollPosition();
   // try...catch the pushState call to get around Safari
   // DOM Exception 18 where it limits to 100 pushState calls
@@ -1728,7 +1728,7 @@ function pushState(url  , id  , replace  ) {
   }
 }
 
-function replaceState(url  , id  ) {
+function replaceState (url , id ) {
   pushState(url, id, true);
 }
 
@@ -2776,8 +2776,8 @@ function createHref (base, fullPath, mode) {
 VueRouter.install = install;
 VueRouter.version = '3.0.1';
 
-if (inBrowser && window.Vue) {
-  window.Vue.use(VueRouter);
-}
+// if (inBrowser && window.Vue) {
+//   window.Vue.use(VueRouter)
+// }
 
 module.exports = VueRouter;

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.esm.js

 /*!
   * vue-router v3.0.1
-  * (c) 2018 Evan You
+  * (c) 2019 Evan You
   * @license MIT
   */
 /*  */
@@ -1669,7 +1669,7 @@ function scrollToPosition (shouldScroll, position) {
 
 /*  */
 
-var supportsPushState = inBrowser && (function() {
+var supportsPushState = inBrowser && (function () {
   var ua = window.navigator.userAgent;
 
   if (
@@ -1695,15 +1695,15 @@ function genKey () {
   return Time.now().toFixed(3)
 }
 
-function getStateKey() {
+function getStateKey () {
   return _key
 }
 
-function setStateKey(key) {
+function setStateKey (key) {
   _key = key;
 }
 
-function pushState(url  , id  , replace  ) {
+function pushState (url , id , replace ) {
   saveScrollPosition();
   // try...catch the pushState call to get around Safari
   // DOM Exception 18 where it limits to 100 pushState calls
@@ -1726,7 +1726,7 @@ function pushState(url  , id  , replace  ) {
   }
 }
 
-function replaceState(url  , id  ) {
+function replaceState (url , id ) {
   pushState(url, id, true);
 }
 
@@ -2774,8 +2774,8 @@ function createHref (base, fullPath, mode) {
 VueRouter.install = install;
 VueRouter.version = '3.0.1';
 
-if (inBrowser && window.Vue) {
-  window.Vue.use(VueRouter);
-}
+// if (inBrowser && window.Vue) {
+//   window.Vue.use(VueRouter)
+// }
 
 export default VueRouter;

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.js

 /*!
   * vue-router v3.0.1
-  * (c) 2018 Evan You
+  * (c) 2019 Evan You
   * @license MIT
   */
 (function (global, factory) {
@@ -1675,7 +1675,7 @@ function scrollToPosition (shouldScroll, position) {
 
 /*  */
 
-var supportsPushState = inBrowser && (function() {
+var supportsPushState = inBrowser && (function () {
   var ua = window.navigator.userAgent;
 
   if (
@@ -1701,15 +1701,15 @@ function genKey () {
   return Time.now().toFixed(3)
 }
 
-function getStateKey() {
+function getStateKey () {
   return _key
 }
 
-function setStateKey(key) {
+function setStateKey (key) {
   _key = key;
 }
 
-function pushState(url  , id  , replace  ) {
+function pushState (url , id , replace ) {
   saveScrollPosition();
   // try...catch the pushState call to get around Safari
   // DOM Exception 18 where it limits to 100 pushState calls
@@ -1732,7 +1732,7 @@ function pushState(url  , id  , replace  ) {
   }
 }
 
-function replaceState(url  , id  ) {
+function replaceState (url , id ) {
   pushState(url, id, true);
 }
 
@@ -2780,9 +2780,9 @@ function createHref (base, fullPath, mode) {
 VueRouter.install = install;
 VueRouter.version = '3.0.1';
 
-if (inBrowser && window.Vue) {
-  window.Vue.use(VueRouter);
-}
+// if (inBrowser && window.Vue) {
+//   window.Vue.use(VueRouter)
+// }
 
 return VueRouter;