@xfe-repo/web-app 1.0.1 → 1.0.2

package/deploy/helm/templates/virtualService.yaml

@@ -10,8 +10,9 @@ spec:
     - "{{ . }}"
     {{- end }}
   gateways:
-    {{- range $.Values.gateways }}
-    - {{ . }}
+    {{- $gateways := $.Values.gateways }}
+    {{- range $gateways }}
+    - "{{ . }}"
     {{- end }}
   http:
     - match:

package/deploy/helm/values.yaml

@@ -7,10 +7,10 @@ envType: '<<ENV_TYPE>>'
 hostPrefix: '<<HOST_PREFIX>>'
 hosts:
   test:
-    - '<<HOST_PREFIX>>.jarvis.t.eshetang.com'
+    - '<<HOST_PREFIX>>.pc.t.eshetang.com'
   stage:
-    - stage.jarvis.t.eshetang.com
+    - 'stage.pc.t.eshetang.com'
   prod:
-    - jarvis.eshetang.com
+    - 'pc.eshetang.com'
 gateways:
-  - common-gateway-eshetang
+  - 'common-gateway-eshetang'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "bin": {
     "xfe-web": "./bin/index.js"
   },
@@ -32,7 +32,6 @@
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-webpack-plugin": "^3.1.1",
     "file-loader": "^6.2.0",
@@ -67,14 +66,14 @@
     "style-loader": "^3.3.1",
     "tailwindcss": "^3.0.2",
     "terser-webpack-plugin": "^5.2.5",
-    "typescript": "^5.2.2",
     "web-vitals": "^2.1.4",
     "webpack": "^5.64.4",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-dev-server": "^4.6.0",
     "webpack-manifest-plugin": "^4.0.2",
     "workbox-webpack-plugin": "^7.0.0",
-    "@xfe-repo/eslint-config": "0.0.0",
-    "@xfe-repo/typescript-config": "0.0.0"
+    "yaml": "^2.3.4",
+    "@xfe-repo/eslint-config": "0.0.1",
+    "@xfe-repo/typescript-config": "0.0.2"
   }
 }

package/scripts/build.js

@@ -11,6 +11,9 @@ process.on("unhandledRejection", (err) => {
   throw err;
 });
 
+// 加载配置
+require("./config");
+
 // Ensure environment variables are read.
 require("../config/env");
 

package/scripts/config.js

@@ -0,0 +1,33 @@
+// 读取配置并作出相应的处理
+const fs = require('fs')
+const yaml = require('yaml')
+const path = require('path')
+
+/* deploy 相关配置写入 */
+const configDeploy = () => {
+  // 读取xfe.json
+  const xfeConfig = JSON.parse(fs.readFileSync('./xfe.json', 'utf8'))
+
+  if (!xfeConfig?.deploy) return
+
+  // 处理写入deploy values配置
+  const valuesYamlFilePath = path.resolve(__dirname, '../deploy/helm/values.yaml')
+  const valuesYamlFile = fs.readFileSync(valuesYamlFilePath, 'utf8')
+  const valuesYaml = yaml.parse(valuesYamlFile)
+
+  if(!valuesYaml.hosts) valuesYaml.hosts = { test: [], stage: [], prod: [] }
+
+  valuesYaml.hosts.prod = xfeConfig.deploy.hostsProd || []
+  valuesYaml.hosts.stage = xfeConfig.deploy.hostsStage || []
+  valuesYaml.hosts.test = xfeConfig.deploy.hostsTest || []
+
+  // gateways 默认为 common-gateway-eshetang
+  valuesYaml.gateways = xfeConfig.deploy.gateways || ["common-gateway-eshetang"]
+
+  // 写入values.yaml
+  const valuesYamlStr = yaml.stringify(valuesYaml, { defaultStringType: 'QUOTE_SINGLE', defaultKeyType: 'PLAIN' })
+  fs.writeFileSync(valuesYamlFilePath, valuesYamlStr, 'utf8')
+}
+
+/* 其他配置待扩展 */
+configDeploy()

package/scripts/dev.js

@@ -11,6 +11,9 @@ process.on("unhandledRejection", (err) => {
   throw err;
 });
 
+// 加载配置
+require("./config");
+
 // Ensure environment variables are read.
 require("../config/env");
 

package/scripts/devSSR.js

@@ -2,6 +2,9 @@
 
 process.env.NODE_ENV = 'development'
 
+// 加载配置
+require("./config");
+
 const chalk = require('chalk')
 const webpack = require('webpack')
 const nodemon = require('nodemon')