From 547283bba9e53171391e248140da6ab2c56ca2ff Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Sat, 1 Feb 2020 15:01:16 +0800
Subject: [PATCH] update: uniCloud H5 tips

---
 packages/vue-cli-plugin-uni/commands/serve.js | 4 ++--
 packages/vue-cli-plugin-uni/lib/env.js        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/commands/serve.js b/packages/vue-cli-plugin-uni/commands/serve.js
index 433402575..7d93b4b2d 100644
--- a/packages/vue-cli-plugin-uni/commands/serve.js
+++ b/packages/vue-cli-plugin-uni/commands/serve.js
@@ -250,8 +250,8 @@ module.exports = (api, options) => {
           isFirstCompile = false
 
           if (!isProduction) {
-            if (process.UNI_CLOUD_ALIYUN) {
-              console.warn(`当前项目使用了阿里云服务空间，暂不支持发行到H5平台`)
+            if (process.UNI_CLOUD) {
+              console.warn(`当前项目使用了uniCloud，为避免云函数调用跨域问题，建议在HBuilderX内置浏览器里调试，如使用外部浏览器需安装跨域插件，详见：https://ask.dcloud.net.cn/article/35267`)
             }
             // const buildCommand = hasProjectYarn(api.getCwd()) ? `yarn build` : `npm run build`
             // console.log(`  Note that the development build is not optimized.`)
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index 7fb3b7bdf..d3a96cfbe 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -3,6 +3,7 @@ const path = require('path')
 const mkdirp = require('mkdirp')
 const loaderUtils = require('loader-utils')
 
+process.UNI_CLOUD = false
 process.UNI_CLOUD_ALIYUN = false
 process.env.UNI_CLOUD_PROVIDER = JSON.stringify({})
 
@@ -10,6 +11,7 @@ if (process.env.UNI_CLOUD_SPACES) {
   try {
     const spaces = JSON.parse(process.env.UNI_CLOUD_SPACES)
     if (Array.isArray(spaces)) {
+      process.UNI_CLOUD = spaces.length > 0
       process.UNI_CLOUD_ALIYUN = !!spaces.find(space => space.clientSecret)
       if (spaces.length === 1) {
         const space = spaces[0]
@@ -39,8 +41,7 @@ if (
   process.env.UNI_PLATFORM === 'h5' &&
   process.env.NODE_ENV === 'production'
 ) {
-  console.error(`当前项目使用了阿里云服务空间，暂不支持发行到H5平台`)
-  process.exit(0)
+  console.warn(`当前项目使用了基于阿里云的uniCloud，为解决浏览器跨域问题，必须由阿里云配置安全域名。目前还暂无自主申请界面，请发邮件到service@dcloud.io申请，提供你的appid和计划发布的域名。DCloud同时提供了m3w.cn的二级域名供申请，如：hellounicloud.m3w.cn`)
 }
 
 if (process.env.UNI_PLATFORM === 'mp-360') {
-- 
GitLab