AI: #487 noindex の劇場詳細ページが sitemap に掲載される #490
@@ -1,10 +1,11 @@
|
|||||||
import assert from 'node:assert/strict'
|
import assert from 'node:assert/strict'
|
||||||
|
import { readFile } from 'node:fs/promises'
|
||||||
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 { 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'
|
||||||
@@ -332,6 +333,12 @@ after (async () => {
|
|||||||
if (errors.length) throw new AggregateError (errors, 'SSR teardown failed')
|
if (errors.length) throw new AggregateError (errors, 'SSR teardown failed')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test ('SSR bundle uses JSX compatible with production React', async () => {
|
||||||
|
const bundle = await readFile (
|
||||||
|
new URL ('./dist/server/entry-server.js', import.meta.url), 'utf8')
|
||||||
|
assert.doesNotMatch (bundle, /react\/jsx-dev-runtime|\bjsxDEV\b/)
|
||||||
|
})
|
||||||
|
|
||||||
test ('counts SSR renders the shell without result requests or embedded results', async () => {
|
test ('counts SSR renders the shell without result requests or embedded results', async () => {
|
||||||
for (const locale of ['ja', 'ain-Kana']) {
|
for (const locale of ['ja', 'ain-Kana']) {
|
||||||
for (const [resource, mode] of ['posts', 'tags'].flatMap (resource =>
|
for (const [resource, mode] of ['posts', 'tags'].flatMap (resource =>
|
||||||
@@ -366,6 +373,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 +409,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/>,
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ type Transform = (source: string, id: string) => Promise<{ code: string } | null
|
|||||||
|
|
||||||
|
|
||||||
export const transformMdx = async (source: string, suffix = '.mdx') => {
|
export const transformMdx = async (source: string, suffix = '.mdx') => {
|
||||||
const plugins = viteConfig.plugins?.flat () as { name: string; transform: Transform }[]
|
const config = viteConfig ({ command: 'serve', mode: 'test' })
|
||||||
|
const plugins = config.plugins?.flat () as { name: string; transform: Transform }[]
|
||||||
const plugin = plugins.find (entry => entry.name === '@mdx-js/rollup')
|
const plugin = plugins.find (entry => entry.name === '@mdx-js/rollup')
|
||||||
if (plugin == null)
|
if (plugin == null)
|
||||||
throw new Error ('The application MDX compiler is not registered')
|
throw new Error ('The application MDX compiler is not registered')
|
||||||
|
|||||||
@@ -21,7 +21,8 @@ if (typeof originalTransform === 'function')
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defineConfig ({
|
export default defineConfig (({ command }) => ({
|
||||||
|
esbuild: { jsxDev: command === 'build' ? false : undefined },
|
||||||
plugins: [{ name: 'request-render-context', enforce: 'pre',
|
plugins: [{ name: 'request-render-context', enforce: 'pre',
|
||||||
resolveId (id, _importer, options) {
|
resolveId (id, _importer, options) {
|
||||||
const contextPath = path.resolve (__dirname, './src/lib/renderContext')
|
const contextPath = path.resolve (__dirname, './src/lib/renderContext')
|
||||||
@@ -40,4 +41,4 @@ export default defineConfig ({
|
|||||||
rewrite: requestPath => requestPath.replace (/^\/api/, ''),
|
rewrite: requestPath => requestPath.replace (/^\/api/, ''),
|
||||||
secure: false } },
|
secure: false } },
|
||||||
watch: { usePolling: true,
|
watch: { usePolling: true,
|
||||||
interval: 100 } } })
|
interval: 100 } } }))
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ import { defineConfig, mergeConfig } from 'vitest/config'
|
|||||||
import viteConfig from './vite.config'
|
import viteConfig from './vite.config'
|
||||||
|
|
||||||
|
|
||||||
export default mergeConfig (
|
export default defineConfig (environment => mergeConfig (
|
||||||
viteConfig,
|
viteConfig (environment),
|
||||||
defineConfig ({
|
defineConfig ({
|
||||||
test: { environment: 'jsdom',
|
test: { environment: 'jsdom',
|
||||||
testTimeout: 30_000,
|
testTimeout: 30_000,
|
||||||
exclude: ['**/node_modules/**', '**/dist/**', 'server.ssr.test.mjs'],
|
exclude: ['**/node_modules/**', '**/dist/**', 'server.ssr.test.mjs'],
|
||||||
setupFiles: './src/test/setup.ts',
|
setupFiles: './src/test/setup.ts',
|
||||||
globals: false } }))
|
globals: false } })))
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする