@xfe-repo/mini-app 0.0.11 → 0.0.13

package/config/index.ts

@@ -15,12 +15,12 @@ export default defineConfig<'webpack5'>(async (merge) => {
   const baseConfig: UserConfigExport<'webpack5'> = {
     projectName: 'xfe-mini',
     date: '2024-12-3',
-    designWidth: 750,
+    designWidth: 375,
     deviceRatio: {
+      375: 2,
       640: 2.34 / 2,
       750: 1,
-      375: 2,
-      828: 1.81 / 2
+      828: 1.81 / 2,
     },
     // 项目根目录 相对于当前文件
     sourceRoot: path.join(appProjectRootRelPath, 'src'),

package/deploy/.drone.yml

@@ -2,7 +2,7 @@
 # 通用 依赖安装部分
 kind: pipeline
 type: kubernetes
-name: yarn
+name: install
 
 metadata:
   namespace: cicd
@@ -13,14 +13,15 @@ trigger:
     - tag
 
 steps:
-  - name: yarn
+  - name: install
     pull: if-not-exists
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-mini:18.16.1
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
     volumes:
       - name: node-modules
         path: /drone/src/node_modules
     commands:
-      - yarn
+      - pnpm config set registry https://registry.npmmirror.com
+      - pnpm i
 
 volumes:
   - name: node-modules
@@ -37,7 +38,7 @@ type: kubernetes
 name: deploy-mini
 
 depends_on:
-  - yarn
+  - install
 
 metadata:
   namespace: cicd
@@ -48,7 +49,7 @@ trigger:
     - tag
 
 steps:
-  - name: yarn-build
+  - name: build
     pull: if-not-exists
     image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-mini:18.16.1
     volumes:
@@ -56,7 +57,7 @@ steps:
         path: /drone/src/node_modules
     commands:
       - GET_API_ENV=`bash deploy/env.sh` && export API_ENV=$GET_API_ENV
-      - yarn build
+      - pnpm build --type weapp
 
   - name: preview
     pull: if-not-exists
@@ -64,12 +65,10 @@ steps:
     volumes:
       - name: node-modules
         path: /drone/src/node_modules
-    environment:
-
     commands:
       - GET_API_ENV=`bash deploy/env.sh` && export API_ENV=$GET_API_ENV
       - echo $API_ENV $DRONE_COMMIT_MESSAGE
-      - yarn preview -d "$API_ENV $DRONE_COMMIT_MESSAGE"
+      - pnpm preview -d "$API_ENV $DRONE_COMMIT_MESSAGE"
       - echo '二维码将在2小时内过期 可在微信小程序助手中 找到此版本'
     when:
       ref:
@@ -85,12 +84,8 @@ steps:
     commands:
       - GET_API_ENV=`bash deploy/env.sh` && export API_ENV=$GET_API_ENV
       - echo $API_ENV $DRONE_COMMIT_MESSAGE
-      - yarn upload -d "$DRONE_COMMIT_MESSAGE" -v "$${DRONE_COMMIT_REF#refs/tags/}"
+      - pnpm upload -d "$DRONE_COMMIT_MESSAGE" -v "$${DRONE_COMMIT_REF#refs/tags/}"
       - echo '小程序已上传至微信后台 请注意及时提审'
-      - git fetch
-      - git checkout -b release $DRONE_COMMIT_REF
-      - git push origin release --force
-      - echo "release分支已强制同步到当前发布版本"
     when:
       ref:
         include:
@@ -111,8 +106,7 @@ type: kubernetes
 name: deploy-h5
 
 depends_on:
-  - yarn
-  # - deploy-mini
+  - install
 
 metadata:
   namespace: cicd
@@ -123,32 +117,21 @@ trigger:
     - tag
 
 steps:
-  - name: yarn-build
+  - name: build
     pull: if-not-exists
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-mini:18.16.1
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
+    resources:
+      limits:
+        cpu: 2000
+        memory: 4000MiB
     volumes:
       - name: node-modules
         path: /drone/src/node_modules
     commands:
-      - export GENERATE_SOURCEMAP=false
-      - yarn build:h5
-
-  - name: yarn-build-docs
-    pull: if-not-exists
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-mini:18.16.1
-    volumes:
-      - name: node-modules
-        path: /drone/src/node_modules
-      - name: node-modules-docs
-        path: /drone/src/dumi/node_modules
-    commands:
-      - cd ./dumi && yarn
-      - cd ../ && yarn docs:build
-    when:
-      ref:
-        include:
-          - refs/tags/stage-*
-          - refs/tags/release-*
+      - export REACT_APP_RELEASE=$DRONE_REPO_NAME@${DRONE_TAG:CI_COMMIT_SHA}
+      - cp -r node_modules/@xfe-repo/web-app/deploy deploy
+      - echo -n "$REACT_APP_RELEASE" > deploy/static/release
+      - pnpm build --type h5
 
   - name: docker-build
     image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/deploy-cli-docker
@@ -166,78 +149,79 @@ steps:
       - sh /data/scripts/builderInit.sh
       - appName="`echo ${DRONE_REPO//\//-}`"
       - sed -i "s/<<APP_NAME>>/$appName/g" deploy/helm/values.yaml
-      - sed -i "s/<<CI_COMMIT_SHA>>/$CI_COMMIT_SHA/g" deploy/helm/values.yaml
-      - sed -i "s/<<TAG_CONTENT>>/$DRONE_TAG/g" deploy/helm/values.yaml
       - docker build -f deploy/Dockerfile -t xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA . --no-cache
       - docker push xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
       - docker rmi xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA
 
-  - name: deploy-to-test
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest # dtzar/helm-kubectl
+  - name: pre-deploy
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
     environment:
       SAAS_K8S_CONFIG:
         from_secret: saas-k8s-config
+      INFRA_K8S_CONFIG:
+        from_secret: infra-k8s-config
+    commands:
+      # 判断values.yaml中的targetK8s字段，选择目标集群
+      - export TARGET_K8S=$(cat deploy/helm/values.yaml | grep targetK8s | awk '{print $2}' | sed 's/\"//g')
+      # 将$INFRA_K8S_CONFIG或$SAAS_K8S_CONFIG写入kube_config
+      - echo "$TARGET_K8S" | grep -q "infra" && echo "$INFRA_K8S_CONFIG" > kube_config || echo "$SAAS_K8S_CONFIG" > kube_config
+      # 将环境类型写入values.yaml
+      - sed -i "s/<<CI_COMMIT_SHA>>/$CI_COMMIT_SHA/g" deploy/helm/values.yaml
+      - sed -i "s/<<TAG_CONTENT>>/$DRONE_TAG/g" deploy/helm/values.yaml
+      # 展示values.yaml 与 TARGET_K8S
+      - cat deploy/helm/values.yaml && echo $TARGET_K8S
+
+  - name: deploy-to-test
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
     commands:
-      - echo "$SAAS_K8S_CONFIG" > saas_config
       - cp deploy/helm/values.yaml deploy/helm/values.test.yaml
       - sed -i "s/<<ENV_TYPE>>/test/g" deploy/helm/values.test.yaml
-      - sed -i "s/<<APP_PREFIX>>/-$HOST_PREFIX/g" deploy/helm/values.test.yaml
+      - sed -i "s/<<APP_SUFFIX>>/-$HOST_PREFIX/g" deploy/helm/values.test.yaml
       - sed -i "s/<<HOST_PREFIX>>/$HOST_PREFIX/g" deploy/helm/values.test.yaml
       - helm template deploy/helm --values deploy/helm/values.test.yaml
-      - helm template deploy/helm --values deploy/helm/values.test.yaml | kubectl --kubeconfig=saas_config apply -f -
+      - helm template deploy/helm --values deploy/helm/values.test.yaml | kubectl --kubeconfig=kube_config apply -f -
     when:
       event:
         - custom
 
   - name: deploy-to-stage
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest # dtzar/helm-kubectl
-    environment:
-      SAAS_K8S_CONFIG:
-        from_secret: saas-k8s-config
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
     commands:
-      - echo "$SAAS_K8S_CONFIG" > saas_config
       - cp deploy/helm/values.yaml deploy/helm/values.stage.yaml
       - sed -i "s/<<ENV_TYPE>>/stage/g" deploy/helm/values.stage.yaml
-      - sed -i "s/<<APP_PREFIX>>/-stage/g" deploy/helm/values.stage.yaml
-      - sed -i "s/<<HOST_PREFIX>>/stage/g" deploy/helm/values.stage.yaml
+      - sed -i "s/<<APP_SUFFIX>>//g" deploy/helm/values.stage.yaml
+      - sed -i "s/<<HOST_PREFIX>>//g" deploy/helm/values.stage.yaml
       - helm template deploy/helm --values deploy/helm/values.stage.yaml
-      - helm template deploy/helm --values deploy/helm/values.stage.yaml | kubectl --kubeconfig=saas_config apply -f -
+      - helm template deploy/helm --values deploy/helm/values.stage.yaml | kubectl --kubeconfig=kube_config apply -f -
     when:
       ref:
         include:
           - refs/tags/stage-*
 
-  - name: deploy-to-stable
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest # dtzar/helm-kubectl
-    environment:
-      SAAS_K8S_CONFIG:
-        from_secret: saas-k8s-config
+  - name: deploy-to-prod
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
     commands:
-      - echo "$SAAS_K8S_CONFIG" > saas_config
-      - cp deploy/helm/values.yaml deploy/helm/values.test.yaml
-      - sed -i "s/<<ENV_TYPE>>/test/g" deploy/helm/values.test.yaml
-      - sed -i "s/<<APP_PREFIX>>/-stable/g" deploy/helm/values.test.yaml
-      - sed -i "s/<<HOST_PREFIX>>/*/g" deploy/helm/values.test.yaml
-      - helm template deploy/helm --values deploy/helm/values.test.yaml
-      - helm template deploy/helm --values deploy/helm/values.test.yaml | kubectl --kubeconfig=saas_config apply -f -
+      - cp deploy/helm/values.yaml deploy/helm/values.prod.yaml
+      - sed -i "s/<<ENV_TYPE>>/prod/g" deploy/helm/values.prod.yaml
+      - sed -i "s/<<APP_SUFFIX>>//g" deploy/helm/values.prod.yaml
+      - sed -i "s/<<HOST_PREFIX>>//g" deploy/helm/values.prod.yaml
+      - helm template deploy/helm --values deploy/helm/values.prod.yaml
+      - helm template deploy/helm --values deploy/helm/values.prod.yaml | kubectl --kubeconfig=kube_config apply -f -
     when:
       ref:
         include:
           - refs/tags/release-*
 
-  - name: deploy-to-prod
-    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest # dtzar/helm-kubectl
-    environment:
-      SAAS_K8S_CONFIG:
-        from_secret: saas-k8s-config
+  - name: deploy-to-stable
+    image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/deploy-helm:latest
+    failure: ignore
     commands:
-      - echo "$SAAS_K8S_CONFIG" > saas_config
-      - cp deploy/helm/values.yaml deploy/helm/values.prod.yaml
-      - sed -i "s/<<ENV_TYPE>>/prod/g" deploy/helm/values.prod.yaml
-      - sed -i "s/<<APP_PREFIX>>//g" deploy/helm/values.prod.yaml
-      - sed -i "s/<<HOST_PREFIX>>//g" deploy/helm/values.prod.yaml
-      - helm template deploy/helm --values deploy/helm/values.prod.yaml
-      - helm template deploy/helm --values deploy/helm/values.prod.yaml | kubectl --kubeconfig=saas_config apply -f -
+      - cp deploy/helm/values.yaml deploy/helm/values.test.yaml
+      - sed -i "s/<<ENV_TYPE>>/test/g" deploy/helm/values.test.yaml
+      - sed -i "s/<<APP_SUFFIX>>/-stable/g" deploy/helm/values.test.yaml
+      - sed -i "s/<<HOST_PREFIX>>/*/g" deploy/helm/values.test.yaml
+      - helm template deploy/helm --values deploy/helm/values.test.yaml
+      - helm template deploy/helm --values deploy/helm/values.test.yaml | kubectl --kubeconfig=kube_config apply -f -
     when:
       ref:
         include:
@@ -253,9 +237,6 @@ volumes:
   - name: node-modules
     host:
       path: /var/lib/node/${DRONE_REPO_NAME}-node-modules
-  - name: node-modules-docs
-    host:
-      path: /var/lib/node/${DRONE_REPO_NAME}-node-modules-dumi-docs
 
 image_pull_secrets:
   - docker-key
@@ -268,6 +249,12 @@ get:
   name: config
 ---
 kind: secret
+name: infra-k8s-config
+get:
+  path: infra-k8s-config
+  name: config
+---
+kind: secret
 name: ssh-key
 get:
   path: deployer-ssh-key

package/deploy/Dockerfile

@@ -2,13 +2,9 @@ FROM xhj-prod-registry.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/nginx-base
 
 WORKDIR /code/www/deploy/webroot/app/current
 
-COPY build/h5 ./
+COPY build/client ./
 
 COPY deploy/nginx.conf /etc/nginx/conf.d/default.conf
 
 # 拷贝静态文件
 COPY deploy/static ./
-
-# 拷贝docs文档文件
-# https://cloud.tencent.com/developer/ask/sof/108832342
-COPY build/doc[s] ./docs

package/deploy/helm/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $.Values.app }}
-  namespace: {{ include "tpl.namespace" . }}
+  namespace: {{ include "template.namespace" . }}
   annotations:
     kubernetes.io/change-cause: {{ or $.Values.tagContent $.Values.commitSHA }}
 spec:
@@ -35,9 +35,11 @@ spec:
             - name: HOST_PREFIX
               value: "{{ $.Values.hostPrefix }}"
           {{end}}
+          {{- if eq $.Values.targetK8s "saas" }}
           envFrom:
             - configMapRef:
                 name: "app-common-config"
+          {{- end }}
           volumeMounts:
             - mountPath: /var/log/nginx
               subPath: "xfe/{{ $.Values.app }}"

package/deploy/helm/templates/svc.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $.Values.app }}
-  namespace: {{ include "tpl.namespace" . }}
+  namespace: {{ include "template.namespace" . }}
 spec:
   selector:
     app: {{ $.Values.app }}

