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

packages/vue-cli-plugin-uni/commands/info.js

-console.log('uni-app v' + require('../package.json').version)
+console.log('uni-app v' + require('@dcloudio/webpack-uni-pages-loader/package.json')['uni-app']['compilerVersion'])
+console.log('uni-app cli v' + require('../package.json').version)
 console.log(require('chalk').bold('\nEnvironment Info:'))
 require('envinfo').run({
   System: ['OS', 'CPU'],

packages/vue-cli-plugin-uni/lib/check-update.js

@@ -23,12 +23,12 @@ module.exports = async function checkUpdate () {
 
   if (update) {
     if (pkg.version.split('.')[0] !== update.latest.split('.')[0]) {
-      console.log(`发现 uni-app 新版本 ${update.latest}`)
+      console.log(`发现 uni-app cli 新版本 ${update.latest}`)
       console.log(`1.修改 package.json 中 @dcloudio 相关包版本为 ^${update.latest}`)
       console.log('2.删除 package-lock.json 或 yarn.lock')
       console.log('3.执行 npm install 或 yarn')
     } else {
-      console.log(`发现 uni-app 新版本 ${update.latest}. 请执行 npm update 升级`)
+      console.log(`发现 uni-app cli 新版本 ${update.latest}. 请执行 npm update 升级`)
     }
   }
 }

src/platforms/mp-toutiao/runtime/wrapper/util.js

@@ -10,7 +10,7 @@ export function isPage () {
 
 export function initRefs (vm) {
   const mpInstance = vm.$scope
-  /* global tt */
+  /* eslint-disable no-undef */
   const minorVersion = parseInt(tt.getSystemInfoSync().SDKVersion.split('.')[1])
   if (minorVersion > 16) {
     Object.defineProperty(vm, '$refs', {