Merge branch 'fix/testEnvBuild' into 'master'

Fix/test env build

See merge request !64

app/web/config/index.ts

@@ -3,4 +3,4 @@ import dev from './dev.config';
 import test from './test.config';
 
 // export default  process.env.NODE_ENV === 'test' ? test : process.env.NODE_ENV === 'production' ? prod : dev;
-export default process.env.SENTRY_ENV ? test : process.env.NODE_ENV === 'production' ? prod : dev;
+export default process.env.COS_ENV === 'test' ? test : process.env.NODE_ENV === 'production' ? prod : dev;

bin/server.js

@@ -15,6 +15,7 @@ npm.load(() => {
     if (process.env.NODE_ENV === 'production') {
       npm.run("start"); 
     } else {
+      npm.run("ii");
       npm.run("test");
     }
   });

package.json

@@ -3,22 +3,23 @@
   "version": "1.0.0",
   "description": "低代码平台",
   "scripts": {
-    "start": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C egg-scripts start --port 9050 --workers 1",
-    "start:pre": "cross-env NODE_ENV=production APOLLO_CLUSTER=3PRE egg-scripts start --port 9050 --workers 1",
-    "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo APOLLO_CLUSTER=k8s NAMESPACE=qa2 egg-scripts start --port 80 --workers 1",
+    "start": "cross-env NODE_ENV=production egg-scripts start --port 9050 --workers 1",
+    "start:pre": "cross-env NODE_ENV=production egg-scripts start --port 9050 --workers 1",
+    "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
     "dev": "egg-bin dev -r egg-ts-helper/register --port 7002",
     "debug": "egg-bin debug -r egg-ts-helper/register",
-    "apollo": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo APOLLO_CLUSTER=k8s NAMESPACE=test1 node bin/apollo.js",
+    "apollo": "node bin/apollo.js",
     "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
-    "build:pre": "cross-env NODE_ENV=production APOLLO_CLUSTER=3PRE npm run apollo && cross-env COS_ENV=production easy build --devtool",
+    "build:test": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s npm run apollo && cross-env NODE_ENV=production COS_ENV=production easy build --devtool",
+    "build:pre": "cross-env NODE_ENV=production APOLLO_CLUSTER=3PRE npm run apollo && cross-env COS_ENV=test easy build --devtool",
     "tsc": "ets && tsc -p tsconfig.json",
     "clean": "ets clean",
     "kill": "easy kill",
     "lint": "tslint --project . -c tslint.json",
     "fix": "tslint --fix --project . -c tslint.json 'app/**/*{.ts}'",
-    "ii": "npm install --registry https://registry.npm.taobao.org",
+    "ii": "rm -rf node_modules && npm install --registry http://npmprivate.quantgroups.com",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
   },
   "dependencies": {

webpack.config.js

@@ -73,7 +73,8 @@ module.exports = {
     {
       define:{
         'process.env': {
-           SENTRY_ENV: JSON.stringify(process.env.SENTRY_ENV)
+           SENTRY_ENV: JSON.stringify(process.env.SENTRY_ENV),
+           COS_ENV: JSON.stringify(process.env.COS_ENV)
         }
       }
     }