Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): update react monorepo to v19 (major) #3752

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/774-ink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"dependencies": {
"next": "^15.1.0",
"next-seo": "^6.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@inabagumi/prettier-config": "^3.0.0",
"@types/eslint": "^9.6.1",
"@types/node": "^22.10.1",
"@types/react": "^18.3.16",
"@types/react": "^19.0.1",
"@types/web-app-manifest": "^1.0.8",
"@typescript-eslint/eslint-plugin": "^8.18.0",
"@typescript-eslint/parser": "^8.18.0",
Expand Down
1 change: 1 addition & 0 deletions apps/hanerubeat/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ yarn-error.log*

# vercel
.vercel
.env*.local
8 changes: 1 addition & 7 deletions apps/hanerubeat/src/components/heart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@ export default function Heart({ ref }: ComponentProps<'audio'>) {
<>
<MdFavorite className={styles.heart} />

<audio
crossOrigin="anonymous"
loop
preload="none"
// @ts-expect-error `@types/react`のバージョン齟齬。全部v19.xにそろえられれば解決するはず。
ref={ref}
>
<audio crossOrigin="anonymous" loop preload="none" ref={ref}>
<source src={oggPath} type="audio/ogg" />
<source src={mp3Path} type="audio/mp3" />
<track default kind="captions" src={captionPath} srcLang="ja" />
Expand Down
7 changes: 3 additions & 4 deletions apps/neru-camera/app/(camera)/camera.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { track } from '@vercel/analytics'
import { fileSave } from 'browser-fs-access'
import clsx from 'clsx'
import { type Application } from 'pixi.js'
import { useCallback, useEffect, useRef, useState } from 'react'
import { useCallback, useEffect, useState } from 'react'
import processing from '@/lib/processing'
import { useAsset } from './asset'
import styles from './camera.module.css'
Expand All @@ -27,13 +27,12 @@ const mediaStreamConstraints: MediaStreamConstraints = {
}
}

export default function Camera(): JSX.Element {
export default function Camera() {
const { currentAsset: asset } = useAsset()
const [pixiView, setPixiView] = useState<HTMLCanvasElement>()
const [cameraStream, setCameraStream] = useState<MediaStream>()
const [isShooting, setIsShooting] = useState(false)
const [hasError, setHasError] = useState(false)
const cancelRef = useRef<HTMLDivElement>(null)
const texture = useVideoTexture({ srcObject: cameraStream })

const handleMount = useCallback(
Expand Down Expand Up @@ -144,7 +143,7 @@ export default function Camera(): JSX.Element {
</div>

{hasError && (
<AlertDialog leastDestructiveRef={cancelRef}>
<AlertDialog>
<AlertDialogLabel>エラー</AlertDialogLabel>

<AlertDialogDescription>
Expand Down
10 changes: 4 additions & 6 deletions apps/neru-camera/app/(camera)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type ReactNode } from 'react'
import type { ReactNode } from 'react'
import { type OverlayEntrySkeleton, createClient } from '@/lib/contentful'
import { AssetProvider, type OverlayEntry } from './asset'
import HeaderMenu from './menu'
Expand All @@ -16,13 +16,11 @@ async function getAssets(): Promise<OverlayEntry[]> {
return items
}

type Props = {
children: ReactNode
}

export default async function CameraLayout({
children
}: Props): Promise<JSX.Element> {
}: Readonly<{
children: ReactNode
}>) {
const assets = await getAssets()

return (
Expand Down
2 changes: 1 addition & 1 deletion apps/neru-camera/app/(camera)/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { EllipsisVerticalIcon } from '@heroicons/react/24/solid'
import { Menu, MenuButton, MenuItem, MenuList } from '@reach/menu-button'
import { useAsset } from './asset'

export default function HeaderMenu(): JSX.Element {
export default function HeaderMenu() {
const { assets, setAssetID } = useAsset()

return (
Expand Down
8 changes: 4 additions & 4 deletions apps/neru-camera/app/(camera)/overlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { ChromaKeyFilter } from './filters'
import { useVideoTexture } from './hooks'
import Viewport from './viewport'

type Props = {
export default function Overlay({
asset
}: Readonly<{
asset: OverlayEntry
}

export default function Overlay({ asset }: Props): JSX.Element {
}>) {
const app = useApp()
const texture = useVideoTexture({
src: asset.fields.media?.fields.file?.url
Expand Down
2 changes: 1 addition & 1 deletion apps/neru-camera/app/(camera)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export const metadata: Metadata = {

const Camera = dynamic(() => import('./camera'), { ssr: false })

export default function CameraPage(): JSX.Element {
export default function CameraPage() {
return <Camera />
}
6 changes: 3 additions & 3 deletions apps/neru-camera/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"next-seo": "^6.6.0",
"pixi-viewport": "^6.0.3",
"pixi.js": "^7.4.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"tailwindcss": "^3.4.16"
},
"description": "Neru Camera is an app to take a photos with Neru-chan!",
Expand All @@ -26,7 +26,7 @@
"@next/eslint-plugin-next": "^14.2.20",
"@types/eslint": "^9.6.1",
"@types/node": "^22.10.1",
"@types/react": "^18.3.16",
"@types/react": "^19.0.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"autoprefixer": "^10.4.20",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"url": "https://github.com/inabagumi/inaba-jinja/issues"
},
"dependencies": {},
"description": "This is a monorepo for Inaba Jinja.",
"description": "Mini apps by Haneru Developers.",
"devDependencies": {
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
Expand All @@ -24,7 +24,7 @@
"homepage": "https://inaba-jinja.com",
"license": "MIT",
"main": "n/a",
"name": "@inaba-jinja/monorepo",
"name": "@inabagumi/mini-apps",
"packageManager": "[email protected]",
"private": true,
"repository": {
Expand Down
Loading
Loading