コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
9cba244d10 |
+2
-2
@@ -6,8 +6,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc -b && npm run build:client && npm run build:server",
|
"build": "tsc -b && npm run build:client && npm run build:server",
|
||||||
"build:client": "vite build --outDir dist/client",
|
"build:client": "NODE_ENV=production vite build --outDir dist/client",
|
||||||
"build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server",
|
"build:server": "NODE_ENV=production vite build --ssr src/entry-server.tsx --outDir dist/server",
|
||||||
"start": "node server.mjs",
|
"start": "node server.mjs",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"test": "vitest",
|
"test": "vitest",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { spawn } from 'node:child_process'
|
|||||||
import { after, before, test } from 'node:test'
|
import { after, before, test } from 'node:test'
|
||||||
import { createServer as createViteServer } from 'vite'
|
import { createServer as createViteServer } from 'vite'
|
||||||
|
|
||||||
import { render } from './dist/server/entry-server.js'
|
import { render, renderSitemap } from './dist/server/entry-server.js'
|
||||||
|
|
||||||
const origin = 'https://ssr.example.invalid'
|
const origin = 'https://ssr.example.invalid'
|
||||||
const date = '2026-09-15T00:00:00+09:00'
|
const date = '2026-09-15T00:00:00+09:00'
|
||||||
@@ -366,6 +366,15 @@ test ('counts SSR renders the shell without result requests or embedded results'
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test ('noindex theatre routes are absent from sitemap', async () => {
|
||||||
|
const start = requests.length
|
||||||
|
const result = await renderSitemap ('/sitemap-ja-theatres-1.xml', origin, apiURL)
|
||||||
|
const calls = requests.slice (start).map (request => new URL (request.url, origin))
|
||||||
|
|
||||||
|
assert.equal (result.status, 404)
|
||||||
|
assert.equal (calls.some (url => url.pathname === '/sitemap_entries/theatres'), false)
|
||||||
|
})
|
||||||
|
|
||||||
test ('every canonical screen route returns page HTML without JavaScript', async t => {
|
test ('every canonical screen route returns page HTML without JavaScript', async t => {
|
||||||
const cookie = await authenticatedCookie ()
|
const cookie = await authenticatedCookie ()
|
||||||
for (const route of routes) {
|
for (const route of routes) {
|
||||||
@@ -393,7 +402,10 @@ test ('every canonical screen route returns page HTML without JavaScript', async
|
|||||||
if (route.path === 'posts/:id')
|
if (route.path === 'posts/:id')
|
||||||
assert.match (result.head, new RegExp (`SSR post ${locale}`))
|
assert.match (result.head, new RegExp (`SSR post ${locale}`))
|
||||||
if (route.path === 'theatres/:id')
|
if (route.path === 'theatres/:id')
|
||||||
|
{
|
||||||
assert.match (result.html.replace (/<[^>]*>/g, ''), /SSR[ ]theatre/)
|
assert.match (result.html.replace (/<[^>]*>/g, ''), /SSR[ ]theatre/)
|
||||||
|
assert.equal (route.handle?.robots, 'noindex')
|
||||||
|
}
|
||||||
if (route.path === 'wiki' || route.path === 'wiki/:title')
|
if (route.path === 'wiki' || route.path === 'wiki/:title')
|
||||||
assert.match (result.html, new RegExp (`SSR wiki body ${locale}|SSR`))
|
assert.match (result.html, new RegExp (`SSR wiki body ${locale}|SSR`))
|
||||||
assert.doesNotMatch (result.html, /Switched to client rendering|template id="B:/)
|
assert.doesNotMatch (result.html, /Switched to client rendering|template id="B:/)
|
||||||
|
|||||||
+2
-1
@@ -152,7 +152,8 @@ export const pageRoutes = (
|
|||||||
{ path: 'tags/changes', element: <TagHistoryPage/>,
|
{ path: 'tags/changes', element: <TagHistoryPage/>,
|
||||||
handle: { preload: TagHistoryPage.preload } },
|
handle: { preload: TagHistoryPage.preload } },
|
||||||
{ path: 'theatres/:id', element: <TheatreDetailPage user={user}/>,
|
{ path: 'theatres/:id', element: <TheatreDetailPage user={user}/>,
|
||||||
handle: { preload: TheatreDetailPage.preload, sitemap: ['theatres'] } },
|
handle: { preload: TheatreDetailPage.preload, robots: 'noindex',
|
||||||
|
sitemap: ['theatres'] } },
|
||||||
{ path: 'materials', element: <MaterialBasePage/>,
|
{ path: 'materials', element: <MaterialBasePage/>,
|
||||||
handle: { preload: MaterialBasePage.preload }, children: [
|
handle: { preload: MaterialBasePage.preload }, children: [
|
||||||
{ index: true, element: <MaterialListPage/>,
|
{ index: true, element: <MaterialListPage/>,
|
||||||
|
|||||||
@@ -1,120 +0,0 @@
|
|||||||
import { act, cleanup, render } from '@testing-library/react'
|
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { GekanatorBackdrop } from '@/pages/GekanatorPage'
|
|
||||||
import { buildPost } from '@/test/factories'
|
|
||||||
|
|
||||||
import type { CSSProperties, ReactNode } from 'react'
|
|
||||||
|
|
||||||
vi.mock ('framer-motion', async importOriginal => ({
|
|
||||||
...await importOriginal<typeof import ('framer-motion')> (),
|
|
||||||
motion: {
|
|
||||||
div: (
|
|
||||||
{ children, animate: animation, initial, transition, style }: {
|
|
||||||
children?: ReactNode
|
|
||||||
animate?: { scale?: number; rotateY?: number }
|
|
||||||
initial?: { rotateY?: number }
|
|
||||||
transition?: { duration?: number }
|
|
||||||
style?: CSSProperties },
|
|
||||||
) => (
|
|
||||||
<div
|
|
||||||
data-scale={animation?.scale}
|
|
||||||
data-rotation={animation?.rotateY}
|
|
||||||
data-initial-rotation={initial?.rotateY}
|
|
||||||
data-duration={transition?.duration}
|
|
||||||
data-columns={style?.gridTemplateColumns}>
|
|
||||||
{children}
|
|
||||||
</div>) } }))
|
|
||||||
|
|
||||||
const target = buildPost ({ id: 1, thumbnail: 'https://example.com/target.jpg' })
|
|
||||||
const candidates = [
|
|
||||||
buildPost ({ id: 2, thumbnail: 'https://example.com/second.jpg' }),
|
|
||||||
buildPost ({ id: 3, thumbnail: 'https://example.com/third.jpg' })]
|
|
||||||
const candidateThumbnails = candidates.map (post => post.thumbnail)
|
|
||||||
|
|
||||||
describe.each ([
|
|
||||||
{ motionMode: 'on', duration: 450, columns: 10 },
|
|
||||||
{ motionMode: 'calm', duration: 600, columns: 7 }] as const) (
|
|
||||||
'GekanatorBackdrop winning-run collapse ($motionMode)',
|
|
||||||
({ motionMode, duration, columns }) => {
|
|
||||||
const props = {
|
|
||||||
posts: [target],
|
|
||||||
mascotAsset: '/mascot.png',
|
|
||||||
phase: 'question' as const,
|
|
||||||
visualSeed: 'winning-run',
|
|
||||||
motionMode,
|
|
||||||
winningRunTargetPost: target,
|
|
||||||
winningRunQuestionCount: 2 }
|
|
||||||
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.useFakeTimers ()
|
|
||||||
})
|
|
||||||
|
|
||||||
afterEach (() => {
|
|
||||||
cleanup ()
|
|
||||||
vi.useRealTimers ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('flips the old target to normal candidates before restoring the scale', () => {
|
|
||||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
|
||||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
|
||||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
|
||||||
|
|
||||||
rerender (<GekanatorBackdrop {...props}
|
|
||||||
posts={candidates}
|
|
||||||
visualSeed="collapsed"
|
|
||||||
winningRunTargetPost={null}
|
|
||||||
winningRunQuestionCount={0}/>)
|
|
||||||
|
|
||||||
const flips = container.querySelectorAll ('[data-rotation="180"]')
|
|
||||||
expect (flips).toHaveLength (9 * 8 * 8)
|
|
||||||
for (const flip of flips) {
|
|
||||||
const images = flip.querySelectorAll ('img')
|
|
||||||
expect (flip).toHaveAttribute ('data-initial-rotation', '0')
|
|
||||||
expect (flip).toHaveAttribute ('data-duration', String (duration / 1000))
|
|
||||||
expect (images).toHaveLength (2)
|
|
||||||
expect (candidateThumbnails).toContain (images[0].getAttribute ('src'))
|
|
||||||
expect (images[1]).toHaveAttribute ('src', target.thumbnail)
|
|
||||||
}
|
|
||||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
|
||||||
|
|
||||||
act (() => { vi.advanceTimersByTime (duration - 1) })
|
|
||||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (flips.length)
|
|
||||||
act (() => { vi.advanceTimersByTime (1) })
|
|
||||||
|
|
||||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
|
||||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '1')
|
|
||||||
expect (container.querySelector ('[data-columns]')).toHaveAttribute (
|
|
||||||
'data-columns', `repeat(${ columns }, minmax(0, 1fr))`)
|
|
||||||
const images = container.querySelectorAll ('img')
|
|
||||||
expect (images).toHaveLength (9 * columns * columns)
|
|
||||||
for (const image of images)
|
|
||||||
expect (candidateThumbnails).toContain (image.getAttribute ('src'))
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('cancels the collapse when a winning run resumes during the flip', () => {
|
|
||||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
|
||||||
rerender (<GekanatorBackdrop {...props}
|
|
||||||
posts={candidates}
|
|
||||||
visualSeed="collapsed"
|
|
||||||
winningRunTargetPost={null}
|
|
||||||
winningRunQuestionCount={0}/>)
|
|
||||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (9 * 8 * 8)
|
|
||||||
act (() => { vi.advanceTimersByTime (duration / 2) })
|
|
||||||
|
|
||||||
rerender (<GekanatorBackdrop {...props}
|
|
||||||
posts={candidates}
|
|
||||||
visualSeed="resumed"
|
|
||||||
winningRunTargetPost={candidates[0]}
|
|
||||||
winningRunQuestionCount={1}/>)
|
|
||||||
|
|
||||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
|
||||||
act (() => { vi.advanceTimersByTime (duration) })
|
|
||||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute (
|
|
||||||
'data-scale', String (8 / 6))
|
|
||||||
const images = container.querySelectorAll ('img')
|
|
||||||
expect (images).toHaveLength (9 * 8 * 8)
|
|
||||||
for (const image of images)
|
|
||||||
expect (image).toHaveAttribute ('src', candidates[0].thumbnail)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -3203,7 +3203,7 @@ const backgroundPostsFor = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export const GekanatorBackdrop: FC<{
|
const GekanatorBackdrop: FC<{
|
||||||
posts: Post[]
|
posts: Post[]
|
||||||
mascotAsset: string
|
mascotAsset: string
|
||||||
phase: Phase
|
phase: Phase
|
||||||
@@ -3362,9 +3362,6 @@ export const GekanatorBackdrop: FC<{
|
|||||||
const renderedSettings = settingsForMode (displayedBackdropMode)
|
const renderedSettings = settingsForMode (displayedBackdropMode)
|
||||||
const renderedTileCount = renderedSettings.columns * renderedSettings.rows
|
const renderedTileCount = renderedSettings.columns * renderedSettings.rows
|
||||||
const renderedScale = scaleForMode (displayedBackdropMode, displayedWinningRunCount)
|
const renderedScale = scaleForMode (displayedBackdropMode, displayedWinningRunCount)
|
||||||
const tileFlipAllowed =
|
|
||||||
displayedBackdropMode === 'normal'
|
|
||||||
|| (displayedBackdropMode === 'winning_run' && backdropMode === 'normal')
|
|
||||||
|
|
||||||
const isGuessPresentation =
|
const isGuessPresentation =
|
||||||
backdropMode === 'guess' || displayedBackdropMode === 'guess'
|
backdropMode === 'guess' || displayedBackdropMode === 'guess'
|
||||||
@@ -3612,14 +3609,16 @@ export const GekanatorBackdrop: FC<{
|
|||||||
? toThumbnails[index % Math.max (toThumbnails.length, 1)]
|
? toThumbnails[index % Math.max (toThumbnails.length, 1)]
|
||||||
: currentThumbnail
|
: currentThumbnail
|
||||||
const thumbnail =
|
const thumbnail =
|
||||||
tileFlipAllowed
|
displayedBackdropMode === 'winning_run'
|
||||||
? currentThumbnail
|
|| displayedBackdropMode === 'guess'
|
||||||
: nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
? nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
||||||
|
: currentThumbnail
|
||||||
if (!(thumbnail) || !(frontThumbnail) || !(backThumbnail))
|
if (!(thumbnail) || !(frontThumbnail) || !(backThumbnail))
|
||||||
return null
|
return null
|
||||||
|
|
||||||
const imageSource = ['intro', 'end'].includes (phase) ? mascotAsset : thumbnail
|
const imageSource = ['intro', 'end'].includes (phase) ? mascotAsset : thumbnail
|
||||||
const staticTile = !tileFlipAllowed || !isFlippingTiles
|
const showStaticTile =
|
||||||
|
displayedBackdropMode !== 'normal' || !(isFlippingTiles)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
@@ -3628,14 +3627,14 @@ export const GekanatorBackdrop: FC<{
|
|||||||
layout={displayedBackdropMode !== 'normal'}
|
layout={displayedBackdropMode !== 'normal'}
|
||||||
transition={{ duration: tileFlipDuration, ease: 'easeInOut' }}
|
transition={{ duration: tileFlipDuration, ease: 'easeInOut' }}
|
||||||
style={{ perspective: 1600 }}>
|
style={{ perspective: 1600 }}>
|
||||||
{staticTile && (
|
{showStaticTile && (
|
||||||
<img
|
<img
|
||||||
src={imageSource}
|
src={imageSource}
|
||||||
alt=""
|
alt=""
|
||||||
className="absolute inset-0 h-full w-full object-cover"
|
className="absolute inset-0 h-full w-full object-cover"
|
||||||
style={{ opacity: renderedSettings.opacity }}/>)
|
style={{ opacity: renderedSettings.opacity }}/>)
|
||||||
}
|
}
|
||||||
{!staticTile && (
|
{!(showStaticTile) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
className="absolute inset-0"
|
className="absolute inset-0"
|
||||||
initial={{ rotateY: 0 }}
|
initial={{ rotateY: 0 }}
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする