feat: 发布 v0.4.0 桌面端

2026-07-27 20:56:39 +08:00
parent 92a5bfd016
commit 4d60741f5a
90 changed files with 10431 additions and 223 deletions
@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:1

+ARG RUNTIME_BASE_IMAGE=node:22-bookworm-slim
+
 FROM node:22-bookworm-slim AS build

 WORKDIR /app
@@ -9,6 +11,7 @@ COPY package.json package-lock.json ./
 COPY apps/server/package.json apps/server/package.json
 COPY apps/web/package.json apps/web/package.json
 COPY packages/core/package.json packages/core/package.json
+COPY packages/application/package.json packages/application/package.json
 COPY packages/markdown-echarts/package.json packages/markdown-echarts/package.json
 COPY packages/renderer/package.json packages/renderer/package.json
 RUN npm ci
@@ -16,7 +19,13 @@ RUN npm ci
 COPY tsconfig.base.json ./
 COPY apps ./apps
 COPY packages ./packages
-RUN npm run build
+COPY logos ./logos
+RUN npm run build -w @md-to-pdf/markdown-echarts \
+    && npm run build -w @md-to-pdf/core \
+    && npm run build -w @md-to-pdf/renderer \
+    && npm run build -w @md-to-pdf/application \
+    && npm run build -w @md-to-pdf/web \
+    && npm run build -w @md-to-pdf/server

 FROM node:22-bookworm-slim AS production-dependencies

@@ -27,21 +36,28 @@ COPY package.json package-lock.json ./
 COPY apps/server/package.json apps/server/package.json
 COPY apps/web/package.json apps/web/package.json
 COPY packages/core/package.json packages/core/package.json
+COPY packages/application/package.json packages/application/package.json
 COPY packages/markdown-echarts/package.json packages/markdown-echarts/package.json
 COPY packages/renderer/package.json packages/renderer/package.json
 RUN npm ci --omit=dev --workspace @md-to-pdf/server --include-workspace-root

-FROM node:22-bookworm-slim AS runtime
+FROM ${RUNTIME_BASE_IMAGE} AS runtime

 USER root
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      nginx \
-      fonts-noto-cjk \
-      fonts-noto-color-emoji \
-    && rm -rf /var/lib/apt/lists/* \
-    && groupadd --system pwuser \
-    && useradd --system --create-home --gid pwuser --shell /bin/bash pwuser
+ARG RUNTIME_BASE_IMAGE
+ARG REUSE_PLAYWRIGHT_RUNTIME=0
+RUN if [ "${REUSE_PLAYWRIGHT_RUNTIME}" = "1" ]; then \
+      echo "Reusing the Playwright runtime from ${RUNTIME_BASE_IMAGE}"; \
+    else \
+      apt-get update \
+      && apt-get install -y --no-install-recommends \
+        nginx \
+        fonts-noto-cjk \
+        fonts-noto-color-emoji \
+      && rm -rf /var/lib/apt/lists/* \
+      && groupadd --system pwuser \
+      && useradd --system --create-home --gid pwuser --shell /bin/bash pwuser; \
+    fi

 WORKDIR /app

@@ -49,16 +65,23 @@ COPY --chown=pwuser:pwuser package.json package-lock.json ./
 COPY --chown=pwuser:pwuser apps/server/package.json apps/server/package.json
 COPY --chown=pwuser:pwuser apps/web/package.json apps/web/package.json
 COPY --chown=pwuser:pwuser packages/core/package.json packages/core/package.json
+COPY --chown=pwuser:pwuser packages/application/package.json packages/application/package.json
 COPY --chown=pwuser:pwuser packages/markdown-echarts/package.json packages/markdown-echarts/package.json
 COPY --chown=pwuser:pwuser packages/renderer/package.json packages/renderer/package.json
 COPY --chown=pwuser:pwuser --from=production-dependencies /app/node_modules ./node_modules
 ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
-RUN npx playwright install --with-deps chromium \
+RUN if [ "${REUSE_PLAYWRIGHT_RUNTIME}" = "1" ]; then \
+      test -x /ms-playwright/chromium-*/chrome-linux/chrome \
+      || test -x /ms-playwright/chromium-*/chrome-linux64/chrome; \
+    else \
+      npx playwright install --with-deps chromium; \
+    fi \
    && chown -R pwuser:pwuser /ms-playwright

 COPY --chown=pwuser:pwuser --from=build /app/apps/server/dist ./apps/server/dist
 COPY --chown=pwuser:pwuser --from=build /app/apps/web/dist ./apps/web/dist
 COPY --chown=pwuser:pwuser --from=build /app/packages/core/dist ./packages/core/dist
+COPY --chown=pwuser:pwuser --from=build /app/packages/application/dist ./packages/application/dist
 COPY --chown=pwuser:pwuser --from=build /app/packages/markdown-echarts/dist ./packages/markdown-echarts/dist
 COPY --chown=pwuser:pwuser --from=build /app/packages/renderer/dist ./packages/renderer/dist
 COPY --chown=pwuser:pwuser themes ./themes
@@ -2,9 +2,11 @@
 .github
 .local
 .vscode
+apps/desktop
 coverage
 dist
 node_modules
+out
 output
 playwright-report
 test-results
@@ -34,13 +34,27 @@ docker compose -f deploy\compose.yaml down

 ## 构建发布标签

-本地验证完成后，可以为镜像增加发布标签：
+可以直接指定版本化镜像名称构建：

 ```powershell
-docker tag md-to-pdf:local yixiong/md-to-pdf:v0.1.0
+$env:MD_TO_PDF_IMAGE = 'yixiong/md-to-pdf:v0.4.0'
+docker compose -f deploy\compose.yaml build
 ```

-该命令只创建本地标签，不会自动推送到镜像仓库。
+该命令只生成本地镜像，不会自动推送到镜像仓库。
+
+默认构建会安装项目锁定版本的 Playwright Chromium 及系统依赖。如果本机
+已经保留同版本系列的已验证镜像，可在内网或软件源较慢时复用其运行层：
+
+```powershell
+$env:MD_TO_PDF_IMAGE = 'yixiong/md-to-pdf:v0.4.0'
+$env:MD_TO_PDF_RUNTIME_BASE_IMAGE = 'yixiong/md-to-pdf:v0.3.1'
+$env:MD_TO_PDF_REUSE_PLAYWRIGHT_RUNTIME = '1'
+docker compose -f deploy\compose.yaml build
+```
+
+复用模式会校验基础镜像中存在 Chromium，再覆盖 v0.4.0 应用代码和生产
+依赖。正式跨机器构建仍建议使用默认完整路径。

 ## 主题挂载

@@ -55,13 +69,17 @@ docker compose -f deploy\compose.yaml up -d
 目录下每套主题都应包含 `theme.json`。主题规范详见
 [`docs/THEMES.md`](../docs/THEMES.md)。

-本机通过导入工具生成的 Typora 主题不会复制进镜像；只有显式挂载后，
-容器才会读取这些本机文件。
+从 v0.4.0 起，公司内部私有版本已内置 GitHub、Pixyll 和 Whitey 三套
+Typora 默认主题；挂载目录仍可用于本机扩展主题。内置主题与挂载主题 ID
+重复时以内置版本为准。

 ## 运行参数

 | 环境变量 | 默认值 | 说明 |
 | --- | ---: | --- |
+| `MD_TO_PDF_IMAGE` | `md-to-pdf:local` | 构建和运行的镜像标签 |
+| `MD_TO_PDF_RUNTIME_BASE_IMAGE` | `node:22-bookworm-slim` | 可选运行时基础镜像 |
+| `MD_TO_PDF_REUSE_PLAYWRIGHT_RUNTIME` | `0` | 是否复用基础镜像中的 Chromium |
 | `MD_TO_PDF_PORT` | `8080` | 宿主机监听端口 |
 | `MD_TO_PDF_THEME_DIR` | `../.local/themes` | 宿主机主题目录 |
 | `PDF_CONCURRENCY` | `1` | 同时执行的 PDF 任务数 |
@@ -5,6 +5,9 @@ services:
    build:
      context: ..
      dockerfile: deploy/Dockerfile
+      args:
+        RUNTIME_BASE_IMAGE: ${MD_TO_PDF_RUNTIME_BASE_IMAGE:-node:22-bookworm-slim}
+        REUSE_PLAYWRIGHT_RUNTIME: ${MD_TO_PDF_REUSE_PLAYWRIGHT_RUNTIME:-0}
    image: "${MD_TO_PDF_IMAGE:-md-to-pdf:local}"
    init: true
    ports: