コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
be0f73d1bc | ||
|
|
789e8599b3 |
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
|
||||
import { createServer } from 'node:http'
|
||||
import { spawn } from 'node:child_process'
|
||||
import { after, before, test } from 'node:test'
|
||||
import { JSDOM } from 'jsdom'
|
||||
import { createServer as createViteServer } from 'vite'
|
||||
|
||||
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 => {
|
||||
for (const locale of ['ja', 'ain-Kana']) {
|
||||
await t.test (locale, async () => {
|
||||
|
||||
@@ -70,16 +70,6 @@ describe ('SidebarComponent', () => {
|
||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
||||
})
|
||||
|
||||
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
|
||||
renderSidebar ()
|
||||
|
||||
// jsdom has no layout; guard the responsive classes responsible for clipping.
|
||||
const sidebar = screen.getByText ('Sidebar body')
|
||||
|
||||
expect (sidebar).not.toHaveClass ('overflow-y-auto')
|
||||
expect (sidebar).toHaveClass ('md:overflow-y-auto')
|
||||
})
|
||||
|
||||
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||
const onWidthChange = vi.fn ()
|
||||
|
||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
||||
</style>
|
||||
</Helmet>
|
||||
|
||||
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
||||
{children}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
||||
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 { I18nextProvider } from 'react-i18next'
|
||||
import { createStaticHandler, createStaticRouter,
|
||||
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
|
||||
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
||||
import { apiGet, isApiError } from '@/lib/api'
|
||||
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 { withRenderContext } from '@/lib/renderContext.server'
|
||||
|
||||
@@ -171,8 +171,26 @@ export const render = async (
|
||||
}))
|
||||
}
|
||||
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]
|
||||
.map (entry => entry.toString ()).join ('')
|
||||
+ renderToStaticMarkup (<>{alternates}</>)
|
||||
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
||||
query.state.status !== 'pending'
|
||||
&& query.meta?.clientOnly !== true
|
||||
|
||||
@@ -35,10 +35,6 @@ const renderPage = () =>
|
||||
describe ('TagDetailPage', () => {
|
||||
beforeEach (() => {
|
||||
vi.clearAllMocks ()
|
||||
tagsApi.fetchTag.mockReset ()
|
||||
api.apiPut.mockReset ()
|
||||
api.isApiError.mockReset ()
|
||||
toastApi.toast.mockReset ()
|
||||
api.isApiError.mockReturnValue (false)
|
||||
})
|
||||
|
||||
@@ -55,11 +51,8 @@ describe ('TagDetailPage', () => {
|
||||
})
|
||||
|
||||
it ('submits edited tag fields', async () => {
|
||||
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||
tagsApi.fetchTag
|
||||
.mockResolvedValue (updatedTag)
|
||||
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
||||
|
||||
renderPage ()
|
||||
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする