Merge branch 'dev' into alpha

packages/vue-cli-plugin-uni/lib/format-log.js

@@ -8,6 +8,13 @@ function isDebugMode () {
   return typeof __channelId__ === 'string' && __channelId__
 }
 
+export function log (type) {
+  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    args[_key - 1] = arguments[_key]
+  }
+  console[type].apply(console, args)
+}
+
 export default function formatLog () {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key]

packages/vue-cli-plugin-uni/lib/h5/index.js

@@ -34,7 +34,7 @@ const uniCloudPath = path.resolve(__dirname, '../../packages/uni-cloud/dist/inde
 
 function getProvides () {
   return {
-    '__f__': [path.resolve(__dirname, '../format-log.js'), 'default'],
+    '__f__': [path.resolve(__dirname, '../format-log.js'), 'log'],
     'uniCloud': [uniCloudPath, 'default'],
     'wx.nextTick': [runtimePath, 'nextTick'],
     'Page': [runtimePath, 'Page'],