From b63139b5ae346a9746577224b1f753bacabdd3be Mon Sep 17 00:00:00 2001 From: zpc Date: Sun, 29 Mar 2026 22:05:51 +0800 Subject: [PATCH] 21 --- .drone.yml | 2 ++ admin/Dockerfile | 10 +++++----- admin/package.json | 3 ++- admin/vite.config.ts | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 299a2f8..79587da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,6 +52,8 @@ steps: tags: - latest - ${DRONE_COMMIT_SHA:0:8} + cache_from: + - 192.168.195.25:19900/xiangyixiangqin/admin-web:latest username: from_secret: harbor_username password: diff --git a/admin/Dockerfile b/admin/Dockerfile index 07c1b55..b7c18a0 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -3,13 +3,13 @@ FROM 192.168.195.25:19900/library/node:20-alpine AS build WORKDIR /app -# 复制 package 文件 -COPY package*.json ./ +# 先复制依赖文件,利用 Docker 层缓存 +COPY package.json package-lock.json ./ -# 删除 lock 文件并重新安装 -RUN rm -f package-lock.json && npm install +# 设置淘宝镜像源加速下载,使用 npm ci 严格按 lock 文件安装 +RUN npm config set registry https://registry.npmmirror.com && npm ci -# 复制源代码 +# 再复制源代码(依赖没变时上面的层会命中缓存) COPY . . # 构建应用 diff --git a/admin/package.json b/admin/package.json index 5af7cb9..a2cd063 100644 --- a/admin/package.json +++ b/admin/package.json @@ -5,7 +5,8 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vue-tsc -b && vite build", + "build": "vite build", + "build:check": "vue-tsc -b && vite build", "preview": "vite preview", "lint": "eslint . --fix", "format": "prettier --write src/", diff --git a/admin/vite.config.ts b/admin/vite.config.ts index 087ed7f..677455b 100644 --- a/admin/vite.config.ts +++ b/admin/vite.config.ts @@ -50,6 +50,7 @@ export default defineConfig(({ mode }) => { css: { preprocessorOptions: { scss: { + api: 'modern-compiler', additionalData: `@use "@/assets/styles/variables.scss" as *;` } }