Skip to content
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
7 changes: 7 additions & 0 deletions .changeset/three-colts-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@genseki/ui": patch
"@genseki/next": patch
"@genseki/react": patch
---

feat: bump version of `nuqs`.
3 changes: 0 additions & 3 deletions examples/erp/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import type { NextConfig } from 'next'

const nextConfig: NextConfig = {
transpilePackages: ['@genseki/react', '@genseki/next'],
eslint: {
ignoreDuringBuilds: true,
},
}

export default nextConfig
7 changes: 4 additions & 3 deletions examples/erp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@
"@tiptap/extension-text-style": "^2.26.3",
"@tiptap/extension-underline": "^2.26.3",
"@tiptap/starter-kit": "^2.26.3",
"next": "15.2.2",
"next": "16.0.7",
"next-themes": "^0.4.6",
"nuqs": "^2.8.3",
"postcss": "^8.5.3",
"prisma": "^6.10.1",
"react": "19.1.0",
"react-dom": "19.1.0",
"react": "19.2.1",
"react-dom": "19.2.1",
"react-hook-form": "^7.61.1",
"tailwindcss": "^4.1.7",
"zod": "4.0.11"
Expand Down
3 changes: 2 additions & 1 deletion examples/erp/src/app/(admin)/api/[[...segments]]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import { nextjsApp } from '~/genseki/config'

const { GET, POST, PUT, PATCH, DELETE } = createApiResourceRouter(nextjsApp, {
pathPrefix: '/api',
})
}) as any

export { DELETE, GET, PATCH, POST, PUT }
26 changes: 14 additions & 12 deletions examples/erp/src/components/providers.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import type { PropsWithChildren } from 'react'

import { isServer, QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { ThemeProvider as NextThemesProvider } from 'next-themes'
import { NuqsAdapter } from 'nuqs/adapters/next/app'

function makeQueryClient() {
return new QueryClient({
Expand Down Expand Up @@ -36,16 +36,18 @@ function getQueryClient() {
export function Providers(props: PropsWithChildren) {
const queryClient = getQueryClient()
return (
<QueryClientProvider client={queryClient}>
<NextThemesProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
enableColorScheme
>
{props.children}
</NextThemesProvider>
</QueryClientProvider>
<NuqsAdapter>
<QueryClientProvider client={queryClient}>
<NextThemesProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
enableColorScheme
>
{props.children}
</NextThemesProvider>
</QueryClientProvider>
</NuqsAdapter>
)
}
3 changes: 0 additions & 3 deletions examples/ui-playground/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import type { NextConfig } from 'next'

const nextConfig: NextConfig = {
transpilePackages: ['@genseki/react', '@genseki/next'],
eslint: {
ignoreDuringBuilds: true,
},
}

export default nextConfig
2 changes: 1 addition & 1 deletion examples/ui-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@tiptap/starter-kit": "^2.26.3",
"color": "^5.0.2",
"date-fns": "^4.1.0",
"next": "15.2.2",
"next": "16.0.7",
"next-themes": "^0.4.6",
"postcss": "^8.5.3",
"react": "19.1.0",
Expand Down
4 changes: 2 additions & 2 deletions legacies/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@genseki/react": "workspace:^",
"cookie-es": "^2.0.0",
"next": "^15.2.2",
"nuqs": "^2.4.3",
"next": "^16.0.7",
"nuqs": "^2.8.3",
"radix3": "^1.1.2",
"react": "^19.1.0",
"react-dom": "^19.1.0",
Expand Down
6 changes: 3 additions & 3 deletions legacies/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@
"defu": "^6.1.4",
"input-otp": "^1.4.2",
"motion": "^12.7.4",
"nuqs": "^2.4.3",
"nuqs": "^2.8.3",
"radix3": "^1.1.2",
"react": "^19.1.0",
"react": "^19.2.1",
"react-aria-components": "^1.10.1",
"react-dom": "^19.1.0",
"react-dom": "^19.2.1",
"react-hook-form": "^7.61.1",
"remeda": "^2.21.2",
"sonner": "^2.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ export const TableEmpty = (props: {
}

declare module '@tanstack/react-table' {
interface ColumnMeta<TData extends RowData, TValue> {
// Keep generics identical to upstream to satisfy module augmentation rules
interface ColumnMeta<TData extends RowData = RowData, TValue = unknown> {
tdClassName?: string
thClassName?: string
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const useCollectionForm = <
return fieldsShapeToZodObject(fields.shape)
}, [])
return useForm<TFieldValues, TContext, TTransformedValues>({
resolver: standardSchemaResolver(schema),
resolver: standardSchemaResolver(schema as any),
defaultValues:
props?.defaultValues ??
(getDefaultValueFromFieldsClient(fields, storageAdapter) as DefaultValues<TFieldValues>),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function UpdateClientView(props: UpdateClientViewProps) {
}, [])

const form = useForm({
resolver: standardSchemaResolver(schema),
resolver: standardSchemaResolver(schema as any),
defaultValues: props.defaultValues,
})

Expand Down
5 changes: 2 additions & 3 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"input-otp": "^1.4.2",
"nuqs": "^2.4.3",
"react": "^19.1.0",
"nuqs": "^2.8.3",
"react": "^19.2.1",
"react-day-picker": "^9.11.1",
"react-dom": "^19.1.0",
"react-dropzone": "^14.3.8",
Expand All @@ -83,7 +83,6 @@
},
"peerDependencies": {
"color": "^5.0.2",
"react": "^19.1.0",
"react-day-picker": "^9.11.1",
"react-dom": "^19.1.0",
"react-dropzone": "^14.3.8"
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/src/components/primitives/tanstack-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

import { CircleNotchIcon, WarningCircleIcon, WarningIcon } from '@phosphor-icons/react'
import { CaretDownIcon, CaretUpDownIcon, CaretUpIcon } from '@phosphor-icons/react/dist/ssr'
import type { RowData } from '@tanstack/react-table'
import {
type Column,
flexRender,
type Row,
type RowData,
type SortDirection,
type Table as TanstackTableCore,
} from '@tanstack/react-table'
Expand Down Expand Up @@ -267,7 +267,8 @@
}

declare module '@tanstack/react-table' {
interface ColumnMeta<TData extends RowData, TValue> {
// Keep generics identical to upstream to satisfy module augmentation rules
interface ColumnMeta<TData extends RowData = RowData, TValue = unknown> {

Check warning on line 271 in packages/ui/src/components/primitives/tanstack-table.tsx

View workflow job for this annotation

GitHub Actions / ci

'TValue' is defined but never used. Allowed unused vars must match /^_/u

Check warning on line 271 in packages/ui/src/components/primitives/tanstack-table.tsx

View workflow job for this annotation

GitHub Actions / ci

'TData' is defined but never used. Allowed unused vars must match /^_/u
tdClassName?: string
thClassName?: string
}
Expand Down
Loading
Loading