diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7697cca..d215737 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,12 +57,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: npx release-it --ci - - name: Create PR to sync main to develop + - name: Sync main to develop if: github.ref == 'refs/heads/main' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --base develop --head main \ - --title "chore: sync release from main [skip ci]" \ - --body "Sync release commits from main to develop. [skip ci]" \ - && gh pr merge --merge || true + git fetch origin develop + git checkout develop + git merge main --strategy-option theirs -m "chore: sync release from main [skip ci]" + git push origin develop diff --git a/CHANGELOG.md b/CHANGELOG.md index 18a03cf..e0fcdb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.6.1-beta.2](https://github.com/wireweave/core/compare/v2.6.1-beta.1...v2.6.1-beta.2) (2026-03-09) + +## [2.6.1-beta.1](https://github.com/wireweave/core/compare/v2.6.1-beta.0...v2.6.1-beta.1) (2026-03-08) + +## [2.6.1-beta.0](https://github.com/wireweave/core/compare/v2.6.0...v2.6.1-beta.0) (2026-03-07) + +### Documentation + +* **core:** update dependency table with deployment info ([a44cc6f](https://github.com/wireweave/core/commit/a44cc6fd300d3fb3a38c8e3e1b03b4f0cf95fe0b)) + ## [2.6.0](https://github.com/wireweave/core/compare/v2.6.0-beta.0...v2.6.0) (2026-03-07) ## [2.6.0-beta.0](https://github.com/wireweave/core/compare/v2.5.1...v2.6.0-beta.0) (2026-03-07) diff --git a/CLAUDE.md b/CLAUDE.md index 32da536..9a49da7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -69,14 +69,15 @@ import { parse, renderToHTML, renderToSVG, validate, analyze, diff } from '@wire ## 의존받는 패키지 -| 패키지 | 용도 | 의존 방식 | -|--------|------|-----------| -| `@wireweave/api-server` | 렌더링/분석 서비스 | npm (`^1.3.0`) | -| `@wireweave/language-data` | 언어 메타데이터 제공 | npm (`^1.3.0`) | -| `@wireweave/markdown-plugin` | 마크다운 렌더링 | npm (`^1.3.0`) | -| `@wireweave/ux-rules` | UX 검증 규칙 | npm (`^1.3.0`) | -| `wireweave-vscode` | VSCode 미리보기 | npm (`^1.3.0`) | -| `mcp-dashboard` | 에디터 미리보기 | npm (`^1.3.0`) | +| 패키지 | 용도 | 의존 방식 | 배포 | +|--------|------|-----------|------| +| `@wireweave/api-server` | 렌더링/분석 서비스 | npm (`^2.6.0`) | Vercel (비공개) | +| `@wireweave/markdown-plugin` | 마크다운 렌더링 | npm (`^2.6.0`) | npm (공개) | +| `@wireweave/ux-rules` | UX 검증 규칙 | npm (`^2.6.0`) | npm (공개) | +| `wireweave-vscode` | VSCode 미리보기 | npm (`^2.6.0`) | VSCode Marketplace (공개) | +| `mcp-dashboard` | 에디터/랜딩 | npm (`^2.6.0`) | Vercel (비공개) | +| `admin` | 관리자 대시보드 | npm (`^2.6.0`) | Vercel (비공개) | +| `@wireweave/examples` | 개발용 예제 | npm (`^2.6.0`) | 배포 안 함 (private) | diff --git a/package.json b/package.json index 5a5654d..5598e2f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@wireweave/core", - "version": "2.6.0", + "version": "2.6.1-beta.2", "description": "Core parser and renderer for wireweave", "type": "module", "main": "dist/index.js",