Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .claude/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
},
"sandbox": {
"enabled": true,
"excludedCommands": ["git"],
"autoAllowBashIfSandboxed": false,
"network": {
"allowLocalBinding": true
Expand Down
59 changes: 59 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# https://docs.github.com/ja/code-security/dependabot/working-with-dependabot/dependabot-options-reference

version: 2
updates:
# root npm(pnpm)の依存関係
- package-ecosystem: 'npm' # pnpmでもnpmと書く
directory: '/'
schedule:
interval: 'monthly'
cooldown:
default-days: 1
open-pull-requests-limit: 2
groups:
dev-dependencies:
dependency-type: 'development'
patterns:
- '*'
production-dependencies:
dependency-type: 'production'
patterns:
- '*'
commit-message:
prefix: 'chore'
prefix-development: 'chore'
include: 'scope'
labels:
- 'dependencies'
- 'automated'
allow:
- dependency-type: 'all'
assignees:
- 'cm-dyoshikawa'
- 'cm-igarashi-ryosuke'
- 'cm-wada-yusuke'

# GitHub Actionsの依存関係
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'monthly'
cooldown:
default-days: 1
open-pull-requests-limit: 1
groups:
all-actions:
patterns:
- '*'
commit-message:
prefix: 'chore'
include: 'scope'
labels:
- 'automated'
- 'dependencies'
allow:
- dependency-type: 'all'
assignees:
- 'cm-dyoshikawa'
- 'cm-igarashi-ryosuke'
- 'cm-wada-yusuke'
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5

- uses: pnpm/action-setup@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v5

- uses: pnpm/action-setup@v4
with:
version: 10.18.3

- name: Setup node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
cache: 'pnpm'
node-version: 24
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- name: '[main] Create release'
if: github.ref_name == 'main'
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@v6
with:
version: ${{ env.RELEASED_PACKAGE_VERSION }}
name: ${{ env.RELEASED_PACKAGE_VERSION }}
Expand All @@ -82,7 +82,7 @@ jobs:

- name: '[canary] Create release'
if: github.ref_name == 'canary'
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@v6
with:
version: ${{ env.RELEASED_PACKAGE_VERSION }}
name: ${{ env.RELEASED_PACKAGE_VERSION }}
Expand All @@ -106,7 +106,7 @@ jobs:

- name: '[main] Checkout'
if: github.ref_name == 'main'
uses: actions/checkout@v2
uses: actions/checkout@v5
with:
ref: canary

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5

- uses: pnpm/action-setup@v4
with:
Expand Down
18 changes: 10 additions & 8 deletions .rulesync/commands/release-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ targets:
- '*'
---

1. 最新のリポジトリのリリースバージョンを取得します。patchバージョンを+1して今回リリースするバージョンとし、new_versionと呼称します。
2. 前回のリリースPRより後にマージされたPRのURL(`https://github.com/zenn-dev/zenn-editor/pull/{pr_number}`)をすべて取得します。
1. リポジトリの最新のリリースバージョンを取得します(Pre-release ではなく Latest release を取得)。patchバージョンを+1して今回リリースするバージョンとし、new_versionと呼称します。
2. 前回のリリースPR(titleが `release {previous_version}` になっている)より後にマージされたPRのURL(`https://github.com/zenn-dev/zenn-editor/pull/{pr_number}`)をすべて取得します。
3. 以下の内容でPRを作成します。参考: https://github.com/zenn-dev/zenn-editor/pull/561
- canaryブランチ to mainブランチ
- title: `release {new_version}`
- description:
```md
changes:
- {pr_url1}
- {pr_url2}
- ...
```
- 以下の内容のみ。 @.github/PULL_REQUEST_TEMPLATE.md の内容は無視してください。
```md
changes:
- {pr_url1}
- {pr_url2}
- ...
```
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"packages": [
"packages/*"
],
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"npmClient": "pnpm"
}
6 changes: 3 additions & 3 deletions packages/zenn-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenn-cli",
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"description": "Preview Zenn content locally.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -41,7 +41,7 @@
"@types/configstore": "^6.0.2",
"@types/connect-history-api-fallback": "^1.5.4",
"@types/emoji-regex": "^9.2.2",
"@types/express": "^4.17.21",
"@types/express": "^5.0.3",
"@types/fs-extra": "^11.0.4",
"@types/js-yaml": "^4.0.9",
"@types/node": "^24.9.1",
Expand All @@ -67,7 +67,7 @@
"esbuild-register": "^3.6.0",
"eslint": "^9.38.0",
"eslint-config-prettier": "^10.1.8",
"express": "^4.21.2",
"express": "^5.1.0",
"fs-extra": "^11.3.2",
"gray-matter": "^4.0.3",
"history": "^5.3.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/zenn-cli/src/server/app.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import express from 'express';
import express, { RequestHandler } from 'express';
import path from 'path';
import history from 'connect-history-api-fallback';
import { getArticle, getArticles } from './api/articles';
Expand All @@ -20,15 +20,15 @@ export function createApp() {
app.get(`/api/cli-version`, getCliVersion);
app.get(`/api/local-info`, getLocalInfo);

app.get('/images/*', (req, res) => {
app.get('/images/*splat', (req, res) => {
// `zenn preview`を起動したディレクトリ直下にあるimagesディレクトリを参照する
// URLエンコードされた文字(%20など)をデコード
const decodedPath = decodeURIComponent(req.path);
res.sendFile(getWorkingPath(decodedPath));
});

// serve static files built by vite
app.use(history()); // required to directly access non-root pages such as /guide, /articles/foo
app.use(history() as unknown as RequestHandler); // required to directly access non-root pages such as /guide, /articles/foo

app.use(
express.static(path.join(__dirname, '../client'), {
Expand Down
2 changes: 1 addition & 1 deletion packages/zenn-content-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenn-content-css",
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"license": "MIT",
"description": "Zenn flavor content style.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/zenn-embed-elements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenn-embed-elements",
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"license": "MIT",
"description": "Web components for embedded contents.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/zenn-markdown-html/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenn-markdown-html",
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"license": "MIT",
"description": "Convert markdown to zenn flavor html.",
"main": "lib/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/zenn-model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenn-model",
"version": "0.2.6",
"version": "0.2.7-alpha.3",
"license": "MIT",
"description": "Model utils for Zenn contents",
"main": "lib/index.js",
Expand Down
Loading
Loading