Skip to content
Draft
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
8 changes: 8 additions & 0 deletions packages/next/src/build/webpack/loaders/next-swc-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@ async function loaderTransform(
}

let loaderOptions: SWCLoaderOptions = this.getOptions() || {}
const moduleLayer = this._module?.layer
if (loaderOptions.bundleLayer == null && moduleLayer != null) {
loaderOptions = {
...loaderOptions,
bundleLayer: moduleLayer as WebpackLayerName,
}
}

const shouldMaybeExclude = maybeExclude(
filename,
loaderOptions.transpilePackages || []
Expand Down
8 changes: 8 additions & 0 deletions test/e2e/app-dir/mdx-metadata/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { ReactNode } from 'react'
export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
5 changes: 5 additions & 0 deletions test/e2e/app-dir/mdx-metadata/app/page.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const metadata = {
title: 'MDX metadata title',
}

# MDX metadata page
3 changes: 3 additions & 0 deletions test/e2e/app-dir/mdx-metadata/mdx-components.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function useMDXComponents() {
return {}
}
30 changes: 30 additions & 0 deletions test/e2e/app-dir/mdx-metadata/mdx-metadata.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { nextTestSetup } from 'e2e-utils'

describe('mdx metadata export', () => {
const { next, isNextStart, skipped } = nextTestSetup({
files: __dirname,
dependencies: {
'@next/mdx': 'canary',
'@mdx-js/loader': '^3.1.1',
'@mdx-js/react': '^3.1.1',
},
skipDeployment: true,
skipStart: true,
})

if (skipped) return

if (!isNextStart) {
it('skipped in development mode', () => {})
return
}

it('builds an MDX page that exports metadata', async () => {
const { exitCode } = await next.build()
expect(exitCode).toBe(0)

const html = await next.readFile('.next/server/app/index.html')
expect(html).toContain('<title>MDX metadata title</title>')
expect(html).toContain('<h1>MDX metadata page</h1>')
})
})
8 changes: 8 additions & 0 deletions test/e2e/app-dir/mdx-metadata/next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const withMDX = require('@next/mdx')()

/** @type {import('next').NextConfig} */
const nextConfig = {
pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'md', 'mdx'],
}

module.exports = withMDX(nextConfig)