package/deploy/helm/templates/template.yaml

@@ -0,0 +1,3 @@
+{{- define "template.namespace" -}}
+{{ if not (empty .Values.namespace) }}{{ .Values.namespace }}{{ else }}deployment-{{ .Values.envType }}{{ end }}
+{{- end -}}

package/deploy/helm/templates/virtualService.yaml

@@ -1,34 +1,27 @@
+{{- if .Values.virtualService.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: {{ $.Values.app }}-vs
-  namespace: {{ include "tpl.namespace" . }}
+  name: {{ .Values.app }}-vs
+  namespace: {{ include "template.namespace" . }}
 spec:
   hosts:
-    {{- $host := (get $.Values.hosts $.Values.envType) }}
-    {{- range $host }}
-    - "{{ . }}"
-    {{- end }}
+    {{- $host := (get .Values.virtualService.hosts .Values.envType) }}
+      {{- range $host }}
+      - "{{ . }}"
+      {{- end }}
   gateways:
-    {{- range $.Values.gateways }}
-    - {{ . }}
-    {{- end }}
+    {{- $gateways := .Values.virtualService.gateways }}
+      {{- range $gateways }}
+      - "{{ . }}"
+      {{- end }}
   http:
-    {{ range $.Values.matchRedirect }}
-    - match:
-        - uri:
-            exact: {{ .from }}
-      redirect:
-        uri: {{ .to }}
-        {{- $host := (get $.Values.hosts $.Values.envType) }}
-        authority: "{{ index $host 0 }}"
-    {{- end }}
     - match:
         - uri:
             prefix: /
       route:
         - destination:
-            host: {{ $.Values.app }}
+            host: {{ .Values.app }}
             port:
               number: 80
           corsPolicy:
@@ -36,4 +29,4 @@ spec:
               - "*"
             allowMethods:
               - "*"
----
+{{- end }}

package/deploy/helm/values.yaml

@@ -1,20 +1,20 @@
 imagePullSecret: 'docker-image-cr-pull-vpc'
-app: '<<APP_NAME>><<APP_PREFIX>>'
+app: '<<APP_NAME>><<APP_SUFFIX>>'
 image: 'xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/<<APP_NAME>>:<<CI_COMMIT_SHA>>'
 tagContent: '<<TAG_CONTENT>>'
 commitSHA: '<<CI_COMMIT_SHA>>'
 envType: '<<ENV_TYPE>>'
 hostPrefix: '<<HOST_PREFIX>>'
-hosts:
-  test:
-    - '<<HOST_PREFIX>>.m.t.eshetang.com'
-  stage:
-    - stage.m.t.eshetang.com
-  prod:
-    - m.eshetang.com
-    - m-o.eshetang.com
-gateways:
-  - common-gateway-eshetang
-matchRedirect:
-  - from: /psisdi
-    to: /pages/stock/inventory/stock/detail/index
+namespace: ''
+virtualService:
+  enabled: true
+  hosts:
+    test:
+      - '<<HOST_PREFIX>>.exam.t.eshetang.com'
+    stage:
+      - 'stage.exam.t.eshetang.com'
+    prod:
+      - 'exam.eshetang.com'
+  gateways:
+    - 'common-gateway-eshetang'
+targetK8s: 'saas'

package/deploy/nginx.conf

@@ -17,24 +17,28 @@ server {
 
   set $file /index.html;
 
-  location ^~ /docs {
-    alias /code/www/deploy/webroot/app/current/docs;
-
-    try_files $uri $uri/ $file;
+  # 屏蔽掉map文件
+  location ~ .*\.map {
+    return 404;
   }
 
-  location ~* /static {}
+  location /check-update {
+    add_header Cache-control no-cache;
 
-  location ~* .(png|jpeg|jpg|ico|webp|gif|js|css)$ {}
+    try_files /release =404;
+  }
 
-  # 屏蔽掉map文件
-  location ~ .*\.map {
-    return 404;
+  # 兼容v2版本的静态资源
+  location /v2/static {
+    rewrite /v2(.*) $1 break;
   }
 
   location / {
     try_files $uri $file;
 
+    # 兼容微前端 允许跨域
+    add_header 'Access-Control-Allow-Origin' '*';
+
     add_header Cache-Control no-cache;
     add_header Set-Cookie "apiEnv=${apiEnv}; Max-Age=2626560; Path=/;";
   }

package/deploy/static/9DwhwZ0Iwc.txt

@@ -1 +1 @@
-a20aacdde689e014f54b1812a0a5a320
+a20aacdde689e014f54b1812a0a5a320