@dazhicheng/common 1.0.32 → 1.0.35

package/.gitlab-ci.yml

@@ -23,17 +23,27 @@ variables:
     paths:
       - dist/
       - nginx_*.conf
+      - docker-entrypoint.sh
+      - Dockerfile
     expire_in: 1 day
 
 # 部署锚点（通用脚本直接写在这里，不需要项目覆盖） -------------------------
+# 使用 named volume 持久化静态资源：发版时合并新构建并保留旧 hashed 文件，
+# 使已打开的旧页面仍能懒加载到旧入口资源。
 .deploy_template: &deploy_template
   stage: deploy
   image: docker:26.1.4
   script:
+    - docker volume create ${IMAGE_NAME}-assets || true
     - docker build --build-arg NODE_ENV=$NODE_ENV -t $IMAGE_NAME:latest .
     - docker stop $IMAGE_NAME || true
     - docker rm $IMAGE_NAME || true
-    - docker run -d --name $IMAGE_NAME --restart always -p $HOST_PORT:$CONTAINER_PORT $IMAGE_NAME:latest
+    - >
+      docker run -d --name $IMAGE_NAME --restart always
+      -p $HOST_PORT:$CONTAINER_PORT
+      -v ${IMAGE_NAME}-assets:/usr/share/nginx/html
+      -e ASSET_RETENTION_DAYS=14
+      $IMAGE_NAME:latest
     - docker image prune -f || true
 
 # MR 验证 -----------------------------------------------------------------
@@ -42,7 +52,7 @@ variables:
   variables:
     NODE_ENV: dev
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "test" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "release" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "sit")
 
 MR 构建验证:
   stage: MR_TEST
@@ -53,7 +63,7 @@ MR 构建验证:
     - docker build --build-arg NODE_ENV=dev -t mr-test:mr-$CI_MERGE_REQUEST_IID .
     - docker images | grep mr-test
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "test" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "release" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "sit")
 
 # 项目级 deploy jobs 注入点 ------------------------------------------------
 构建_dev:
@@ -109,4 +119,4 @@ MR 构建验证:
     NODE_ENV: test
     <<<测试环境发版_107>>>
   only: [test]
-<<<deploy_jobs>>>
+<<<deploy_jobs>>>

package/Dockerfile

@@ -1,6 +1,9 @@
-
 FROM nginx:stable
 ARG NODE_ENV=dev
 COPY "nginx_${NODE_ENV}.conf" /etc/nginx/conf.d/default.conf
-COPY dist/ /usr/share/nginx/html
-CMD ["nginx", "-g", "daemon off;"]
+# 构建产物放到镜像内固定目录；运行时由 entrypoint 合并到持久卷，保留历史 hashed 资源
+COPY dist/ /app/dist/
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

package/docker-entrypoint.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+HTML_ROOT=/usr/share/nginx/html
+DIST_ROOT=/app/dist
+# 保留最近 N 天的历史 hashed 资源，供已打开旧页面继续懒加载
+ASSET_RETENTION_DAYS="${ASSET_RETENTION_DAYS:-14}"
+
+mkdir -p "$HTML_ROOT"
+
+# 合并拷贝：覆盖同名文件（如 index.html），保留卷中已有、本次构建不含的旧 chunk
+if [ -d "$DIST_ROOT" ]; then
+  cp -a "$DIST_ROOT"/. "$HTML_ROOT"/
+fi
+
+# 清理过期静态资源，避免磁盘无限增长（不影响未过期的旧入口）
+if [ -d "$HTML_ROOT/assets" ]; then
+  find "$HTML_ROOT/assets" -type f -mtime "+${ASSET_RETENTION_DAYS}" -delete 2>/dev/null || true
+fi
+
+exec "$@"

package/nginx_dev.conf

@@ -28,9 +28,40 @@ server {
   root /usr/share/nginx/html;
   index index.html;
 
+  # 带 hash 的构建资源：长缓存；缺失时返回 404（禁止回退成 index.html，避免把 HTML 当 JS）
+  location /assets/ {
+    try_files $uri =404;
+    expires 1y;
+    add_header Cache-Control "public, max-age=31536000, immutable" always;
+
+    # CORS 配置
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;    
+    <<<assets_CORS配置>>>
+    gzip_static on;
+  }
+
+  # 入口 HTML：禁止缓存，确保新开/刷新拿到最新入口
+  location = /index.html {
+    add_header Cache-Control "no-cache, no-store, must-revalidate" always;
+    add_header Pragma "no-cache" always;
+    add_header Expires "0" always;
+
+    # CORS 配置
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+    <<<index_html_CORS配置>>>
+  }
+
   location / {
     try_files $uri $uri/ /index.html;
-    <<<CORS配置>>>
+    add_header Cache-Control "no-cache" always;
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+    <<<index_CORS配置>>>
   }
 
   location /dev-api/ {

package/nginx_test.conf

@@ -27,9 +27,42 @@ server {
   root /usr/share/nginx/html;
   index index.html;
 
+  # 带 hash 的构建资源：长缓存；缺失时返回 404（禁止回退成 index.html，避免把 HTML 当 JS）
+  location /assets/ {
+    try_files $uri =404;
+    expires 1y;
+    add_header Cache-Control "public, max-age=31536000, immutable" always;
+
+    # CORS 配置
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+    <<<assets_CORS配置>>>
+    gzip_static on;
+  }
+
+  # 入口 HTML：禁止缓存，确保新开/刷新拿到最新入口
+  location = /index.html {
+    add_header Cache-Control "no-cache, no-store, must-revalidate" always;
+    add_header Pragma "no-cache" always;
+    add_header Expires "0" always;
+
+    # CORS 配置
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+    <<<index_html_CORS配置>>>
+  }
+
   location / {
     try_files $uri $uri/ /index.html;
-    <<<CORS配置>>>
+    add_header Cache-Control "no-cache" always;
+
+    # CORS 配置
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+    <<<index_CORS配置>>>
   }
 
   location /test-api/ {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.32",
+  "version": "1.0.35",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",
@@ -24,6 +24,7 @@
     "eslint.config.mjs.txt",
     "tsconfig.json",
     "Dockerfile",
+    "docker-entrypoint.sh",
     "nginx_dev.conf",
     "nginx_test.conf",
     "sync-common.mjs",

package/sync-common.mjs

@@ -26,6 +26,7 @@ const defaultManagedFiles = [
   ".gitlab-ci.yml.txt",
   "pnpm-workspace.yaml",
   "Dockerfile",
+  "docker-entrypoint.sh",
   { name: "eslint.config.mjs.txt" },
   "tsconfig.json",
   { name: "nginx_dev.conf" },