From 9cba244d102b830895eaad00ca35b7ef2e40ac49 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sat, 21 Nov 2026 01:27:09 +0900 Subject: [PATCH 1/4] WIP: unverified Codex job issue-487-j6xo2c3m --- frontend/package.json | 4 ++-- frontend/server.ssr.test.mjs | 16 ++++++++++++++-- frontend/src/App.tsx | 3 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e9be868..adacbff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,8 +6,8 @@ "scripts": { "dev": "vite", "build": "tsc -b && npm run build:client && npm run build:server", - "build:client": "vite build --outDir dist/client", - "build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server", + "build:client": "NODE_ENV=production vite build --outDir dist/client", + "build:server": "NODE_ENV=production vite build --ssr src/entry-server.tsx --outDir dist/server", "start": "node server.mjs", "lint": "eslint .", "test": "vitest", diff --git a/frontend/server.ssr.test.mjs b/frontend/server.ssr.test.mjs index cae7986..d58bea9 100644 --- a/frontend/server.ssr.test.mjs +++ b/frontend/server.ssr.test.mjs @@ -4,7 +4,7 @@ import { spawn } from 'node:child_process' import { after, before, test } from 'node:test' 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 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 => { const cookie = await authenticatedCookie () 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') assert.match (result.head, new RegExp (`SSR post ${locale}`)) 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') assert.match (result.html, new RegExp (`SSR wiki body ${locale}|SSR`)) assert.doesNotMatch (result.html, /Switched to client rendering|template id="B:/) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index a6799ad..dca6bb1 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -152,7 +152,8 @@ export const pageRoutes = ( { path: 'tags/changes', element: , handle: { preload: TagHistoryPage.preload } }, { path: 'theatres/:id', element: , - handle: { preload: TheatreDetailPage.preload, sitemap: ['theatres'] } }, + handle: { preload: TheatreDetailPage.preload, robots: 'noindex', + sitemap: ['theatres'] } }, { path: 'materials', element: , handle: { preload: MaterialBasePage.preload }, children: [ { index: true, element: , -- 2.53.0 From 8b0433e344406e773890eeb0cc2072cb7726b2ce Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sun, 22 Nov 2026 01:44:36 +0900 Subject: [PATCH 2/4] AI: address review on PR #490 --- frontend/package.json | 4 ++-- frontend/server.ssr.test.mjs | 7 +++++++ frontend/src/test/compileMdx.ts | 3 ++- frontend/vite.config.ts | 5 +++-- frontend/vitest.config.ts | 6 +++--- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index adacbff..e9be868 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,8 +6,8 @@ "scripts": { "dev": "vite", "build": "tsc -b && npm run build:client && npm run build:server", - "build:client": "NODE_ENV=production vite build --outDir dist/client", - "build:server": "NODE_ENV=production vite build --ssr src/entry-server.tsx --outDir dist/server", + "build:client": "vite build --outDir dist/client", + "build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server", "start": "node server.mjs", "lint": "eslint .", "test": "vitest", diff --git a/frontend/server.ssr.test.mjs b/frontend/server.ssr.test.mjs index d58bea9..1cbb5e6 100644 --- a/frontend/server.ssr.test.mjs +++ b/frontend/server.ssr.test.mjs @@ -1,4 +1,5 @@ import assert from 'node:assert/strict' +import { readFile } from 'node:fs/promises' import { createServer } from 'node:http' import { spawn } from 'node:child_process' import { after, before, test } from 'node:test' @@ -332,6 +333,12 @@ after (async () => { 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 () => { for (const locale of ['ja', 'ain-Kana']) { for (const [resource, mode] of ['posts', 'tags'].flatMap (resource => diff --git a/frontend/src/test/compileMdx.ts b/frontend/src/test/compileMdx.ts index 587b8f5..1b1ac03 100644 --- a/frontend/src/test/compileMdx.ts +++ b/frontend/src/test/compileMdx.ts @@ -10,7 +10,8 @@ type Transform = (source: string, id: string) => Promise<{ code: string } | null 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') if (plugin == null) throw new Error ('The application MDX compiler is not registered') diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 813fcb1..94486b5 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -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', resolveId (id, _importer, options) { const contextPath = path.resolve (__dirname, './src/lib/renderContext') @@ -40,4 +41,4 @@ export default defineConfig ({ rewrite: requestPath => requestPath.replace (/^\/api/, ''), secure: false } }, watch: { usePolling: true, - interval: 100 } } }) + interval: 100 } } })) diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts index d08c97d..70b211a 100644 --- a/frontend/vitest.config.ts +++ b/frontend/vitest.config.ts @@ -3,11 +3,11 @@ import { defineConfig, mergeConfig } from 'vitest/config' import viteConfig from './vite.config' -export default mergeConfig ( - viteConfig, +export default defineConfig (environment => mergeConfig ( + viteConfig (environment), defineConfig ({ test: { environment: 'jsdom', testTimeout: 30_000, exclude: ['**/node_modules/**', '**/dist/**', 'server.ssr.test.mjs'], setupFiles: './src/test/setup.ts', - globals: false } })) + globals: false } }))) -- 2.53.0 From d465fb89879e37dd88ca7962e5660497cdb9554b Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sun, 22 Nov 2026 02:07:34 +0900 Subject: [PATCH 3/4] AI: address review on PR #490 --- backend/app/models/history_access.rb | 10 +++++-- backend/spec/models/history_access_spec.rb | 32 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/backend/app/models/history_access.rb b/backend/app/models/history_access.rb index 3500f50..8665b48 100644 --- a/backend/app/models/history_access.rb +++ b/backend/app/models/history_access.rb @@ -81,10 +81,14 @@ class HistoryAccess < ActiveSupport::CurrentAttributes table = model.table_name source = "JSON_TABLE(COALESCE(#{ row }.tags_json, JSON_ARRAY()), '$[*]' COLUMNS (" + "tag_id BIGINT PATH '$.#{ key }', version_no INT PATH '$.version_no')) tag_reference" + # DISTINCT prevents derived-table merging: evaluate privacy independently of each post row. + private_versions = "SELECT DISTINCT reference_version.tag_id, reference_version.version_no, " + + "reference_version.created_at FROM #{ table } reference_version " + + "WHERE NOT (#{ sql(model, 'reference_version') })" match = 'reference_version.tag_id = tag_reference.tag_id' if external match += " AND reference_version.created_at <= #{ row }.created_at" - latest = "AND NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + + latest = "WHERE NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + 'WHERE later_reference.tag_id = reference_version.tag_id ' + "AND later_reference.created_at <= #{ row }.created_at " + 'AND later_reference.version_no > reference_version.version_no)' @@ -92,8 +96,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes match += ' AND reference_version.version_no = tag_reference.version_no' latest = '' end - "(SELECT 1 FROM #{ source } JOIN #{ table } reference_version ON #{ match } " + - "WHERE NOT (#{ sql(model, 'reference_version') }) #{ latest } LIMIT 1) IS NULL" + "(SELECT 1 FROM #{ source } JOIN (#{ private_versions }) reference_version ON #{ match } " + + "#{ latest } LIMIT 1) IS NULL" end def self.reference_sql(table, row) diff --git a/backend/spec/models/history_access_spec.rb b/backend/spec/models/history_access_spec.rb index 385e5cd..99fa68a 100644 --- a/backend/spec/models/history_access_spec.rb +++ b/backend/spec/models/history_access_spec.rb @@ -127,4 +127,36 @@ RSpec.describe 'Counts artifact policy and external references' do end end + it 'checks external privacy by snapshot time and version order' do + origin = Time.utc(2024) + tag = create(:tag, primary_name: 'private linked tag') + TagVersion.create!(tag:, version_no: 1, event_type: 'discard', + name: 'private linked tag', category: 'general', aliases: '', parent_tag_ids: '', + names: { ja: { name: 'private linked tag', script_code: 'Jpan', + auto_generated: false, aliases: [] } }, created_at: origin) + external = create(:external_tag) + references = [ + [origin, tag.id.to_s], [origin + 1.day, ''], + [origin + 1.day, tag.id.to_s], [origin + 2.days, '']] + references.each_with_index do |entry, index| + timestamp, linked_tag_ids = entry + NicoTagVersion.create!(external_tag: external, version_no: index + 1, + event_type: index.zero? ? 'create' : 'update', linked_tag_ids:, created_at: timestamp) + end + post = create(:post) + rows = [origin - 1.hour, origin + 1.hour, origin + 1.day, origin + 2.days] + .each_with_index.map do |timestamp, index| + PostVersion.create!(post:, version_no: index + 1, event_type: 'create', + title: 'external snapshot', url: post.url, tags: '', parent_post_ids: '', + tags_json: [{ external_tag_id: external.id }], created_at: timestamp) + end + HistoryAccess.set(user: nil) do + expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).pluck(:id)) + .to match_array([rows.first.id, rows.last.id]) + end + HistoryAccess.set(user: create(:user, :admin)) do + expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).count).to eq(4) + end + end + end -- 2.53.0 From 91787d4187ddc7c086708002e43581d53cf76809 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sun, 22 Nov 2026 12:03:27 +0900 Subject: [PATCH 4/4] AI: address review on PR #490 --- backend/app/models/history_access.rb | 10 ++----- backend/spec/models/history_access_spec.rb | 32 ---------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/backend/app/models/history_access.rb b/backend/app/models/history_access.rb index 8665b48..3500f50 100644 --- a/backend/app/models/history_access.rb +++ b/backend/app/models/history_access.rb @@ -81,14 +81,10 @@ class HistoryAccess < ActiveSupport::CurrentAttributes table = model.table_name source = "JSON_TABLE(COALESCE(#{ row }.tags_json, JSON_ARRAY()), '$[*]' COLUMNS (" + "tag_id BIGINT PATH '$.#{ key }', version_no INT PATH '$.version_no')) tag_reference" - # DISTINCT prevents derived-table merging: evaluate privacy independently of each post row. - private_versions = "SELECT DISTINCT reference_version.tag_id, reference_version.version_no, " + - "reference_version.created_at FROM #{ table } reference_version " + - "WHERE NOT (#{ sql(model, 'reference_version') })" match = 'reference_version.tag_id = tag_reference.tag_id' if external match += " AND reference_version.created_at <= #{ row }.created_at" - latest = "WHERE NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + + latest = "AND NOT EXISTS (SELECT 1 FROM #{ table } later_reference " + 'WHERE later_reference.tag_id = reference_version.tag_id ' + "AND later_reference.created_at <= #{ row }.created_at " + 'AND later_reference.version_no > reference_version.version_no)' @@ -96,8 +92,8 @@ class HistoryAccess < ActiveSupport::CurrentAttributes match += ' AND reference_version.version_no = tag_reference.version_no' latest = '' end - "(SELECT 1 FROM #{ source } JOIN (#{ private_versions }) reference_version ON #{ match } " + - "#{ latest } LIMIT 1) IS NULL" + "(SELECT 1 FROM #{ source } JOIN #{ table } reference_version ON #{ match } " + + "WHERE NOT (#{ sql(model, 'reference_version') }) #{ latest } LIMIT 1) IS NULL" end def self.reference_sql(table, row) diff --git a/backend/spec/models/history_access_spec.rb b/backend/spec/models/history_access_spec.rb index 99fa68a..385e5cd 100644 --- a/backend/spec/models/history_access_spec.rb +++ b/backend/spec/models/history_access_spec.rb @@ -127,36 +127,4 @@ RSpec.describe 'Counts artifact policy and external references' do end end - it 'checks external privacy by snapshot time and version order' do - origin = Time.utc(2024) - tag = create(:tag, primary_name: 'private linked tag') - TagVersion.create!(tag:, version_no: 1, event_type: 'discard', - name: 'private linked tag', category: 'general', aliases: '', parent_tag_ids: '', - names: { ja: { name: 'private linked tag', script_code: 'Jpan', - auto_generated: false, aliases: [] } }, created_at: origin) - external = create(:external_tag) - references = [ - [origin, tag.id.to_s], [origin + 1.day, ''], - [origin + 1.day, tag.id.to_s], [origin + 2.days, '']] - references.each_with_index do |entry, index| - timestamp, linked_tag_ids = entry - NicoTagVersion.create!(external_tag: external, version_no: index + 1, - event_type: index.zero? ? 'create' : 'update', linked_tag_ids:, created_at: timestamp) - end - post = create(:post) - rows = [origin - 1.hour, origin + 1.hour, origin + 1.day, origin + 2.days] - .each_with_index.map do |timestamp, index| - PostVersion.create!(post:, version_no: index + 1, event_type: 'create', - title: 'external snapshot', url: post.url, tags: '', parent_post_ids: '', - tags_json: [{ external_tag_id: external.id }], created_at: timestamp) - end - HistoryAccess.set(user: nil) do - expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).pluck(:id)) - .to match_array([rows.first.id, rows.last.id]) - end - HistoryAccess.set(user: create(:user, :admin)) do - expect(HistoryAccess.visible(PostVersion.where(id: rows.map(&:id))).count).to eq(4) - end - end - end -- 2.53.0