From d8564f1f86939f94ffb127a5f150e1d5b5fed627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E6=80=9D=E5=85=94?= Date: Mon, 9 Nov 2026 01:29:09 +0900 Subject: [PATCH 1/3] fix(deps): remove vulnerable email merge dependency - Upgrade direct and bundled email renderers to 2.2.0. - Cover HTML escaping and plain-text compatibility. --- apps/landing/src/config/projects/building.ts | 2 +- apps/personal-email/README.md | 10 ++ apps/personal-email/package.json | 5 +- .../scripts/renderSecurity.test.mjs | 37 ++++ pnpm-lock.yaml | 158 ++++++++---------- pnpm-workspace.yaml | 1 + 6 files changed, 126 insertions(+), 87 deletions(-) create mode 100644 apps/personal-email/scripts/renderSecurity.test.mjs diff --git a/apps/landing/src/config/projects/building.ts b/apps/landing/src/config/projects/building.ts index fd217503..571265c5 100644 --- a/apps/landing/src/config/projects/building.ts +++ b/apps/landing/src/config/projects/building.ts @@ -126,7 +126,7 @@ export const buildingProjectEntries = [ { title: "Personal Email", path: "apps/personal-email", - updatedAt: "2026-10-24T17:14:25Z", + updatedAt: "2026-11-08T16:31:59Z", summary: "React Email templates and local scripts for rendering, selecting, and delivering personal mail.", label: "Local tool", diff --git a/apps/personal-email/README.md b/apps/personal-email/README.md index 114cfd1b..68bea1c3 100644 --- a/apps/personal-email/README.md +++ b/apps/personal-email/README.md @@ -79,6 +79,16 @@ EMAIL_TEMPLATE=reset_password TO_NAME=李四 MAIL_TO=foo@example.com pnpm run se - 模板字符串支持占位符 `{{name}}` 等,脚本会在渲染前替换它们。 - `brandDefaults` 用于统一公司名称、logo、主色和页脚文本,修改此处可改变全局样式。 +验证命令(从仓库根目录运行): + +```bash +pnpm --filter personal_email check +pnpm --filter personal_email render:all +``` + +`check` 包含 lint、类型检查以及 HTML 转义、纯文本和两种渲染入口的回归测试。 + 扩展提示 + - 若需要更复杂的内容(如表格、多行项目),在 `TemplateRenderer.tsx` 中扩展渲染逻辑或创建新的模板组件,仍然使用 `EmailLayout` 以保持一致样式。 diff --git a/apps/personal-email/package.json b/apps/personal-email/package.json index 2a42dd3e..2c055241 100644 --- a/apps/personal-email/package.json +++ b/apps/personal-email/package.json @@ -6,7 +6,8 @@ "type": "module", "scripts": { "build": "pnpm run build:ts", - "check": "pnpm lint && pnpm typecheck", + "check": "pnpm lint && pnpm typecheck && pnpm test:render", + "test:render": "node --test scripts/renderSecurity.test.mjs", "render:email": "pnpm run build:ts && node dist/scripts/renderEmail.js", "render:all": "pnpm run build:ts && node dist/scripts/renderAll.js", "email": "pnpm run build:ts && node dist/scripts/cli.js", @@ -20,7 +21,7 @@ }, "dependencies": { "@react-email/components": "1.0.10", - "@react-email/render": "^2.0.0", + "@react-email/render": "^2.2.0", "dotenv": "^16.0.0", "nodemailer": "^10.1.4", "prompts": "^2.4.2", diff --git a/apps/personal-email/scripts/renderSecurity.test.mjs b/apps/personal-email/scripts/renderSecurity.test.mjs new file mode 100644 index 00000000..3fcf2f1c --- /dev/null +++ b/apps/personal-email/scripts/renderSecurity.test.mjs @@ -0,0 +1,37 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; + +import { render as renderComponents, toPlainText as componentsToPlainText } from '@react-email/components'; +import { render, toPlainText } from '@react-email/render'; +import { createElement } from 'react'; + +test('direct and component renderers preserve HTML escaping and plain text', async () => { + const name = '示例用户 & test'; + const email = createElement('p', null, name); + const html = await render(email); + + assert.equal(await renderComponents(email), html); + assert.ok(!html.includes('