diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 5626212..19d6eb8 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -166,11 +166,10 @@ export const pageRoutes = (
robots: 'noindex', authentication: 'user' } },
{ path: ':id', element: ,
handle: { preload: MaterialDetailPage.preload, sitemap: ['materials'] } }] },
- { path: 'wiki', element: ,
- handle: { redirectTo: '/tag-descriptions' } },
- { path: 'tag-descriptions',
- element: ,
- handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
+ { path: 'wiki', element: ,
+ handle: { redirectTo: '/tags' } },
+ { path: 'tag-descriptions', element: ,
+ handle: { redirectTo: '/tags' } },
{ path: 'tag-groups',
element: ,
handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
diff --git a/frontend/src/components/TopNav.tsx b/frontend/src/components/TopNav.tsx
index 8252b96..73486ab 100644
--- a/frontend/src/components/TopNav.tsx
+++ b/frontend/src/components/TopNav.tsx
@@ -76,12 +76,9 @@ export const menuOutline = (
{ ...message ('add'), to: '/posts/new', visible: editable },
{ ...message ('allHistory'), to: '/posts/changes' },
{ ...message ('help'), to: '/wiki/ヘルプ:広場' }] },
- { ...message ('tags'), to: '/tags',
- base: pathName.startsWith ('/tag-descriptions') ? '/tag-descriptions' : '/tags',
- subMenu: [
+ { ...message ('tags'), to: '/tags', subMenu: [
{ ...message ('master'), to: '/tags' },
{ ...message ('nicoLinks'), to: '/tags/nico' },
- { ...message ('tagDescriptions'), to: '/tag-descriptions' },
{ ...message ('allHistory'), to: '/tags/changes' },
{ ...message ('help'), to: '/wiki/ヘルプ:タグ' },
{ component: , visible: tagFlg },
diff --git a/frontend/src/lib/prefetchers.ts b/frontend/src/lib/prefetchers.ts
index 20de1b0..f0b295d 100644
--- a/frontend/src/lib/prefetchers.ts
+++ b/frontend/src/lib/prefetchers.ts
@@ -100,7 +100,7 @@ const prefetchHelpDiff: Prefetcher = async (qc, url, locale) => {
const prefetchWikiPagesIndex: Prefetcher = async (qc, url, locale) => {
const title = url.searchParams.get ('title') ?? ''
- const resourceType = url.pathname === '/tag-groups' ? 'tag_group' : 'tag_description'
+ const resourceType = 'tag_group'
await qc.prefetchQuery ({
queryKey: wikiKeys.index ({ title, resourceType }, locale),
@@ -311,7 +311,7 @@ export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[]
&& Boolean (mPost (u.pathname))),
run: prefetchPostShow },
{ test: u => u.pathname === '/posts/changes', run: prefetchPostChanges },
- { test: u => ['/wiki', '/tag-descriptions', '/tag-groups'].includes (u.pathname),
+ { test: u => u.pathname === '/tag-groups',
run: prefetchWikiPagesIndex },
{ test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
&& Boolean (mWiki (u.pathname))),