Commit 3efc842a authored by Jiachi Liu's avatar Jiachi Liu

Fix next/server apit push alias for ESM pkg (#61721)

We have a modularize imports config for `next/server` before, which will
transform the `next/server` imports to directly import from the actual
file, for instance: `import { NextRequest } from 'next/server'` will
become `import { NextRequest } from
'next/dist/server/web/exports/next-request'`, where the NextRequest is
exported as default export. This is fine in most case until you're using
a ESM pkg, then it will be resolved as `{ default: NextRequest }`
according to the spec. Since it's a ESM import to a CJS module in
`next/dist`.

Since we already have the ESM alias introduced in #59852 , this can
handle the case more properly.

Remove the modularize imports config for `next/server`, use the ESM api
alias instead.

Migrate the cjs optimizer tests from middleware to a separate endpoint
`/cjs/server`. As now ESM imports for next/server are not going to get
tree-shaken in dev, but since we don't have image response there it's
still fine.

Closes NEXT-2376
Closes NEXT-2374
parent 179d14e4
...@@ -9,11 +9,8 @@ const serverExports = { ...@@ -9,11 +9,8 @@ const serverExports = {
.userAgentFromString, .userAgentFromString,
userAgent: require('next/dist/server/web/spec-extension/user-agent') userAgent: require('next/dist/server/web/spec-extension/user-agent')
.userAgent, .userAgent,
} URLPattern: require('next/dist/server/web/spec-extension/url-pattern')
.URLPattern,
if (typeof URLPattern !== 'undefined') {
// eslint-disable-next-line no-undef
serverExports.URLPattern = URLPattern
} }
// https://nodejs.org/api/esm.html#commonjs-namespaces // https://nodejs.org/api/esm.html#commonjs-namespaces
......
...@@ -205,6 +205,7 @@ export function createNextApiEsmAliases() { ...@@ -205,6 +205,7 @@ export function createNextApiEsmAliases() {
navigation: 'next/dist/api/navigation', navigation: 'next/dist/api/navigation',
headers: 'next/dist/api/headers', headers: 'next/dist/api/headers',
og: 'next/dist/api/og', og: 'next/dist/api/og',
server: 'next/dist/api/server',
// pages api // pages api
document: 'next/dist/api/document', document: 'next/dist/api/document',
app: 'next/dist/api/app', app: 'next/dist/api/app',
......
...@@ -831,9 +831,6 @@ function assignDefaults( ...@@ -831,9 +831,6 @@ function assignDefaults(
lodash: { lodash: {
transform: 'lodash/{{member}}', transform: 'lodash/{{member}}',
}, },
'next/server': {
transform: 'next/dist/server/web/exports/{{ kebabCase member }}',
},
} }
const userProvidedOptimizePackageImports = const userProvidedOptimizePackageImports =
......
// This file is for modularized imports for next/server to get fully-treeshaking.
export { ImageResponse as default } from '../spec-extension/image-response'
// Alias index file of next/server for edge runtime for tree-shaking purpose // Alias index file of next/server for edge runtime for tree-shaking purpose
export { default as ImageResponse } from './image-response' export { ImageResponse } from '../spec-extension/image-response'
export { default as NextRequest } from './next-request' export { NextRequest } from '../spec-extension/request'
export { default as NextResponse } from './next-response' export { NextResponse } from '../spec-extension/response'
export { default as userAgent } from './user-agent' export { userAgent, userAgentFromString } from '../spec-extension/user-agent'
export { default as userAgentFromString } from './user-agent-from-string' export { URLPattern } from '../spec-extension/url-pattern'
export { default as URLPattern } from './url-pattern'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { NextRequest as default } from '../spec-extension/request'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { NextResponse as default } from '../spec-extension/response'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { revalidatePath as default } from '../spec-extension/revalidate-path'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { revalidateTag as default } from '../spec-extension/revalidate-tag'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { unstable_cache as default } from '../spec-extension/unstable-cache'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { unstable_noStore as default } from '../spec-extension/unstable-no-store'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { userAgentFromString as default } from '../spec-extension/user-agent'
// This file is for modularized imports for next/server to get fully-treeshaking.
export { userAgent as default } from '../spec-extension/user-agent'
...@@ -2,4 +2,4 @@ const GlobalURLPattern = ...@@ -2,4 +2,4 @@ const GlobalURLPattern =
// @ts-expect-error: URLPattern is not available in Node.js // @ts-expect-error: URLPattern is not available in Node.js
typeof URLPattern === 'undefined' ? undefined : URLPattern typeof URLPattern === 'undefined' ? undefined : URLPattern
export default GlobalURLPattern export { GlobalURLPattern as URLPattern }
...@@ -264,11 +264,13 @@ createNextDescribe( ...@@ -264,11 +264,13 @@ createNextDescribe(
}) })
it('should have proper tree-shaking for known modules in CJS', async () => { it('should have proper tree-shaking for known modules in CJS', async () => {
const html = await next.render('/test-middleware') const html = await next.render('/cjs/server')
expect(html).toContain('it works') expect(html).toContain('resolve response')
const middlewareBundle = await next.readFile('.next/server/middleware.js') const outputFile = await next.readFile(
expect(middlewareBundle).not.toContain('image-response') '.next/server/app/cjs/server/page.js'
)
expect(outputFile).not.toContain('image-response')
}) })
it('should use the same async storages if imported directly', async () => { it('should use the same async storages if imported directly', async () => {
...@@ -301,5 +303,14 @@ createNextDescribe( ...@@ -301,5 +303,14 @@ createNextDescribe(
}, /success/) }, /success/)
}) })
}) })
describe('app route', () => {
it('should resolve next/server api from external esm package', async () => {
const res = await next.fetch('/app-routes')
const text = await res.text()
expect(res.status).toBe(200)
expect(text).toBe('get route')
})
})
} }
) )
import { serverApi } from 'server-api-esm'
export function GET(req) {
serverApi(req)
return new Response('get route')
}
import { createResponse } from 'next-server-cjs-lib'
export default async function Page() {
const response = createResponse('resolve response')
const text = await response.text()
return <p>{text}</p>
}
import { createResponse } from 'next-server-cjs-lib'
import { respond } from 'compat-next-server-module' import { respond } from 'compat-next-server-module'
export async function middleware(request) { export async function middleware(request) {
if (request.nextUrl.pathname === '/test-middleware') {
return createResponse('it works')
}
return await respond() return await respond()
} }
import { NextRequest } from 'next/server'
export function serverApi(req) {
return new NextRequest(req)
}
{
"name": "server-api-module",
"type": "module",
"exports": "./index.js"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment