Merge branch 'dev' into alpha

packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js

@@ -87,8 +87,8 @@ const plugins = [
       UNICLOUD_DEBUG: process.env.UNICLOUD_DEBUG,
       RUN_BY_HBUILDERX: process.env.RUN_BY_HBUILDERX,
       UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
-      UNI_STAT_UNI_CLOUD: process.env.UNI_STAT_UNI_CLOUD || '',
-      UNI_STAT_DEBUG: process.env.UNI_STAT_DEBUG || ''
+      UNI_STAT_UNI_CLOUD: process.env.UNI_STAT_UNI_CLOUD || '""',
+      UNI_STAT_DEBUG: process.env.UNI_STAT_DEBUG || '""'
     }
   }),
   new webpack.BannerPlugin({

packages/vue-cli-plugin-uni/lib/chain-webpack.js

@@ -104,8 +104,8 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       'process.env.UNICLOUD_DEBUG': process.env.UNICLOUD_DEBUG,
       'process.env.RUN_BY_HBUILDERX': process.env.RUN_BY_HBUILDERX,
       'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
-      'process.env.UNI_STAT_UNI_CLOUD': process.env.UNI_STAT_UNI_CLOUD || '',
-      'process.env.UNI_STAT_DEBUG': process.env.UNI_STAT_DEBUG || '',
+      'process.env.UNI_STAT_UNI_CLOUD': process.env.UNI_STAT_UNI_CLOUD || '""',
+      'process.env.UNI_STAT_DEBUG': process.env.UNI_STAT_DEBUG || '""',
       'process.env.UNI_COMPILER_VERSION': JSON.stringify(process.env.UNI_COMPILER_VERSION),
       'process.env.UNI_APP_VERSION_NAME': JSON.stringify(process.env.UNI_APP_VERSION_NAME),
       'process.env.UNI_APP_VERSION_CODE': JSON.stringify(process.env.UNI_APP_VERSION_CODE)

src/platforms/app-plus/service/api/plugin/push.js

@@ -71,7 +71,7 @@ export function createPushMessage (params, callbackId) {
   const setting = getAppAuthorizeSetting()
   if (setting.notificationAuthorized !== 'authorized') {
     return invoke(callbackId, {
-      errMsg: 'createPushMessage:fail ' + setting.notificationAuthorized
+      errMsg: 'createPushMessage:fail notificationAuthorized: ' + setting.notificationAuthorized
     })
   }
   const options = Object.assign({}, params)