Skip to content

Commit b497aa9

Browse files
Merge branch 'main' into alpha
2 parents 1a5f89f + 8f19f73 commit b497aa9

File tree

4 files changed

+54
-63
lines changed

4 files changed

+54
-63
lines changed

docs/react/guides/ssr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Fetch your data in a Server Component higher up in the component tree than the C
400400
- Wrap the component tree that needs the prefetched queries inside `<HydrationBoundary>`, and provide it with the dehydrated state
401401
- You can fetch inside multiple Server Components and use `<HydrationBoundary>` in multiple places
402402

403-
> NOTE: TypeScript currently complains of a type error when using async Server Components. As a temporary workaround, use `{/* @ts-expect-error Server Component */}` when calling this component inside another. For more information, see [End-to-End Type Safety](https://beta.nextjs.org/docs/configuring/typescript#end-to-end-type-safety) in the Next.js 13 beta docs.
403+
> NOTE: If you encounter a type error while using async Server Components with TypeScript versions lower than `5.1.3` and `@types/react` versions lower than `18.2.8`, it is recommended to update to the latest versions of both. Alternatively, you can use the temporary workaround of adding `{/* @ts-expect-error Server Component */}` when calling this component inside another. For more information, see [Async Server Component TypeScript Error](https://nextjs.org/docs/app/building-your-application/configuring/typescript#async-server-component-typescript-error) in the Next.js 13 docs.
404404
405405
```tsx
406406
// app/hydratedPosts.jsx

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
"jsdom": "^22.0.0",
7777
"jsonfile": "^6.1.0",
7878
"luxon": "^3.3.0",
79-
"nx": "^16.5.0",
80-
"nx-cloud": "^16.0.5",
79+
"nx": "^16.5.2",
80+
"nx-cloud": "^16.1.0",
8181
"prettier": "^2.8.8",
8282
"prettier-plugin-svelte": "^2.10.1",
8383
"publint": "^0.1.16",

packages/svelte-query/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { svelte } from '@sveltejs/vite-plugin-svelte'
2-
import { defineConfig } from 'vite'
2+
import { defineConfig } from 'vitest/config'
33

44
export default defineConfig({
55
plugins: [svelte()],

pnpm-lock.yaml

Lines changed: 50 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)