Merge branch 'dev' into alpha

build/build.js

@@ -13,6 +13,8 @@ const {
   generateApiManifest
 } = require('./manifest')
 
+const fixInnerHTML = require('./fixInnerHTML')
+
 const service = new Service(process.env.VUE_CLI_CONTEXT || process.cwd(), {
   inlineOptions: require('./vue.config.js')
 })
@@ -53,6 +55,9 @@ service.run('build', {
       JSON.parse(JSON.stringify(process.UNI_SERVICE_API_PROTOCOL))
     )
   }
+  if (process.env.UNI_PLATFORM === 'app-plus' && process.env.UNI_VIEW === 'true' && process.env.UNI_WATCH !== 'true') {
+    fixInnerHTML()
+  }
 }).catch(err => {
   error(err)
   process.exit(1)

build/fixInnerHTML.js

+const path = require('path')
+const fs = require('fs')
+
+module.exports = function () {
+  const files = [
+    path.join(__dirname, '../packages/uni-app-plus/dist/view.umd.min.js'),
+    path.join(__dirname, '../packages/uni-app-plus/template/v3/__uniappquill.js'),
+    path.join(__dirname, '../packages/uni-app-plus/template/v3/__uniappquillimageresize.js')
+  ]
+  files.forEach(filePath => {
+    const fileContent = fs.readFileSync(filePath, {
+      encoding: 'utf8'
+    })
+    fs.writeFileSync(filePath, fileContent.replace(/\.innerHTML\b/g, '["inner"+"HTML"]'), {
+      encoding: 'utf8'
+    })
+  })
+}