コミットを比較

..
2 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker be0f73d1bc AI: address review on PR #460 2026-11-13 12:39:11 +09:00
Codex Night Worker 789e8599b3 AI: address issue #436 2026-11-12 12:36:14 +09:00
4個のファイルの変更、42行の追加、15行の削除
+21
ファイルの表示
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
import { createServer } from 'node:http' import { createServer } from 'node:http'
import { spawn } from 'node:child_process' import { spawn } from 'node:child_process'
import { after, before, test } from 'node:test' import { after, before, test } from 'node:test'
import { JSDOM } from 'jsdom'
import { createServer as createViteServer } from 'vite' import { createServer as createViteServer } from 'vite'
import { render } from './dist/server/entry-server.js' import { render } from './dist/server/entry-server.js'
@@ -402,6 +403,26 @@ test ('every canonical screen route returns page HTML without JavaScript', async
} }
}) })
test ('SSR HTML head includes reciprocal hreflang links with query parameters', async () => {
for (const locale of ['ja', 'ain-Kana']) {
const response = await fetch (`${httpOrigin}/${locale}/posts?page=2&limit=50`)
assert.equal (response.status, 200)
const dom = new JSDOM (await response.text ())
try
{
const links = [...dom.window.document.head.querySelectorAll ('link[rel="alternate"]')]
assert.deepEqual (links.map (link => ({
locale: link.getAttribute ('hreflang'), href: link.getAttribute ('href') })), [
{ locale: 'ja', href: `${origin}/ja/posts?page=2&limit=50` },
{ locale: 'ain-Kana', href: `${origin}/ain-Kana/posts?page=2&limit=50` }])
}
finally
{
dom.window.close ()
}
}
})
test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => { test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => {
for (const locale of ['ja', 'ain-Kana']) { for (const locale of ['ja', 'ain-Kana']) {
await t.test (locale, async () => { await t.test (locale, async () => {
-12
ファイルの表示
@@ -39,18 +39,6 @@ describe ('TagDetailSidebar', () => {
vi.clearAllMocks () vi.clearAllMocks ()
}) })
it ('inherits the sidebar width saved by the post list', () => {
localStorage.setItem ('sidebar:posts-index-tags:left:width', '320')
const { container } = renderWithProviders (
<TagDetailSidebar post={buildPost ()}/>)
const sidebar = container.querySelector<HTMLElement> (
'[style*="--sidebar-width"]')
expect (sidebar).toBeInTheDocument ()
expect (sidebar?.style.getPropertyValue ('--sidebar-width')).toBe ('320px')
})
it ('keeps internal and external tags with the same numeric id in flat mode', () => { it ('keeps internal and external tags with the same numeric id in flat mode', () => {
setClientTagRelationDisplayMode ('flat') setClientTagRelationDisplayMode ('flat')
+1 -1
ファイルの表示
@@ -378,7 +378,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
}, [baseTags]) }, [baseTags])
return ( return (
<SidebarComponent sidebarKey="posts-index-tags" className={className}> <SidebarComponent sidebarKey="post-detail-tags" className={className}>
<TagSearch/> <TagSearch/>
<DndContext <DndContext
sensors={sensors} sensors={sensors}
+20 -2
ファイルの表示
@@ -1,6 +1,6 @@
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query' import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
import { PassThrough } from 'node:stream' import { PassThrough } from 'node:stream'
import { renderToPipeableStream } from 'react-dom/server' import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
import { HelmetProvider } from 'react-helmet-async' import { HelmetProvider } from 'react-helmet-async'
import { I18nextProvider } from 'react-i18next' import { I18nextProvider } from 'react-i18next'
import { createStaticHandler, createStaticRouter, import { createStaticHandler, createStaticRouter,
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
import { AppFrame, appRoutes, resolvePageRoute } from '@/App' import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
import { apiGet, isApiError } from '@/lib/api' import { apiGet, isApiError } from '@/lib/api'
import { createUII18n } from '@/lib/i18n' import { createUII18n } from '@/lib/i18n'
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales' import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
import { localesKeys, sessionKeys } from '@/lib/queryKeys' import { localesKeys, sessionKeys } from '@/lib/queryKeys'
import { withRenderContext } from '@/lib/renderContext.server' import { withRenderContext } from '@/lib/renderContext.server'
@@ -171,8 +171,26 @@ export const render = async (
})) }))
} }
const helmet = helmetContext.helmet! const helmet = helmetContext.helmet!
const alternates = status === 200 && known != null
? await Promise.all (locales.locales.map (entry => entry.code)
.filter (isLocaleCode)
.filter (code => known.route.handle?.locale == null
|| known.route.handle.locale === code)
.map (async targetLocale => {
const location = { pathname: url.pathname, search: url.search, hash: '' }
const path = targetLocale === locale
? url.pathname + url.search
: (known.route.handle?.switchLocale != null
? await known.route.handle.switchLocale ({
location, params: known.params, locale, targetLocale })
: switchLocalePath (location, targetLocale))
return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
href={new URL (path, origin).href}/>
}))
: []
const head = [helmet.title, helmet.meta, helmet.link, helmet.style] const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
.map (entry => entry.toString ()).join ('') .map (entry => entry.toString ()).join ('')
+ renderToStaticMarkup (<>{alternates}</>)
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query => const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
query.state.status !== 'pending' query.state.status !== 'pending'
&& query.meta?.clientOnly !== true && query.meta?.clientOnly !== true