[incubator-skywalking-ui] branch feature/5.0.0 updated: Fix env variable conflict.

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch feature/5.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git


The following commit(s) were added to refs/heads/feature/5.0.0 by this push:
     new 2cfda28  Fix env variable conflict.
2cfda28 is described below

commit 2cfda28d57645ca6f8ba6daf024795e42a28c9e8
Author: wu-sheng <wu.sh...@foxmail.com>
AuthorDate: Thu Feb 8 16:55:46 2018 +0800

    Fix env variable conflict.
---
 src/main/frontend/.roadhogrc.js      | 2 +-
 src/main/frontend/.roadhogrc.mock.js | 4 ++--
 src/main/frontend/package.json       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/frontend/.roadhogrc.js b/src/main/frontend/.roadhogrc.js
index 87332f0..ba91eb6 100644
--- a/src/main/frontend/.roadhogrc.js
+++ b/src/main/frontend/.roadhogrc.js
@@ -22,7 +22,7 @@ const config = {
   "theme": "./src/theme.js"
 };
 
-if (process.env.NO_PROXY) {
+if (process.env.NO_MOCK) {
   config.proxy = {
     "/api":{
       target: "http://localhost:12800";,
diff --git a/src/main/frontend/.roadhogrc.mock.js 
b/src/main/frontend/.roadhogrc.mock.js
index 62a6cf7..71f915a 100644
--- a/src/main/frontend/.roadhogrc.mock.js
+++ b/src/main/frontend/.roadhogrc.mock.js
@@ -12,7 +12,7 @@ import { getAlarm, getNoticeAlarm } from './mock/alarm';
 import { getAllApplication as getAllApplicationForTrace, getTrace, getSpans } 
from './mock/trace'
 
 // 是否禁用代理
-const noProxy = process.env.NO_PROXY === 'true';
+const noMock = process.env.NO_MOCK === 'true';
 
 // 代码中会兼容本地 service mock 以及部署站点的静态数据
 const proxy = {
@@ -32,4 +32,4 @@ const proxy = {
   'POST /api/spans': getSpans,
 };
 
-export default noProxy ? {} : delay(proxy, 1000);
+export default noMock ? {} : delay(proxy, 1000);
diff --git a/src/main/frontend/package.json b/src/main/frontend/package.json
index 81428d4..1b343d1 100755
--- a/src/main/frontend/package.json
+++ b/src/main/frontend/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "start": "roadhog server",
-    "start:no-proxy": "cross-env NO_PROXY=true roadhog server",
+    "start:no-mock": "cross-env NO_MOCK=true roadhog server",
     "build": "roadhog build",
     "site": "roadhog-api-doc static && gh-pages -d dist",
     "analyze": "roadhog build --analyze",

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.