Skip to content

Commit

Permalink
Merge branch 'canary' into sokra/resolve-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra committed Feb 17, 2024
2 parents de2a95e + 4fa08de commit 88768e7
Show file tree
Hide file tree
Showing 94 changed files with 714 additions and 353 deletions.
70 changes: 35 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ swc_core = { version = "0.90.8", features = [
testing = { version = "0.35.18" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240216.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240216.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240216.2" }

# General Deps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function Video() {
<track
src="/path/to/captions.vtt"
kind="subtitles"
srclang="en"
srcLang="en"
label="English"
/>
Your browser does not support the video tag.
Expand Down Expand Up @@ -104,7 +104,7 @@ To embed videos from external platforms, you can use Next.js to fetch the video
The first step is to create a [Server Component](https://nextjs.org/docs/app/building-your-application/rendering/server-components) that generates the appropriate iframe for embedding the video. This component will fetch the source URL for the video and render the iframe.

```jsx filename="app/ui/video-component.jsx"
export const async function VideoComponent (){
export default async function VideoComponent() {
const src = await getVideoSrc()

return <iframe src={src} frameborder="0" allowfullscreen />
Expand Down Expand Up @@ -229,7 +229,7 @@ async function VideoComponent({ fileName }) {
<track
src={captionsUrl}
kind="subtitles"
srclang="en"
srcLang="en"
label="English">
Your browser does not support the video tag.
</video>
Expand Down
4 changes: 2 additions & 2 deletions docs/02-app/02-api-reference/01-components/link.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ import useIsAuthed from './hooks/useIsAuthed'

export default function Page() {
const isAuthed = useIsAuthed()
const path = isAuthed ? '/auth/dashboard' : '/dashboard'
const path = isAuthed ? '/auth/dashboard' : '/public/dashboard'
return (
<Link as="/dashboard" href={path}>
Dashboard
Expand All @@ -495,7 +495,7 @@ export default function Page() {

<PagesOnly>

> **Good to know**: If you're using [Dynamic Routes](/docs/app/building-your-application/routing/dynamic-routes), you'll need to adapt your `as` and `href` props. For example, if you have a Dynamic Route like `/dashboard/[user]` that you want to present differently via middleware, you would write: `<Link href={{ pathname: '/dashboard/authed/[user]', query: { user: username } }} as="/dashboard/[user]">Profile</Link>`.
> **Good to know**: If you're using [Dynamic Routes](/docs/app/building-your-application/routing/dynamic-routes), you'll need to adapt your `as` and `href` props. For example, if you have a Dynamic Route like `/dashboard/authed/[user]` that you want to present differently via middleware, you would write: `<Link href={{ pathname: '/dashboard/authed/[user]', query: { user: username } }} as="/dashboard/[user]">Profile</Link>`.
</PagesOnly>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Next.js includes a [short list of popular packages](https://github.com/vercel/ne
- `prettier`
- `prisma`
- `puppeteer`
- `puppeteer-core`
- `rimraf`
- `sharp`
- `shiki`
Expand Down
Loading

0 comments on commit 88768e7

Please sign in to comment.