@xfe-repo/web-app 1.3.3 → 1.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/deploy/.drone.yml +9 -3
- package/package.json +3 -3
package/deploy/.drone.yml
CHANGED
|
@@ -11,6 +11,11 @@ trigger:
|
|
|
11
11
|
- custom
|
|
12
12
|
- tag
|
|
13
13
|
|
|
14
|
+
resources:
|
|
15
|
+
requests:
|
|
16
|
+
cpu: 2000
|
|
17
|
+
memory: 4096MiB
|
|
18
|
+
|
|
14
19
|
steps:
|
|
15
20
|
- name: install
|
|
16
21
|
pull: if-not-exists
|
|
@@ -28,7 +33,7 @@ steps:
|
|
|
28
33
|
resources:
|
|
29
34
|
limits:
|
|
30
35
|
cpu: 4000
|
|
31
|
-
memory:
|
|
36
|
+
memory: 8192MiB
|
|
32
37
|
volumes:
|
|
33
38
|
- name: node-modules
|
|
34
39
|
path: /drone/src/node_modules
|
|
@@ -67,6 +72,8 @@ steps:
|
|
|
67
72
|
# 将$INFRA_K8S_CONFIG或$SAAS_K8S_CONFIG写入kube_config
|
|
68
73
|
- echo "$TARGET_K8S" | grep -q "infra" && echo "$INFRA_K8S_CONFIG" > kube_config || echo "$SAAS_K8S_CONFIG" > kube_config
|
|
69
74
|
# 将环境类型写入values.yaml
|
|
75
|
+
- appName="`echo ${DRONE_REPO//\//-}`"
|
|
76
|
+
- sed -i "s/<<APP_NAME>>/$appName/g" deploy/helm/values.yaml
|
|
70
77
|
- sed -i "s/<<CI_COMMIT_SHA>>/$CI_COMMIT_SHA/g" deploy/helm/values.yaml
|
|
71
78
|
- sed -i "s/<<TAG_CONTENT>>/$DRONE_TAG/g" deploy/helm/values.yaml
|
|
72
79
|
# 展示values.yaml 与 TARGET_K8S
|
|
@@ -80,8 +87,7 @@ steps:
|
|
|
80
87
|
- sed -i "s/<<ENV_TYPE>>/test/g" deploy/helm/values.test.yaml
|
|
81
88
|
- sed -i "s/<<APP_SUFFIX>>/-$HOST_PREFIX/g" deploy/helm/values.test.yaml
|
|
82
89
|
- sed -i "s/<<HOST_PREFIX>>/$HOST_PREFIX/g" deploy/helm/values.test.yaml
|
|
83
|
-
-
|
|
84
|
-
- chartName="$appName-$HOST_PREFIX"
|
|
90
|
+
- chartName="${DRONE_REPO//\//-}-$HOST_PREFIX"
|
|
85
91
|
- echo "$chartName"
|
|
86
92
|
- sed -i "s/deployment/$chartName/g" deploy/helm/Chart.yaml
|
|
87
93
|
- sed -i "s/1.0.0/0.0.0-$CI_COMMIT_SHA/g" deploy/helm/Chart.yaml
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xfe-repo/web-app",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.5",
|
|
4
4
|
"bin": {
|
|
5
5
|
"xfe-web": "./bin/index.js"
|
|
6
6
|
},
|
|
@@ -78,8 +78,8 @@
|
|
|
78
78
|
"webpack-manifest-plugin": "^4.0.2",
|
|
79
79
|
"workbox-webpack-plugin": "^7.0.0",
|
|
80
80
|
"yaml": "^2.3.4",
|
|
81
|
-
"@xfe-repo/
|
|
82
|
-
"@xfe-repo/
|
|
81
|
+
"@xfe-repo/typescript-config": "0.0.6",
|
|
82
|
+
"@xfe-repo/eslint-config": "0.0.5"
|
|
83
83
|
},
|
|
84
84
|
"peerDependencies": {
|
|
85
85
|
"react": "18.2.0",
|