feat(quickapp-webview): add quickapp-webview-huawei,quickapp-webview-union

packages/uni-cli-shared/lib/plugin.js

@@ -89,6 +89,16 @@ module.exports = {
   init () {
     // compatible with vue-cli-service lint
     process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5'
+
+    // hack
+    if (
+      process.env.UNI_PLATFORM === 'quickapp-webview-huawei' ||
+      process.env.UNI_PLATFORM === 'quickapp-webview-union'
+    ) {
+      process.env.UNI_SUB_PLATFORM = process.env.UNI_PLATFORM
+      process.env.UNI_PLATFORM = 'quickapp-webview'
+    }
+
     const plugins = resolvePlugins()
     const plugin = plugins.find(plugin => plugin.name === process.env.UNI_PLATFORM)
     if (!plugin) {

packages/uni-cli-shared/lib/preprocess.js

@@ -43,6 +43,16 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
     vueContext.APP = true
   }
 
+  if (name === 'quickapp-webview') {
+    vueContext.QUICKAPP_WEBVIEW_HUAWEI = true
+    vueContext.QUICKAPP_WEBVIEW_UNION = true
+    if (process.env.UNI_SUB_PLATFORM === 'quickapp-webview-huawei') {
+      vueContext.QUICKAPP_WEBVIEW_UNION = false
+    } else if (process.env.UNI_SUB_PLATFORM === 'quickapp-webview-union') {
+      vueContext.QUICKAPP_WEBVIEW_HUAWEI = false
+    }
+  }
+
   userDefineKeys.forEach(name => {
     if (userDefines[name]) {
       const key = normalize(name)

packages/uni-quickapp-webview/lib/uni.config.js

@@ -30,6 +30,7 @@ module.exports = {
     filterTag: 'qjs'
   },
   validate (platformOptions, manifestJson) {
+    Object.assign(platformOptions, manifestJson['quickapp-webview'] || {}, platformOptions)
     if (!platformOptions.package) {
       console.warn('manifest.json->quickapp-webview 缺少 package 配置')
     }
@@ -38,18 +39,18 @@ module.exports = {
     }
   },
   copyWebpackOptions (platformOptions, vueOptions) {
-    const copyOptions = []
-    let jsConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'jsconfig.json')
-    if (!fs.existsSync(jsConfigPath)) {
-      jsConfigPath = path.resolve(__dirname, 'assets/jsconfig.json')
-    }
-    copyOptions.push(jsConfigPath)
-
-    const signCopyOption = getSignCopyOption()
-    if (signCopyOption) {
-      copyOptions.push(signCopyOption)
-    }
-
+    const copyOptions = []
+    let jsConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'jsconfig.json')
+    if (!fs.existsSync(jsConfigPath)) {
+      jsConfigPath = path.resolve(__dirname, 'assets/jsconfig.json')
+    }
+    copyOptions.push(jsConfigPath)
+
+    const signCopyOption = getSignCopyOption()
+    if (signCopyOption) {
+      copyOptions.push(signCopyOption)
+    }
+
     return copyOptions
   }
-}
+}

packages/webpack-uni-pages-loader/lib/platforms/quickapp-webview/index.js

@@ -5,7 +5,7 @@
  */
 module.exports = function (pagesJson, manifestJson) {
   const {
-    app,
+    app,
     project
   } = require('../mp')(pagesJson, manifestJson, require('./project.config.json'))
 
@@ -16,16 +16,20 @@ module.exports = function (pagesJson, manifestJson) {
   manifestJson.versionName && (baseJson.versionName = manifestJson.versionName)
   manifestJson.versionCode && (baseJson.versionCode = manifestJson.versionCode)
 
-  Object.assign(app.content, baseJson, manifestJson['quickapp-webview'] || {})
+  const options = Object.assign({}, manifestJson['quickapp-webview'] || {})
+  if (process.env.UNI_SUB_PLATFORM) {
+    Object.assign(options, manifestJson[process.env.UNI_SUB_PLATFORM] || {})
+  }
+  Object.assign(app.content, baseJson, options)
 
   if (!app.content.package) {
     app.content.package = manifestJson.name
-  }
-
-  project.name = 'quickapp.config'
+  }
 
-  return [
-    app,
-    project
+  project.name = 'quickapp.config'
+
+  return [
+    app,
+    project
   ]
-}
+}