From 46119eacb5b50383d9c77e7e6b1beb86b786e58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=88=98=ED=98=84?= Date: Wed, 21 Oct 2026 06:14:40 +0900 Subject: [PATCH] test(sw): move approvedMainCommit to the reviewed merge b4e0771 The merge of fix/test-home-menu-integration carries only approved SW changes (shared roving focus / outside pointer helpers, Firefox line-values grid); no Story change, public API unchanged (public-api.approved.json kept). Guards: overview 54/54, overlays 20/20, unused 93/93, dropdown 228/228, stage1 41/41, home menu 23/23, public API 7/7. --- docs/sw/sw-unattended-followup-2026-10-21.md | 22 ++++++++++++++++++++ packages/sw/tests/storybook-inventory.mjs | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/docs/sw/sw-unattended-followup-2026-10-21.md b/docs/sw/sw-unattended-followup-2026-10-21.md index 73b170b..0c9a331 100644 --- a/docs/sw/sw-unattended-followup-2026-10-21.md +++ b/docs/sw/sw-unattended-followup-2026-10-21.md @@ -208,3 +208,25 @@ | `0f9e9b0` | test(sw): cover roving focus wrap and outside pointer dismissal | `keyboard-dismiss.browser.mjs`, `fixtures/tool-group.tsx` | `dropdown-consolidation`·`storybook-cleanup-stage1`의 정렬 수정은 `source-changes.mjs`를 쓰므로 가드 Commit을 먼저 두었습니다. `storybook-unused-removal`은 가드 부분과 주석을 나눠 Stage했습니다. 기존 미추적 16개(`.claude/launch.json`, `docs/sw/home-menu-*-qa-2026-10-19/*.png` 15개)는 Commit하지 않았습니다. + +## 12. main 병합과 승인 기준 갱신 (2026-10-21, Node 20.20.1) + +기준선 문서 §9 절차를 따랐습니다. + +1. 승인 범위: 사용자 최종 마무리 요청이 §11.3 Commit의 main 통합을 승인했습니다. 병합 결과 `553e4df..b4e0771`의 제품 변경은 `packages/sw/src`의 11개(§4 중복 개선 10개 + `sw.css`)뿐이며 다른 패키지·`src/`(Story)·`.storybook`·루트 `package.json`은 바뀌지 않았습니다. Story 추가·삭제·이동·태그 변경이 없어 승인 목록(§8)은 갱신하지 않았습니다. +2. 병합: 원격 main은 `553e4df`(변경 없음)였고 feature의 조상이라 병합 결과 Tree는 feature(`c89407a`)와 같습니다. 병합 Commit `b4e0771dd02304b6bb2a95318bc5b8c1b10c2303`(부모 `553e4df`, `c89407a`). 제품 Tree가 같아 §7 제품 회귀·Storybook build 결과를 재사용했습니다. +3. 병합 직후(기준 `553e4df` 그대로) `storybook-unused-removal` 92/93: 위 5개 파일만 검출 → 미승인 파일 없음 확인. +4. 테스트 전용 Commit에서 `approvedMainCommit`을 `b4e0771…`로 옮겼습니다(`storybook-inventory.mjs`, 보호 경로 밖). `public-api.approved.json`은 공개 API가 바뀌지 않아 그대로입니다(기준 `553e4df`는 새 `approvedMainCommit`의 조상). +5. 갱신 후 실행 결과: + +| 검사 | 결과 | +|---|---| +| `public-api.check.mjs` | 7/7 | +| overview / overlays | 54/54 / 20/20 | +| storybook-unused-removal | 93/93 | +| dropdown-consolidation | 228/228 | +| storybook-cleanup-stage1 | 41/41 | +| home-menu-integration | 23/23 | +| 변조: `SWFooterParts.tsx` 수정 + 미추적 `components/shared/tamper-probe.ts` (overview) | FAIL 1 — 두 파일만 검출, 원복 후 `git diff` 없음 | + +Storybook 재build는 하지 않았습니다(제품·Story·`.storybook` Tree가 `storybook-static` build 시점과 같음). diff --git a/packages/sw/tests/storybook-inventory.mjs b/packages/sw/tests/storybook-inventory.mjs index 3fbd0fc..1f076f8 100644 --- a/packages/sw/tests/storybook-inventory.mjs +++ b/packages/sw/tests/storybook-inventory.mjs @@ -51,7 +51,9 @@ export const integratedChangedFiles = [ // Never move it to make a failing check pass, and never to a commit that carries unreviewed Story or source changes. // A new main HEAD alone is no reason to move it: no script or workflow updates it automatically; it changes only in a // reviewed test-only commit (docs/sw/sw-test-regression-baseline-2026-10-20.md §9). -export const approvedMainCommit = '553e4df4a865aaf6514b1c2b86cb2e3e9a658e5f' +// History: 553e4df (Merge feature/sw-package) -> b4e0771 (2026-10-21, Merge fix/test-home-menu-integration: approved +// shared roving focus / outside pointer helpers and the Firefox line-values grid; no Story change, public API unchanged). +export const approvedMainCommit = 'b4e0771dd02304b6bb2a95318bc5b8c1b10c2303' // 170a5c2: the SW/Header sidebar page of the home menu (the moved verification Stories are movedHomeMenuIds). export const homeMenuSidebarIds = ['sw-header--home-menu'] // 6cf8854 SW Footer (current IDs after retiredFooterIds), 7f42923 viewer mode, 41e963a theme inheritance.