Merge branch 'dev' into alpha

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

@@ -12,7 +12,7 @@ export default function formatLog () {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key]
   }
-  const type = args.shift()
+  var type = args.shift()
   if (isDebugMode()) {
     args.push(args.pop().replace('at ', 'uni-app:///'))
     return console[type]['apply'](console, args)

packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/dist/parseCustomBlocks.js

@@ -44,7 +44,9 @@ module.exports = function parseCustomBlocks(descriptor, options) {
         block.type === 'renderjs' ||
         block.attrs.lang === 'renderjs'
       )
-    ) {
+    ) {
+      block.type = 'renderjs'
+      block.attrs.lang = 'js'
       descriptor.renderjs = preprocessBlock(block)
       modules[block.attrs.module] = Object.assign({}, block, {
         content: ''