コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
c0f42ea0c0 |
@@ -2,7 +2,6 @@ import assert from 'node:assert/strict'
|
|||||||
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 { JSDOM } from 'jsdom'
|
|
||||||
import { createServer as createViteServer } from 'vite'
|
import { createServer as createViteServer } from 'vite'
|
||||||
|
|
||||||
import { render } from './dist/server/entry-server.js'
|
import { render } from './dist/server/entry-server.js'
|
||||||
@@ -403,26 +402,6 @@ 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 => {
|
test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => {
|
||||||
for (const locale of ['ja', 'ain-Kana']) {
|
for (const locale of ['ja', 'ain-Kana']) {
|
||||||
await t.test (locale, async () => {
|
await t.test (locale, async () => {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
|
|
||||||
import { useLocale } from '@/lib/useLocale'
|
import { useLocale } from '@/lib/useLocale'
|
||||||
|
import PostList from '@/components/PostList'
|
||||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||||
import FieldError from '@/components/common/FieldError'
|
import FieldError from '@/components/common/FieldError'
|
||||||
import PostDurationField from '@/components/posts/PostDurationField'
|
import PostDurationField from '@/components/posts/PostDurationField'
|
||||||
@@ -10,14 +12,15 @@ import { Button } from '@/components/ui/button'
|
|||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { isApiError } from '@/lib/api'
|
import { isApiError } from '@/lib/api'
|
||||||
import useDialogue from '@/lib/dialogues/useDialogue'
|
import useDialogue from '@/lib/dialogues/useDialogue'
|
||||||
import { updatePost } from '@/lib/posts'
|
import { fetchPosts, updatePost } from '@/lib/posts'
|
||||||
|
import { postsKeys } from '@/lib/queryKeys'
|
||||||
import { msToTime } from '@/lib/utils'
|
import { msToTime } from '@/lib/utils'
|
||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||||
import { useUITranslation } from '@/lib/useUITranslation'
|
import { useUITranslation } from '@/lib/useUITranslation'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
import type { Post, TagWithSections } from '@/types'
|
import type { FetchPostsParams, Post, TagWithSections } from '@/types'
|
||||||
|
|
||||||
type PostFormField =
|
type PostFormField =
|
||||||
'parentPostIds' | 'tags' | 'videoMs'
|
'parentPostIds' | 'tags' | 'videoMs'
|
||||||
@@ -68,6 +71,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
|
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
|
||||||
const [title, setTitle] = useState (post.title)
|
const [title, setTitle] = useState (post.title)
|
||||||
|
|
||||||
|
const [importVisible, setImportVisible] = useState (false)
|
||||||
|
const [sourceTitle, setSourceTitle] = useState ('')
|
||||||
|
const [sourcePage, setSourcePage] = useState (1)
|
||||||
|
const sourceParams: FetchPostsParams = {
|
||||||
|
title: sourceTitle, page: sourcePage, limit: 20,
|
||||||
|
url: '', tags: '', match: 'all', order: 'original_created_at:desc',
|
||||||
|
originalCreatedFrom: '', originalCreatedTo: '',
|
||||||
|
createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '' }
|
||||||
|
const { data: sources, isError: sourceError } = useQuery ({
|
||||||
|
queryKey: postsKeys.index (sourceParams, locale),
|
||||||
|
queryFn: () => fetchPosts (sourceParams, locale),
|
||||||
|
enabled: importVisible && !disabled })
|
||||||
|
|
||||||
|
const importTags = (source: Post) => {
|
||||||
|
if (disabled)
|
||||||
|
return
|
||||||
|
setTags (current => {
|
||||||
|
const existing = new Set (current.split (/\s+/))
|
||||||
|
const additions = tagsToStr (source.tags).split (/\s+/)
|
||||||
|
.filter (tag => tag !== '' && !existing.has (tag))
|
||||||
|
return additions.length > 0
|
||||||
|
? `${current}${current.trim () === '' ? '' : ' '}${additions.join (' ')}`
|
||||||
|
: current
|
||||||
|
})
|
||||||
|
setImportVisible (false)
|
||||||
|
}
|
||||||
|
|
||||||
const videoFlg =
|
const videoFlg =
|
||||||
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
||||||
[tags])
|
[tags])
|
||||||
@@ -192,6 +222,48 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
setTags={setTags}
|
setTags={setTags}
|
||||||
errors={fieldErrors.tags}/>
|
errors={fieldErrors.tags}/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
disabled={disabled}
|
||||||
|
aria-expanded={importVisible}
|
||||||
|
onClick={() => setImportVisible (visible => !visible)}>
|
||||||
|
{label ('edit.import')}
|
||||||
|
</Button>
|
||||||
|
{importVisible && (
|
||||||
|
<div className="space-y-2" onKeyDown={event => {
|
||||||
|
if (event.key === 'Enter' && event.target instanceof HTMLInputElement)
|
||||||
|
event.preventDefault ()
|
||||||
|
}}>
|
||||||
|
<PostTextField
|
||||||
|
label={label ('shared:labels.title')}
|
||||||
|
type="search"
|
||||||
|
value={sourceTitle}
|
||||||
|
disabled={disabled}
|
||||||
|
onChange={value => {
|
||||||
|
setSourceTitle (value)
|
||||||
|
setSourcePage (1)
|
||||||
|
}}/>
|
||||||
|
<FieldError messages={sourceError ? [label ('common:fetchError')] : []}/>
|
||||||
|
{!disabled && <PostList posts={sources?.posts ?? []} onSelect={importTags}/>}
|
||||||
|
<div className="flex flex-col gap-2 md:flex-row">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
disabled={disabled || sourcePage <= 1}
|
||||||
|
onClick={() => setSourcePage (page => page - 1)}>
|
||||||
|
{label ('common:pagination.previous')}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
disabled={disabled || sourcePage * 20 >= (sources?.count ?? 0)}
|
||||||
|
onClick={() => setSourcePage (page => page + 1)}>
|
||||||
|
{label ('common:pagination.next')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>)}
|
||||||
|
|
||||||
{/* オリジナルの作成日時 */}
|
{/* オリジナルの作成日時 */}
|
||||||
<PostOriginalCreatedTimeField
|
<PostOriginalCreatedTimeField
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { useRef } from 'react'
|
|||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
import { useUITranslation } from '@/lib/useUITranslation'
|
import { useUITranslation } from '@/lib/useUITranslation'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
@@ -13,10 +14,11 @@ import type { FC, MouseEvent } from 'react'
|
|||||||
import type { Post } from '@/types'
|
import type { Post } from '@/types'
|
||||||
|
|
||||||
type Props = { posts: Post[]
|
type Props = { posts: Post[]
|
||||||
|
onSelect?: (post: Post) => void
|
||||||
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
||||||
|
|
||||||
|
|
||||||
const PostList: FC<Props> = ({ posts, onClick }) => {
|
const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
|
||||||
const { label } = useUITranslation ('shared')
|
const { label } = useUITranslation ('shared')
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
const behaviourSettings = useClientBehaviourSettings ()
|
||||||
@@ -39,7 +41,63 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
const sharedId = `page-${ post.id }`
|
const sharedId = `page-${ post.id }`
|
||||||
const layoutId = sharedId
|
const layoutId = sharedId
|
||||||
|
|
||||||
return (
|
const card = (
|
||||||
|
<motion.div
|
||||||
|
ref={cardRef}
|
||||||
|
layout={animationMode === 'off' ? false : true}
|
||||||
|
layoutId={(onSelect || animationMode === 'off') ? undefined : layoutId}
|
||||||
|
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
||||||
|
'transform-gpu will-change-transform',
|
||||||
|
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
||||||
|
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
||||||
|
whileHover={{ scale: 1.02 }}
|
||||||
|
onLayoutAnimationStart={() => {
|
||||||
|
if (!(cardRef.current))
|
||||||
|
return
|
||||||
|
|
||||||
|
cardRef.current.style.position = 'relative'
|
||||||
|
cardRef.current.style.zIndex = '9999'
|
||||||
|
}}
|
||||||
|
onLayoutAnimationComplete={() => {
|
||||||
|
if (!(cardRef.current))
|
||||||
|
return
|
||||||
|
|
||||||
|
cardRef.current.style.zIndex = ''
|
||||||
|
cardRef.current.style.position = ''
|
||||||
|
}}
|
||||||
|
transition={{ layout: cardLayoutTransition }}>
|
||||||
|
{thumbnailMode === 'off'
|
||||||
|
? (
|
||||||
|
<div className="flex h-full w-full items-center justify-center
|
||||||
|
bg-muted text-center text-xs text-muted-foreground">
|
||||||
|
{label ('labels.noThumbnail')}
|
||||||
|
</div>)
|
||||||
|
: (
|
||||||
|
<img
|
||||||
|
src={post.thumbnail || post.thumbnailBase || undefined}
|
||||||
|
alt={post.title || post.url}
|
||||||
|
title={post.title || post.url || undefined}
|
||||||
|
loading={
|
||||||
|
thumbnailMode === 'light'
|
||||||
|
? 'lazy'
|
||||||
|
: (i < 12 ? 'eager' : 'lazy')
|
||||||
|
}
|
||||||
|
decoding="async"
|
||||||
|
className="object-cover w-full h-full"/>)}
|
||||||
|
</motion.div>)
|
||||||
|
|
||||||
|
return onSelect
|
||||||
|
? (
|
||||||
|
<Button
|
||||||
|
key={post.id}
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
className="w-40 h-40 p-0"
|
||||||
|
aria-label={post.title || post.url}
|
||||||
|
onClick={() => onSelect (post)}>
|
||||||
|
{card}
|
||||||
|
</Button>)
|
||||||
|
: (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/posts/${ post.id }`}
|
to={`/posts/${ post.id }`}
|
||||||
key={post.id}
|
key={post.id}
|
||||||
@@ -49,51 +107,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
setForLocationKey (location.key, sharedId)
|
setForLocationKey (location.key, sharedId)
|
||||||
onClick?.(e)
|
onClick?.(e)
|
||||||
}}>
|
}}>
|
||||||
<motion.div
|
{card}
|
||||||
ref={cardRef}
|
|
||||||
layout={animationMode === 'off' ? false : true}
|
|
||||||
layoutId={animationMode === 'off' ? undefined : layoutId}
|
|
||||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
|
||||||
'transform-gpu will-change-transform',
|
|
||||||
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
|
||||||
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
|
||||||
whileHover={{ scale: 1.02 }}
|
|
||||||
onLayoutAnimationStart={() => {
|
|
||||||
if (!(cardRef.current))
|
|
||||||
return
|
|
||||||
|
|
||||||
cardRef.current.style.position = 'relative'
|
|
||||||
cardRef.current.style.zIndex = '9999'
|
|
||||||
}}
|
|
||||||
onLayoutAnimationComplete={() => {
|
|
||||||
if (!(cardRef.current))
|
|
||||||
return
|
|
||||||
|
|
||||||
cardRef.current.style.zIndex = ''
|
|
||||||
cardRef.current.style.position = ''
|
|
||||||
}}
|
|
||||||
transition={{ layout: cardLayoutTransition }}>
|
|
||||||
{thumbnailMode === 'off'
|
|
||||||
? (
|
|
||||||
<div className="flex h-full w-full items-center justify-center
|
|
||||||
bg-muted text-center text-xs text-muted-foreground">
|
|
||||||
{label ('labels.noThumbnail')}
|
|
||||||
</div>)
|
|
||||||
: (
|
|
||||||
<img
|
|
||||||
src={post.thumbnail || post.thumbnailBase || undefined}
|
|
||||||
alt={post.title || post.url}
|
|
||||||
title={post.title || post.url || undefined}
|
|
||||||
loading={
|
|
||||||
thumbnailMode === 'light'
|
|
||||||
? 'lazy'
|
|
||||||
: i < 12
|
|
||||||
? 'eager'
|
|
||||||
: 'lazy'
|
|
||||||
}
|
|
||||||
decoding="async"
|
|
||||||
className="object-cover w-full h-full"/>)}
|
|
||||||
</motion.div>
|
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
})}
|
})}
|
||||||
</div>)
|
</div>)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
||||||
import { PassThrough } from 'node:stream'
|
import { PassThrough } from 'node:stream'
|
||||||
import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
|
import { renderToPipeableStream } from 'react-dom/server'
|
||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { I18nextProvider } from 'react-i18next'
|
import { I18nextProvider } from 'react-i18next'
|
||||||
import { createStaticHandler, createStaticRouter,
|
import { createStaticHandler, createStaticRouter,
|
||||||
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
|
|||||||
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
||||||
import { apiGet, isApiError } from '@/lib/api'
|
import { apiGet, isApiError } from '@/lib/api'
|
||||||
import { createUII18n } from '@/lib/i18n'
|
import { createUII18n } from '@/lib/i18n'
|
||||||
import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
|
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
|
||||||
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
||||||
import { withRenderContext } from '@/lib/renderContext.server'
|
import { withRenderContext } from '@/lib/renderContext.server'
|
||||||
|
|
||||||
@@ -171,26 +171,8 @@ export const render = async (
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
const helmet = helmetContext.helmet!
|
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]
|
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
||||||
.map (entry => entry.toString ()).join ('')
|
.map (entry => entry.toString ()).join ('')
|
||||||
+ renderToStaticMarkup (<>{alternates}</>)
|
|
||||||
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
||||||
query.state.status !== 'pending'
|
query.state.status !== 'pending'
|
||||||
&& query.meta?.clientOnly !== true
|
&& query.meta?.clientOnly !== true
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"_untranslated": ["edit.import"],
|
||||||
"list": {
|
"list": {
|
||||||
"tagline": "{{brand}}",
|
"tagline": "{{brand}}",
|
||||||
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
||||||
@@ -31,6 +32,7 @@
|
|||||||
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"import": "インポート",
|
||||||
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
||||||
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
||||||
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"import": "インポート",
|
||||||
"validationFailed": "更新はできなかったよ……",
|
"validationFailed": "更新はできなかったよ……",
|
||||||
"conflictTitle": "競合が発生しました.",
|
"conflictTitle": "競合が発生しました.",
|
||||||
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする