Unverified Commit d0e7d04d authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Revert "add edge rendering for app dir for Turbopack" (#51659)

Reverts vercel/next.js#51631

This breaks the windows builds

x-ref:
https://github.com/vercel/next.js/actions/runs/5344032749/jobs/9687974376
x-ref:
https://github.com/vercel/next.js/actions/runs/5344032749/jobs/9687973522
parent 5871b0d6
This diff is collapsed.
...@@ -42,11 +42,11 @@ swc_core = { version = "0.76.46" } ...@@ -42,11 +42,11 @@ swc_core = { version = "0.76.46" }
testing = { version = "0.33.13" } testing = { version = "0.33.13" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230621.2" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230615.1" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-230621.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230615.1" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230621.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230615.1" }
# General Deps # General Deps
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230621.2", "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230615.1",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
// IPC need to be the first import to allow it to catch errors happening during
// the other imports
import startOperationStreamHandler from '../internal/operation-stream'
import { join } from 'path'
import { parse as parseUrl } from 'node:url'
import { runEdgeFunction } from '../internal/edge'
import { headersFromEntries, initProxiedHeaders } from '../internal/headers'
import { NodeNextRequest } from 'next/dist/server/base-http/node'
import type { IncomingMessage } from 'node:http'
import type { RenderData } from 'types/turbopack'
import chunkGroup from 'INNER_EDGE_CHUNK_GROUP'
import { attachRequestMeta } from '../internal/next-request-helpers'
import { Readable } from 'stream'
startOperationStreamHandler(async (renderData: RenderData, respond) => {
const { response } = await runOperation(renderData)
if (response == null) {
throw new Error('no html returned')
}
const channel = respond({
status: response.status,
// @ts-expect-error Headers is iterable since node.js 18
headers: [...response.headers],
})
if (response.body) {
const reader = response.body.getReader()
for (;;) {
let { done, value } = await reader.read()
if (done) {
break
}
channel.chunk(Buffer.from(value!))
}
}
channel.end()
})
async function runOperation(renderData: RenderData) {
const edgeInfo = {
name: 'edge',
paths: chunkGroup
.filter((chunk) => chunk.endsWith('.js'))
.map((chunk: string) => join(process.cwd(), '.next/server/app', chunk)),
wasm: [],
env: Object.keys(process.env),
assets: [],
}
const parsedUrl = parseUrl(renderData.originalUrl, true)
const incoming = new Readable() as IncomingMessage
incoming.push(null)
incoming.url = renderData.originalUrl
incoming.method = renderData.method
incoming.headers = initProxiedHeaders(
headersFromEntries(renderData.rawHeaders),
renderData.data?.serverInfo
)
const req = new NodeNextRequest(incoming)
attachRequestMeta(req, parsedUrl, req.headers.host!)
const res = await runEdgeFunction({
edgeInfo,
outputDir: 'edge-pages',
req,
query: renderData.rawQuery,
params: renderData.params,
path: renderData.path,
onWarning(warning) {
console.warn(warning)
},
})
return res as { response: Response }
}
// IPC need to be the first import to allow it to catch errors happening during // Provided by the rust generate code
// the other imports type FileType =
import startOperationStreamHandler from '../internal/operation-stream' | 'layout'
| 'template'
import '../polyfill/app-polyfills.ts' | 'error'
| 'loading'
| 'not-found'
| 'head'
declare global {
// an tree of all layouts and the page
const LOADER_TREE: LoaderTree
// array of chunks for the bootstrap script
const BOOTSTRAP: string[]
const IPC: Ipc<unknown, unknown>
}
import type { Ipc } from '@vercel/turbopack-node/ipc/index'
import type { IncomingMessage } from 'node:http' import type { IncomingMessage } from 'node:http'
import type { ClientReferenceManifest } from 'next/dist/build/webpack/plugins/flight-manifest-plugin'
import type { RenderData } from 'types/turbopack' import type { RenderData } from 'types/turbopack'
import type { RenderOpts } from 'next/dist/server/app-render/types' import type { RenderOpts } from 'next/dist/server/app-render/types'
...@@ -14,39 +25,211 @@ import { RSC_VARY_HEADER } from 'next/dist/client/components/app-router-headers' ...@@ -14,39 +25,211 @@ import { RSC_VARY_HEADER } from 'next/dist/client/components/app-router-headers'
import { headersFromEntries, initProxiedHeaders } from '../internal/headers' import { headersFromEntries, initProxiedHeaders } from '../internal/headers'
import { parse, ParsedUrlQuery } from 'node:querystring' import { parse, ParsedUrlQuery } from 'node:querystring'
import { PassThrough } from 'node:stream' import { PassThrough } from 'node:stream'
;('TURBOPACK { chunking-type: isolatedParallel }') ;('TURBOPACK { transition: next-layout-entry; chunking-type: isolatedParallel }')
import entry from 'APP_ENTRY' // @ts-ignore
import BOOTSTRAP from 'APP_BOOTSTRAP' import layoutEntry from './app/layout-entry'
import { createServerResponse } from '../internal/http' import { createServerResponse } from '../internal/http'
import { createManifests, installRequireAndChunkLoad } from './app/manifest'
installRequireAndChunkLoad() globalThis.__next_require__ = (data) => {
const [, , ssr_id] = JSON.parse(data)
return __turbopack_require__(ssr_id)
}
globalThis.__next_chunk_load__ = () => Promise.resolve()
process.env.__NEXT_NEW_LINK_BEHAVIOR = 'true' process.env.__NEXT_NEW_LINK_BEHAVIOR = 'true'
const ipc = IPC as Ipc<IpcIncomingMessage, IpcOutgoingMessage>
type IpcIncomingMessage = {
type: 'headers'
data: RenderData
}
type IpcOutgoingMessage =
| {
type: 'headers'
data: {
status: number
headers: [string, string][]
}
}
| {
type: 'bodyChunk'
data: number[]
}
| {
type: 'bodyEnd'
}
const MIME_TEXT_HTML_UTF8 = 'text/html; charset=utf-8' const MIME_TEXT_HTML_UTF8 = 'text/html; charset=utf-8'
startOperationStreamHandler(async (renderData: RenderData, respond) => { ;(async () => {
const result = await runOperation(renderData) while (true) {
const msg = await ipc.recv()
if (result == null) { let renderData: RenderData
throw new Error('no html returned') switch (msg.type) {
} case 'headers': {
renderData = msg.data
break
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
}
const channel = respond({ const result = await runOperation(renderData)
status: result.statusCode,
headers: result.headers,
})
for await (const chunk of result.body) { if (result == null) {
channel.chunk(chunk as Buffer) throw new Error('no html returned')
} }
ipc.send({
type: 'headers',
data: {
status: result.statusCode,
headers: result.headers,
},
})
for await (const chunk of result.body) {
ipc.send({
type: 'bodyChunk',
data: (chunk as Buffer).toJSON().data,
})
}
channel.end() ipc.send({ type: 'bodyEnd' })
}
})().catch((err) => {
ipc.sendError(err)
}) })
// TODO expose these types in next.js
type ComponentModule = () => any
type ModuleReference = [componentModule: ComponentModule, filePath: string]
export type ComponentsType = {
[componentKey in FileType]?: ModuleReference
} & {
page?: ModuleReference
}
type LoaderTree = [
segment: string,
parallelRoutes: { [parallelRouterKey: string]: LoaderTree },
components: ComponentsType
]
async function runOperation(renderData: RenderData) { async function runOperation(renderData: RenderData) {
const { clientReferenceManifest } = createManifests() const proxyMethodsForModule = (
id: string
): ProxyHandler<ClientReferenceManifest['ssrModuleMapping']> => {
return {
get(_target, prop: string) {
return {
id,
chunks: JSON.parse(id)[1],
name: prop,
}
},
}
}
const proxyMethodsNested = (
type: 'ssrModuleMapping' | 'clientModules' | 'entryCSSFiles'
): ProxyHandler<
| ClientReferenceManifest['ssrModuleMapping']
| ClientReferenceManifest['clientModules']
| ClientReferenceManifest['entryCSSFiles']
> => {
return {
get(_target, key: string) {
if (type === 'ssrModuleMapping') {
return new Proxy({}, proxyMethodsForModule(key as string))
}
if (type === 'clientModules') {
// The key is a `${file}#${name}`, but `file` can contain `#` itself.
// There are 2 possibilities:
// "file#" => id = "file", name = ""
// "file#foo" => id = "file", name = "foo"
const pos = key.lastIndexOf('#')
let id = key
let name = ''
if (pos !== -1) {
id = key.slice(0, pos)
name = key.slice(pos + 1)
} else {
throw new Error('keys need to be formatted as {file}#{name}')
}
return {
id,
name,
chunks: JSON.parse(id)[1],
}
}
if (type === 'entryCSSFiles') {
const cssChunks = JSON.parse(key)
// TODO(WEB-856) subscribe to changes
return {
modules: [],
files: cssChunks.filter(filterAvailable).map(toPath),
}
}
},
}
}
const proxyMethods = (): ProxyHandler<ClientReferenceManifest> => {
const clientModulesProxy = new Proxy(
{},
proxyMethodsNested('clientModules')
)
const ssrModuleMappingProxy = new Proxy(
{},
proxyMethodsNested('ssrModuleMapping')
)
const entryCSSFilesProxy = new Proxy(
{},
proxyMethodsNested('entryCSSFiles')
)
return {
get(_target: any, prop: string) {
if (prop === 'ssrModuleMapping') {
return ssrModuleMappingProxy
}
if (prop === 'clientModules') {
return clientModulesProxy
}
if (prop === 'entryCSSFiles') {
return entryCSSFilesProxy
}
},
}
}
const availableModules = new Set()
const toPath = (chunk: ChunkData) =>
typeof chunk === 'string' ? chunk : chunk.path
/// determines if a chunk is needed based on the current available modules
const filterAvailable = (chunk: ChunkData) => {
if (typeof chunk === 'string') {
return true
} else {
let includedList = chunk.included || []
if (includedList.length === 0) {
return true
}
let needed = false
for (const item of includedList) {
if (!availableModules.has(item)) {
availableModules.add(item)
needed = true
}
}
return needed
}
}
const manifest: ClientReferenceManifest = new Proxy({} as any, proxyMethods())
const req: IncomingMessage = { const req: IncomingMessage = {
url: renderData.originalUrl, url: renderData.originalUrl,
...@@ -83,14 +266,12 @@ async function runOperation(renderData: RenderData) { ...@@ -83,14 +266,12 @@ async function runOperation(renderData: RenderData) {
ampFirstPages: [], ampFirstPages: [],
}, },
ComponentMod: { ComponentMod: {
...entry, ...layoutEntry,
__next_app__: { default: undefined,
require: __next_require__, tree: LOADER_TREE,
loadChunk: __next_chunk_load__,
},
pages: ['page.js'], pages: ['page.js'],
}, },
clientReferenceManifest, clientReferenceManifest: manifest,
runtime: 'nodejs', runtime: 'nodejs',
serverComponents: true, serverComponents: true,
assetPrefix: '', assetPrefix: '',
...@@ -123,3 +304,23 @@ async function runOperation(renderData: RenderData) { ...@@ -123,3 +304,23 @@ async function runOperation(renderData: RenderData) {
body, body,
} }
} }
// This utility is based on https://github.com/zertosh/htmlescape
// License: https://github.com/zertosh/htmlescape/blob/0527ca7156a524d256101bb310a9f970f63078ad/LICENSE
const ESCAPE_LOOKUP = {
'&': '\\u0026',
'>': '\\u003e',
'<': '\\u003c',
'\u2028': '\\u2028',
'\u2029': '\\u2029',
}
const ESCAPE_REGEX = /[&><\u2028\u2029]/g
export function htmlEscapeJsonString(str: string) {
return str.replace(
ESCAPE_REGEX,
(match) => ESCAPE_LOOKUP[match as keyof typeof ESCAPE_LOOKUP]
)
}
import { adapter } from 'next/dist/server/web/adapter'
import { RSC_VARY_HEADER } from 'next/dist/client/components/app-router-headers'
import { IncrementalCache } from 'next/dist/server/lib/incremental-cache'
import { renderToHTMLOrFlight } from 'next/dist/server/app-render/app-render'
;('TURBOPACK { chunking-type: isolatedParallel }')
import entry from 'APP_ENTRY'
import BOOTSTRAP from 'APP_BOOTSTRAP'
import { createManifests, installRequireAndChunkLoad } from './manifest'
import type { NextRequest, NextFetchEvent } from 'next/server'
import type { RenderOpts } from 'next/dist/server/app-render/types'
import type { ParsedUrlQuery } from 'querystring'
installRequireAndChunkLoad()
// avoid limiting stack traces to 10 lines
Error.stackTraceLimit = 100
const { clientReferenceManifest } = createManifests()
const MIME_TEXT_HTML_UTF8 = 'text/html; charset=utf-8'
async function render(request: NextRequest, event: NextFetchEvent) {
const renderOpt: Omit<
RenderOpts,
'App' | 'Document' | 'Component' | 'pathname'
> & { params: ParsedUrlQuery } = {
// TODO(WEB-1195) params
params: {},
supportsDynamicHTML: true,
dev: true,
buildId: 'development',
buildManifest: {
polyfillFiles: [],
rootMainFiles: BOOTSTRAP.filter((path) => path.endsWith('.js')),
devFiles: [],
ampDevFiles: [],
lowPriorityFiles: [],
pages: {
'/_app': [],
},
ampFirstPages: [],
},
ComponentMod: {
...entry,
__next_app__: {
require: __next_require__,
loadChunk: __next_chunk_load__,
},
pages: ['page.js'],
},
clientReferenceManifest,
runtime: 'nodejs',
serverComponents: true,
assetPrefix: '',
pageConfig: {},
reactLoadableManifest: {},
// TODO nextConfigOutput
nextConfigOutput: undefined,
}
const tranform = new TransformStream()
const response = new Response(tranform.readable)
let { pathname, search: query } = new URL(request.url, 'next://')
const result = await renderToHTMLOrFlight(
// @ts-expect-error - TODO renderToHTMLOrFlight types should accept web platform types
request,
response,
pathname,
// TODO(WEB-1195) query
{},
renderOpt as any as RenderOpts
)
response.headers.append(
'Content-Type',
result.contentType || MIME_TEXT_HTML_UTF8
)
response.headers.append('Vary', RSC_VARY_HEADER)
const writer = tranform.writable.getWriter()
result.pipe({
write: (chunk: Uint8Array) => writer.write(chunk),
end: () => writer.close(),
destroy: (reason?: Error) => writer.abort(reason),
})
return response
}
// adapter uses this to detect edge rendering
self.__BUILD_MANIFEST = {}
// @ts-expect-error - exposed for edge support
globalThis._ENTRIES = {
middleware_edge: {
default: function (opts: any) {
return adapter({
...opts,
IncrementalCache,
handler: render,
})
},
},
}
...@@ -12,7 +12,7 @@ import { ...@@ -12,7 +12,7 @@ import {
NodeNextResponse, NodeNextResponse,
} from 'next/dist/server/base-http/node' } from 'next/dist/server/base-http/node'
import { runEdgeFunction, updateResponse } from '../../internal/edge' import { runEdgeFunction } from '../../internal/edge'
import { attachRequestMeta } from '../../internal/next-request-helpers' import { attachRequestMeta } from '../../internal/next-request-helpers'
import chunkGroup from 'ROUTE_CHUNK_GROUP' import chunkGroup from 'ROUTE_CHUNK_GROUP'
...@@ -34,10 +34,11 @@ startHandler(async ({ request, response, query, params, path }) => { ...@@ -34,10 +34,11 @@ startHandler(async ({ request, response, query, params, path }) => {
assets: [], assets: [],
} }
const result = await runEdgeFunction({ await runEdgeFunction({
edgeInfo, edgeInfo,
outputDir: 'app', outputDir: 'app',
req, req,
res,
query, query,
params, params,
path, path,
...@@ -45,6 +46,4 @@ startHandler(async ({ request, response, query, params, path }) => { ...@@ -45,6 +46,4 @@ startHandler(async ({ request, response, query, params, path }) => {
console.warn(warning) console.warn(warning)
}, },
}) })
updateResponse(res, result)
}) })
export { default as AppRouter } from 'next/dist/client/components/app-router'
export { default as LayoutRouter } from 'next/dist/client/components/layout-router'
export { default as RenderFromTemplateContext } from 'next/dist/client/components/render-from-template-context'
export { default as GlobalError } from 'next/dist/client/components/error-boundary'
export { staticGenerationAsyncStorage } from 'next/dist/client/components/static-generation-async-storage'
export { requestAsyncStorage } from 'next/dist/client/components/request-async-storage'
export { actionAsyncStorage } from 'next/dist/client/components/action-async-storage'
export { staticGenerationBailout } from 'next/dist/client/components/static-generation-bailout'
export { default as StaticGenerationSearchParamsBailoutProvider } from 'next/dist/client/components/static-generation-searchparams-bailout-provider'
export { createSearchParamsBailoutProxy } from 'next/dist/client/components/searchparams-bailout-proxy'
import * as serverHooks from 'next/dist/client/components/hooks-server-context'
export { serverHooks }
export {
renderToReadableStream,
decodeReply,
} from 'next/dist/compiled/react-server-dom-webpack/server.edge'
export {
preloadStyle,
preloadFont,
preconnect,
} from 'next/dist/server/app-render/rsc/preloads'
import type { ClientReferenceManifest } from 'next/dist/build/webpack/plugins/flight-manifest-plugin'
export function createManifests() {
const proxyMethodsForModule = (
id: string
): ProxyHandler<ClientReferenceManifest['ssrModuleMapping']> => {
return {
get(_target, prop: string) {
return {
id,
chunks: JSON.parse(id)[1],
name: prop,
}
},
}
}
const availableModules = new Set()
const toPath = (chunk: ChunkData) =>
typeof chunk === 'string' ? chunk : chunk.path
/// determines if a chunk is needed based on the current available modules
const filterAvailable = (chunk: ChunkData) => {
if (typeof chunk === 'string') {
return true
} else {
let includedList = chunk.included || []
if (includedList.length === 0) {
return true
}
let needed = false
for (const item of includedList) {
if (!availableModules.has(item)) {
availableModules.add(item)
needed = true
}
}
return needed
}
}
const proxyMethodsNested = (
type: 'ssrModuleMapping' | 'clientModules' | 'entryCSSFiles'
): ProxyHandler<
| ClientReferenceManifest['ssrModuleMapping']
| ClientReferenceManifest['clientModules']
| ClientReferenceManifest['entryCSSFiles']
> => {
return {
get(_target, key: string) {
if (type === 'ssrModuleMapping') {
return new Proxy({}, proxyMethodsForModule(key as string))
}
if (type === 'clientModules') {
// The key is a `${file}#${name}`, but `file` can contain `#` itself.
// There are 2 possibilities:
// "file#" => id = "file", name = ""
// "file#foo" => id = "file", name = "foo"
const pos = key.lastIndexOf('#')
let id = key
let name = ''
if (pos !== -1) {
id = key.slice(0, pos)
name = key.slice(pos + 1)
} else {
throw new Error('keys need to be formatted as {file}#{name}')
}
return {
id,
name,
chunks: JSON.parse(id)[1],
}
}
if (type === 'entryCSSFiles') {
const cssChunks = JSON.parse(key)
// TODO(WEB-856) subscribe to changes
return {
modules: [],
files: cssChunks.filter(filterAvailable).map(toPath),
}
}
},
}
}
const proxyMethods = (): ProxyHandler<ClientReferenceManifest> => {
const clientModulesProxy = new Proxy(
{},
proxyMethodsNested('clientModules')
)
const ssrModuleMappingProxy = new Proxy(
{},
proxyMethodsNested('ssrModuleMapping')
)
const entryCSSFilesProxy = new Proxy(
{},
proxyMethodsNested('entryCSSFiles')
)
return {
get(_target: any, prop: string) {
if (prop === 'ssrModuleMapping') {
return ssrModuleMappingProxy
}
if (prop === 'clientModules') {
return clientModulesProxy
}
if (prop === 'entryCSSFiles') {
return entryCSSFilesProxy
}
},
}
}
const clientReferenceManifest: ClientReferenceManifest = new Proxy(
{} as any,
proxyMethods()
)
return { clientReferenceManifest }
}
export function installRequireAndChunkLoad() {
globalThis.__next_require__ = (data) => {
const [, , ssr_id] = JSON.parse(data)
return __turbopack_require__(ssr_id)
}
globalThis.__next_chunk_load__ = () => Promise.resolve()
}
// IPC need to be the first import to allow it to catch errors happening during // IPC need to be the first import to allow it to catch errors happening during
// the other imports // the other imports
import startHandler from '../../internal/nodejs-proxy-handler' import startHandler from '../../internal/api-server-handler'
import '../../polyfill/app-polyfills'
import { parse as parseUrl } from 'node:url'
import {
NodeNextRequest,
NodeNextResponse,
} from 'next/dist/server/base-http/node'
import { sendResponse } from 'next/dist/server/send-response'
import { NextRequestAdapter } from 'next/dist/server/web/spec-extension/adapters/next-request'
import { RouteHandlerManagerContext } from 'next/dist/server/future/route-handler-managers/route-handler-manager'
import { attachRequestMeta } from '../../internal/next-request-helpers'
import RouteModule from 'ROUTE_MODULE' import RouteModule from 'ROUTE_MODULE'
import * as userland from 'ENTRY' import * as userland from 'ENTRY'
...@@ -20,4 +34,33 @@ const routeModule = new RouteModule({ ...@@ -20,4 +34,33 @@ const routeModule = new RouteModule({
nextConfigOutput: undefined, nextConfigOutput: undefined,
}) })
startHandler(routeModule) startHandler(async ({ request, response, query, params, path }) => {
const req = new NodeNextRequest(request)
const res = new NodeNextResponse(response)
const parsedUrl = parseUrl(req.url!, true)
attachRequestMeta(req, parsedUrl, request.headers.host!)
const context: RouteHandlerManagerContext = {
params,
prerenderManifest: {
version: -1 as any, // letting us know this doesn't conform to spec
routes: {},
dynamicRoutes: {},
notFoundRoutes: [],
preview: {
previewModeId: 'development-id',
} as any,
},
staticGenerationContext: {
supportsDynamicHTML: true,
},
}
const routeResponse = await routeModule.handle(
NextRequestAdapter.fromNodeNextRequest(req),
context
)
await sendResponse(req, res, routeResponse)
})
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
} from 'next/dist/server/base-http/node' } from 'next/dist/server/base-http/node'
import { attachRequestMeta } from '../internal/next-request-helpers' import { attachRequestMeta } from '../internal/next-request-helpers'
import { runEdgeFunction, updateResponse } from '../internal/edge' import { runEdgeFunction } from '../internal/edge'
import chunkGroup from 'INNER_EDGE_CHUNK_GROUP' import chunkGroup from 'INNER_EDGE_CHUNK_GROUP'
...@@ -34,10 +34,11 @@ startHandler(async ({ request, response, query, params, path }) => { ...@@ -34,10 +34,11 @@ startHandler(async ({ request, response, query, params, path }) => {
assets: [], assets: [],
} }
const result = await runEdgeFunction({ await runEdgeFunction({
edgeInfo, edgeInfo,
outputDir: 'pages', outputDir: 'pages',
req, req,
res,
query, query,
params, params,
path, path,
...@@ -45,6 +46,4 @@ startHandler(async ({ request, response, query, params, path }) => { ...@@ -45,6 +46,4 @@ startHandler(async ({ request, response, query, params, path }) => {
console.warn(warning) console.warn(warning)
}, },
}) })
await updateResponse(res, result)
}) })
// IPC need to be the first import to allow it to catch errors happening during // IPC need to be the first import to allow it to catch errors happening during
// the other imports // the other imports
import startOperationStreamHandler from './operation-stream' import { IPC } from '@vercel/turbopack-node/ipc/index'
import type { ClientRequest, IncomingMessage, Server } from 'node:http' import type { ClientRequest, IncomingMessage, Server } from 'node:http'
import type { ServerResponse } from 'node:http' import type { ServerResponse } from 'node:http'
import { Buffer } from 'node:buffer' import { Buffer } from 'node:buffer'
import type { Ipc } from '@vercel/turbopack-node/ipc/index'
import type { RenderData } from 'types/turbopack' import type { RenderData } from 'types/turbopack'
import { createServer, makeRequest } from '../internal/server' import { createServer, makeRequest } from '../internal/server'
import { toPairs } from '../internal/headers' import { toPairs } from '../internal/headers'
const ipc = IPC as Ipc<IpcIncomingMessage, IpcOutgoingMessage>
type IpcIncomingMessage =
| {
type: 'headers'
data: RenderData
}
| {
type: 'bodyChunk'
data: number[]
}
| { type: 'bodyEnd' }
type IpcOutgoingMessage =
| {
type: 'headers'
data: ResponseHeaders
}
| {
type: 'bodyChunk'
data: number[]
}
| {
type: 'bodyEnd'
}
type ResponseHeaders = {
status: number
headers: [string, string][]
}
type Handler = (data: { type Handler = (data: {
request: IncomingMessage request: IncomingMessage
response: ServerResponse<IncomingMessage> response: ServerResponse<IncomingMessage>
...@@ -25,96 +58,134 @@ type Operation = { ...@@ -25,96 +58,134 @@ type Operation = {
server: Server server: Server
} }
type ResponseHeaders = {
status: number
headers: [string, string][]
}
export default function startHandler(handler: Handler): void { export default function startHandler(handler: Handler): void {
startOperationStreamHandler( ;(async () => {
async (renderData: RenderData, respond, reportError) => { while (true) {
const operationPromise = (async function createOperation() { let operationPromise: Promise<Operation> | null = null
const server = await createServer()
const {
clientRequest,
clientResponsePromise,
serverRequest,
serverResponse,
} = await makeRequest(
server,
renderData.method,
renderData.path,
renderData.rawQuery,
renderData.rawHeaders,
renderData.data?.serverInfo
)
return {
clientRequest,
server,
clientResponsePromise,
apiOperation: handler({
request: serverRequest,
response: serverResponse,
query: renderData.rawQuery,
params: renderData.params,
path: renderData.path,
}),
}
})()
function handleClientResponse(
server: Server,
clientResponse: IncomingMessage
) {
const responseHeaders: ResponseHeaders = {
status: clientResponse.statusCode!,
headers: toPairs(clientResponse.rawHeaders),
}
const channel = respond(responseHeaders)
clientResponse.on('data', (chunk) => {
channel.chunk(chunk)
})
clientResponse.once('end', () => { const msg = await ipc.recv()
channel.end()
server.close()
})
clientResponse.once('error', (err) => { switch (msg.type) {
reportError(err) case 'headers': {
}) operationPromise = createOperation(msg.data)
break
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
} }
/** let body = Buffer.alloc(0)
* Ends an operation by writing the response body to the client and waiting for the Next.js API resolver to finish. let operation: Operation
*/ loop: while (true) {
async function endOperation(operation: Operation, body: Buffer) { const msg = await ipc.recv()
operation.clientRequest.end(body)
switch (msg.type) {
try { case 'bodyChunk': {
await operation.apiOperation body = Buffer.concat([body, Buffer.from(msg.data)])
} catch (error) { break
await reportError(error) }
return case 'bodyEnd': {
operation = await operationPromise
break loop
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
} }
} }
return { await Promise.all([
streamRequest: false, endOperation(operation, body),
onBody: async (body) => { operation.clientResponsePromise.then((clientResponse) =>
const operation = await operationPromise handleClientResponse(operation.server, clientResponse)
await Promise.all([ ),
endOperation(operation, body), ])
operation.clientResponsePromise.then((clientResponse) => }
handleClientResponse(operation.server, clientResponse) })().catch((err) => {
), ipc.sendError(err)
]) })
},
async function createOperation(renderData: RenderData): Promise<Operation> {
const server = await createServer()
const {
clientRequest,
clientResponsePromise,
serverRequest,
serverResponse,
} = await makeRequest(
server,
renderData.method,
renderData.path,
renderData.rawQuery,
renderData.rawHeaders,
renderData.data?.serverInfo
)
return {
clientRequest,
server,
clientResponsePromise,
apiOperation: handler({
request: serverRequest,
response: serverResponse,
query: renderData.rawQuery,
params: renderData.params,
path: renderData.path,
}),
}
}
function handleClientResponse(
server: Server,
clientResponse: IncomingMessage
) {
const responseHeaders: ResponseHeaders = {
status: clientResponse.statusCode!,
headers: toPairs(clientResponse.rawHeaders),
}
ipc.send({
type: 'headers',
data: responseHeaders,
})
clientResponse.on('data', (chunk) => {
ipc.send({
type: 'bodyChunk',
data: chunk.toJSON().data,
})
})
clientResponse.once('end', () => {
ipc.send({ type: 'bodyEnd' })
server.close()
})
clientResponse.once('error', (err) => {
ipc.sendError(err)
})
}
/**
* Ends an operation by writing the response body to the client and waiting for the Next.js API resolver to finish.
*/
async function endOperation(operation: Operation, body: Buffer) {
operation.clientRequest.end(body)
try {
await operation.apiOperation
} catch (error) {
if (error instanceof Error) {
await ipc.sendError(error)
} else {
await ipc.sendError(new Error('an unknown error occurred'))
} }
return
} }
) }
} }
...@@ -10,7 +10,7 @@ import type { ...@@ -10,7 +10,7 @@ import type {
} from 'next/dist/server/base-http/node' } from 'next/dist/server/base-http/node'
import { parse, ParsedUrlQuery } from 'querystring' import { parse, ParsedUrlQuery } from 'querystring'
import type { Params } from 'next/dist/shared/lib/router/utils/route-matcher' import type { Params } from 'next/dist/shared/lib/router/utils/route-matcher'
import type { FetchEventResult } from 'next/dist/server/web/types' import { FetchEventResult } from 'next/dist/server/web/types'
import { getCloneableBody } from 'next/dist/server/body-streams' import { getCloneableBody } from 'next/dist/server/body-streams'
// This is an adapted version of a similar function in next-dev-server. // This is an adapted version of a similar function in next-dev-server.
...@@ -19,6 +19,7 @@ export async function runEdgeFunction({ ...@@ -19,6 +19,7 @@ export async function runEdgeFunction({
edgeInfo, edgeInfo,
outputDir, outputDir,
req, req,
res,
query, query,
params, params,
path, path,
...@@ -33,11 +34,12 @@ export async function runEdgeFunction({ ...@@ -33,11 +34,12 @@ export async function runEdgeFunction({
} }
outputDir: string outputDir: string
req: BaseNextRequest | NodeNextRequest req: BaseNextRequest | NodeNextRequest
res: BaseNextResponse | NodeNextResponse
query: string query: string
path: string path: string
params: Params | undefined params: Params | undefined
onWarning?: (warning: Error) => void onWarning?: (warning: Error) => void
}): Promise<FetchEventResult> { }): Promise<FetchEventResult | null> {
// For edge to "fetch" we must always provide an absolute URL // For edge to "fetch" we must always provide an absolute URL
const initialUrl = new URL(path, 'http://n') const initialUrl = new URL(path, 'http://n')
const parsedQuery = parse(query) const parsedQuery = parse(query)
...@@ -81,28 +83,21 @@ export async function runEdgeFunction({ ...@@ -81,28 +83,21 @@ export async function runEdgeFunction({
onWarning, onWarning,
})) as FetchEventResult })) as FetchEventResult
return result res.statusCode = result.response.status
} res.statusMessage = result.response.statusText
export async function updateResponse(
response: BaseNextResponse<any> | NodeNextResponse,
result: FetchEventResult
) {
response.statusCode = result.response.status
response.statusMessage = result.response.statusText
result.response.headers.forEach((value: string, key) => { result.response.headers.forEach((value: string, key) => {
// the append handling is special cased for `set-cookie` // the append handling is special cased for `set-cookie`
if (key.toLowerCase() === 'set-cookie') { if (key.toLowerCase() === 'set-cookie') {
response.setHeader(key, value) res.setHeader(key, value)
} else { } else {
response.appendHeader(key, value) res.appendHeader(key, value)
} }
}) })
if (result.response.body) { if (result.response.body) {
// TODO(gal): not sure that we always need to stream // TODO(gal): not sure that we always need to stream
const nodeResStream = (response as NodeNextResponse).originalResponse const nodeResStream = (res as NodeNextResponse).originalResponse
const { const {
consumeUint8ArrayReadableStream, consumeUint8ArrayReadableStream,
} = require('next/dist/compiled/edge-runtime') } = require('next/dist/compiled/edge-runtime')
...@@ -116,8 +111,10 @@ export async function updateResponse( ...@@ -116,8 +111,10 @@ export async function updateResponse(
nodeResStream.end() nodeResStream.end()
} }
} else { } else {
;(response as NodeNextResponse).originalResponse.end() ;(res as NodeNextResponse).originalResponse.end()
} }
return result
} }
function stringifyUrlQueryParam(param: unknown): string { function stringifyUrlQueryParam(param: unknown): string {
......
// IPC need to be the first import to allow it to catch errors happening during
// the other imports
import startHandler from './api-server-handler'
import '../polyfill/app-polyfills'
import { parse as parseUrl } from 'node:url'
import {
NodeNextRequest,
NodeNextResponse,
} from 'next/dist/server/base-http/node'
import { sendResponse } from 'next/dist/server/send-response'
import { NextRequestAdapter } from 'next/dist/server/web/spec-extension/adapters/next-request'
import { RouteHandlerManagerContext } from 'next/dist/server/future/route-handler-managers/route-handler-manager'
import { attachRequestMeta } from './next-request-helpers'
import type { RouteModule } from 'next/dist/server/future/route-modules/route-module'
export default (routeModule: RouteModule) => {
startHandler(async ({ request, response, params }) => {
const req = new NodeNextRequest(request)
const res = new NodeNextResponse(response)
const parsedUrl = parseUrl(req.url!, true)
attachRequestMeta(req, parsedUrl, request.headers.host!)
const context: RouteHandlerManagerContext = {
params,
prerenderManifest: {
version: -1 as any, // letting us know this doesn't conform to spec
routes: {},
dynamicRoutes: {},
notFoundRoutes: [],
preview: {
previewModeId: 'development-id',
} as any,
},
staticGenerationContext: {
supportsDynamicHTML: true,
},
}
const routeResponse = await routeModule.handle(
NextRequestAdapter.fromNodeNextRequest(req),
context
)
await sendResponse(req, res, routeResponse)
})
}
// IPC need to be the first import to allow it to catch errors happening during
// the other imports
import { IPC } from '@vercel/turbopack-node/ipc/index'
import { Buffer } from 'node:buffer'
import type { Ipc } from '@vercel/turbopack-node/ipc/index'
type Operation =
| {
streamRequest: true
onChunk?: (chunk: Buffer) => Promise<void>
onEnd?: () => Promise<void>
}
| {
streamRequest?: false
onBody?: (body: Buffer) => Promise<void>
}
type IpcIncomingMessage<T> =
| {
type: 'headers'
data: T
}
| {
type: 'bodyChunk'
data: number[]
}
| {
type: 'bodyText'
data: number[]
}
| { type: 'bodyEnd' }
type IpcOutgoingMessage<R> =
| {
type: 'headers'
data: R
}
| {
type: 'bodyChunk'
data: number[]
}
| {
type: 'bodyEnd'
}
interface Response {
chunk: (data: Buffer) => Promise<void>
end: () => Promise<void>
}
export default function startHandler<T, R>(
createOperation: (
data: T,
respond: (data: R) => Response,
reportError: (error: unknown) => Promise<never>
) => Promise<Operation | void>
) {
const ipc = IPC as Ipc<IpcIncomingMessage<T>, IpcOutgoingMessage<R>>
;(async () => {
while (true) {
let operation: Operation | void
{
const msg = await ipc.recv()
switch (msg.type) {
case 'headers': {
operation = await createOperation(
msg.data,
(data) => {
ipc.send({
type: 'headers',
data,
})
return {
chunk: (buf: Buffer) => {
return ipc.send({
type: 'bodyChunk',
data: buf.toJSON().data,
})
},
end: () => {
return ipc.send({ type: 'bodyEnd' })
},
}
},
(error) => {
return ipc.sendError(
error instanceof Error
? error
: new Error(`an unknown error occurred: ${error}`)
)
}
)
break
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
}
}
if (operation) {
if (operation.streamRequest) {
loop: while (true) {
const msg = await ipc.recv()
switch (msg.type) {
case 'bodyChunk':
case 'bodyText': {
await operation.onChunk?.(Buffer.from(msg.data))
break
}
case 'bodyEnd': {
await operation.onEnd?.()
break loop
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
}
}
} else {
let body = Buffer.alloc(0)
loop: while (true) {
const msg = await ipc.recv()
switch (msg.type) {
case 'bodyChunk':
case 'bodyText': {
body = Buffer.concat([body, Buffer.from(msg.data)])
break
}
case 'bodyEnd': {
await operation.onBody?.(body)
break loop
}
default: {
console.error('unexpected message type', msg.type)
process.exit(1)
}
}
}
}
}
}
})().catch((err) => {
ipc.sendError(err)
})
}
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
"@vercel/turbopack-next/pages/_app": ["node_modules/next/app"], "@vercel/turbopack-next/pages/_app": ["node_modules/next/app"],
"@vercel/turbopack-next/pages/_document": ["node_modules/next/document"], "@vercel/turbopack-next/pages/_document": ["node_modules/next/document"],
"@vercel/turbopack-next/pages/_error": ["node_modules/next/error"], "@vercel/turbopack-next/pages/_error": ["node_modules/next/error"],
"@vercel/turbopack-next/internal/_error": ["node_modules/next/error"] "@vercel/turbopack-next/internal/_error": ["node_modules/next/error"],
"next/*": ["node_modules/next/*"]
}, },
"resolveJsonModule": true, "resolveJsonModule": true,
"types": ["react/next"], "types": ["react/next"],
......
declare module 'next/dist/compiled/react-server-dom-webpack/client' declare module 'next/dist/compiled/react-server-dom-webpack/client'
declare module 'next/dist/client/app-call-server'
...@@ -80,17 +80,6 @@ declare module 'BOOTSTRAP_CONFIG' { ...@@ -80,17 +80,6 @@ declare module 'BOOTSTRAP_CONFIG' {
export const KIND: RouteKind export const KIND: RouteKind
} }
declare module 'APP_BOOTSTRAP' {
const chunks: Array<string>
export default chunks
}
declare module 'APP_ENTRY' {
export const tree: any
export const pathname: string
// and more...
}
declare module 'CLIENT_MODULE' { declare module 'CLIENT_MODULE' {
export const __turbopack_module_id__: string export const __turbopack_module_id__: string
} }
......
...@@ -2,7 +2,7 @@ use std::collections::HashMap; ...@@ -2,7 +2,7 @@ use std::collections::HashMap;
use turbopack_binding::turbo::tasks_fs::FileSystemPathVc; use turbopack_binding::turbo::tasks_fs::FileSystemPathVc;
pub mod next_server_component_transition; pub mod next_layout_entry_transition;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct LayoutSegment { pub struct LayoutSegment {
......
...@@ -13,10 +13,7 @@ use turbopack_binding::{ ...@@ -13,10 +13,7 @@ use turbopack_binding::{
}, },
}; };
use crate::next_client_component::{ use crate::next_client_component::with_client_chunks::WithClientChunksAsset;
with_chunking_context_scope_asset::WithChunkingContextScopeAsset,
with_client_chunks::WithClientChunksAsset,
};
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct NextServerComponentTransition { pub struct NextServerComponentTransition {
...@@ -62,15 +59,10 @@ impl Transition for NextServerComponentTransition { ...@@ -62,15 +59,10 @@ impl Transition for NextServerComponentTransition {
bail!("Not an ecmascript module"); bail!("Not an ecmascript module");
}; };
Ok(WithChunkingContextScopeAsset { Ok(WithClientChunksAsset {
asset: WithClientChunksAsset { asset,
asset, // next.js code already adds _next prefix
// next.js code already adds _next prefix server_root: self.server_root.join("_next"),
server_root: self.server_root.join("_next"),
}
.cell()
.into(),
layer: "rsc".to_string(),
} }
.cell() .cell()
.into()) .into())
......
use std::ops::Deref; use std::ops::Deref;
use anyhow::{bail, Result}; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
use swc_core::{ use swc_core::{
common::{source_map::Pos, Span, Spanned}, common::{source_map::Pos, Span, Spanned},
ecma::ast::{Expr, Ident, Program}, ecma::ast::{Expr, Ident, Program},
}; };
use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs, TryJoinIterExt}; use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_fs::FileSystemPathVc;
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetVc}, asset::{Asset, AssetVc},
context::{AssetContext, AssetContextVc},
ident::AssetIdentVc, ident::AssetIdentVc,
issue::{ issue::{
Issue, IssueSeverity, IssueSeverityVc, IssueSourceVc, IssueVc, OptionIssueSourceVc, Issue, IssueSeverity, IssueSeverityVc, IssueSourceVc, IssueVc, OptionIssueSourceVc,
}, },
reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
source_asset::SourceAssetVc,
}, },
ecmascript::{ ecmascript::{
analyzer::{graph::EvalContext, JsValue}, analyzer::{graph::EvalContext, JsValue},
...@@ -27,7 +24,7 @@ use turbopack_binding::turbopack::{ ...@@ -27,7 +24,7 @@ use turbopack_binding::turbopack::{
}, },
}; };
use crate::{app_structure::LoaderTreeVc, util::NextRuntime}; use crate::util::NextRuntime;
#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
...@@ -53,14 +50,15 @@ pub enum NextSegmentFetchCache { ...@@ -53,14 +50,15 @@ pub enum NextSegmentFetchCache {
} }
#[turbo_tasks::value] #[turbo_tasks::value]
#[derive(Debug, Default)] #[derive(Debug)]
#[serde(rename_all = "camelCase")]
pub struct NextSegmentConfig { pub struct NextSegmentConfig {
pub dynamic: Option<NextSegmentDynamic>, pub dynamic: NextSegmentDynamic,
pub dynamic_params: Option<bool>, pub dynamic_params: bool,
pub revalidate: Option<bool>, pub revalidate: bool,
pub fetch_cache: Option<NextSegmentFetchCache>, pub fetch_cache: NextSegmentFetchCache,
pub runtime: Option<NextRuntime>, pub runtime: NextRuntime,
pub preferred_region: Option<String>, pub referred_region: String,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -71,73 +69,16 @@ impl NextSegmentConfigVc { ...@@ -71,73 +69,16 @@ impl NextSegmentConfigVc {
} }
} }
impl NextSegmentConfig { impl Default for NextSegmentConfig {
/// Applies the parent config to this config, setting any unset values to fn default() -> Self {
/// the parent's values. NextSegmentConfig {
pub fn apply_parent_config(&mut self, parent: &Self) { dynamic: Default::default(),
let NextSegmentConfig { dynamic_params: true,
dynamic, revalidate: false,
dynamic_params, fetch_cache: Default::default(),
revalidate, runtime: Default::default(),
fetch_cache, referred_region: "auto".to_string(),
runtime,
preferred_region,
} = self;
*dynamic = dynamic.or(parent.dynamic);
*dynamic_params = dynamic_params.or(parent.dynamic_params);
*revalidate = revalidate.or(parent.revalidate);
*fetch_cache = fetch_cache.or(parent.fetch_cache);
*runtime = runtime.or(parent.runtime);
*preferred_region = preferred_region.take().or(parent.preferred_region.clone());
}
/// Applies a config from a paralllel route to this config, returning an
/// error if there are conflicting values.
pub fn apply_parallel_config(&mut self, parallel_config: &Self) -> Result<()> {
fn merge_parallel<T: PartialEq + Clone>(
a: &mut Option<T>,
b: &Option<T>,
name: &str,
) -> Result<()> {
match (a.as_ref(), b) {
(Some(a), Some(b)) => {
if *a != *b {
bail!(
"Sibling segment configs have conflicting values for {}",
name
)
}
}
(None, Some(b)) => {
*a = Some(b.clone());
}
_ => {}
}
Ok(())
} }
let Self {
dynamic,
dynamic_params,
revalidate,
fetch_cache,
runtime,
preferred_region,
} = self;
merge_parallel(dynamic, &parallel_config.dynamic, "dynamic")?;
merge_parallel(
dynamic_params,
&parallel_config.dynamic_params,
"dynamicParams",
)?;
merge_parallel(revalidate, &parallel_config.revalidate, "revalidate")?;
merge_parallel(fetch_cache, &parallel_config.fetch_cache, "fetchCache")?;
merge_parallel(runtime, &parallel_config.runtime, "runtime")?;
merge_parallel(
preferred_region,
&parallel_config.preferred_region,
"referredRegion",
)?;
Ok(())
} }
} }
...@@ -275,7 +216,7 @@ fn parse_config_value( ...@@ -275,7 +216,7 @@ fn parse_config_value(
}; };
config.dynamic = match serde_json::from_value(Value::String(val.to_string())) { config.dynamic = match serde_json::from_value(Value::String(val.to_string())) {
Ok(dynamic) => Some(dynamic), Ok(dynamic) => dynamic,
Err(err) => { Err(err) => {
return invalid_config( return invalid_config(
&format!("`dynamic` has an invalid value: {}", err), &format!("`dynamic` has an invalid value: {}", err),
...@@ -290,7 +231,7 @@ fn parse_config_value( ...@@ -290,7 +231,7 @@ fn parse_config_value(
return invalid_config("`dynamicParams` needs to be a static boolean", &value); return invalid_config("`dynamicParams` needs to be a static boolean", &value);
}; };
config.dynamic_params = Some(val); config.dynamic_params = val;
} }
"revalidate" => { "revalidate" => {
let value = eval_context.eval(init); let value = eval_context.eval(init);
...@@ -298,7 +239,7 @@ fn parse_config_value( ...@@ -298,7 +239,7 @@ fn parse_config_value(
return invalid_config("`revalidate` needs to be a static boolean", &value); return invalid_config("`revalidate` needs to be a static boolean", &value);
}; };
config.revalidate = Some(val); config.revalidate = val;
} }
"fetchCache" => { "fetchCache" => {
let value = eval_context.eval(init); let value = eval_context.eval(init);
...@@ -307,7 +248,7 @@ fn parse_config_value( ...@@ -307,7 +248,7 @@ fn parse_config_value(
}; };
config.fetch_cache = match serde_json::from_value(Value::String(val.to_string())) { config.fetch_cache = match serde_json::from_value(Value::String(val.to_string())) {
Ok(fetch_cache) => Some(fetch_cache), Ok(fetch_cache) => fetch_cache,
Err(err) => { Err(err) => {
return invalid_config( return invalid_config(
&format!("`fetchCache` has an invalid value: {}", err), &format!("`fetchCache` has an invalid value: {}", err),
...@@ -323,7 +264,7 @@ fn parse_config_value( ...@@ -323,7 +264,7 @@ fn parse_config_value(
}; };
config.runtime = match serde_json::from_value(Value::String(val.to_string())) { config.runtime = match serde_json::from_value(Value::String(val.to_string())) {
Ok(runtime) => Some(runtime), Ok(runtime) => runtime,
Err(err) => { Err(err) => {
return invalid_config( return invalid_config(
&format!("`runtime` has an invalid value: {}", err), &format!("`runtime` has an invalid value: {}", err),
...@@ -338,43 +279,8 @@ fn parse_config_value( ...@@ -338,43 +279,8 @@ fn parse_config_value(
return invalid_config("`preferredRegion` needs to be a static string", &value); return invalid_config("`preferredRegion` needs to be a static string", &value);
}; };
config.preferred_region = Some(val.to_string()); config.referred_region = val.to_string();
} }
_ => {} _ => {}
} }
} }
#[turbo_tasks::function]
pub async fn parse_segment_config_from_loader_tree(
loader_tree: LoaderTreeVc,
context: AssetContextVc,
) -> Result<NextSegmentConfigVc> {
let loader_tree = loader_tree.await?;
let components = loader_tree.components.await?;
let mut config = NextSegmentConfig::default();
let parallel_configs = loader_tree
.parallel_routes
.values()
.copied()
.map(|tree| parse_segment_config_from_loader_tree(tree, context))
.try_join()
.await?;
for tree in parallel_configs {
config.apply_parallel_config(&tree)?;
}
for component in [components.page, components.default, components.layout]
.into_iter()
.flatten()
{
config.apply_parent_config(
&*parse_segment_config_from_source(context.process(
SourceAssetVc::new(component).into(),
turbo_tasks::Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined,
)),
))
.await?,
);
}
Ok(config.cell())
}
use anyhow::{bail, Result}; use anyhow::{bail, Context, Result};
use indexmap::{indexmap, IndexMap}; use indexmap::{indexmap, IndexMap};
use turbo_tasks::{Value, ValueToString}; use turbo_tasks::Value;
use turbo_tasks_fs::{File, FileSystemPathVc}; use turbo_tasks_fs::{File, FileSystemPathVc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
...@@ -80,13 +80,10 @@ pub async fn bootstrap( ...@@ -80,13 +80,10 @@ pub async fn bootstrap(
config: BootstrapConfigVc, config: BootstrapConfigVc,
) -> Result<EvaluatableAssetVc> { ) -> Result<EvaluatableAssetVc> {
let path = asset.ident().path().await?; let path = asset.ident().path().await?;
let Some(path) = base_path.await?.get_path_to(&path) else { let path = base_path
bail!( .await?
"asset {} is not in base path {}", .get_path_to(&path)
asset.ident().to_string().await?, .context("asset is not in base_path")?;
base_path.to_string().await?
);
};
let path = if let Some((name, ext)) = path.rsplit_once('.') { let path = if let Some((name, ext)) = path.rsplit_once('.') {
if !ext.contains('/') { if !ext.contains('/') {
name name
......
pub mod context; pub mod context;
pub mod page_transition; pub mod transition;
pub mod route_transition;
use anyhow::{bail, Result};
use indexmap::indexmap;
use turbo_tasks::Value;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc,
turbopack::{
core::{
asset::AssetVc,
chunk::{ChunkableAssetVc, ChunkingContextVc},
compile_time_info::CompileTimeInfoVc,
context::AssetContext,
reference_type::{EcmaScriptModulesReferenceSubType, InnerAssetsVc, ReferenceType},
source_asset::SourceAssetVc,
},
ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset,
turbopack::{
module_options::ModuleOptionsContextVc,
resolve_options_context::ResolveOptionsContextVc,
transition::{Transition, TransitionVc},
ModuleAssetContextVc,
},
},
};
use crate::embed_js::next_js_file_path;
/// Transition into edge environment to render an app directory page.
///
/// It changes the environment to the provided edge environment, and wraps the
/// process asset with the provided bootstrap_asset returning the chunks of all
/// that for running them in the edge sandbox.
#[turbo_tasks::value(shared)]
pub struct NextEdgePageTransition {
pub edge_compile_time_info: CompileTimeInfoVc,
pub edge_chunking_context: ChunkingContextVc,
pub edge_module_options_context: Option<ModuleOptionsContextVc>,
pub edge_resolve_options_context: ResolveOptionsContextVc,
pub output_path: FileSystemPathVc,
pub bootstrap_asset: AssetVc,
}
#[turbo_tasks::value_impl]
impl Transition for NextEdgePageTransition {
#[turbo_tasks::function]
fn process_compile_time_info(
&self,
_compile_time_info: CompileTimeInfoVc,
) -> CompileTimeInfoVc {
self.edge_compile_time_info
}
#[turbo_tasks::function]
fn process_module_options_context(
&self,
context: ModuleOptionsContextVc,
) -> ModuleOptionsContextVc {
self.edge_module_options_context.unwrap_or(context)
}
#[turbo_tasks::function]
fn process_resolve_options_context(
&self,
_context: ResolveOptionsContextVc,
) -> ResolveOptionsContextVc {
self.edge_resolve_options_context
}
#[turbo_tasks::function]
async fn process_module(
&self,
asset: AssetVc,
context: ModuleAssetContextVc,
) -> Result<AssetVc> {
let asset = context.process(
self.bootstrap_asset,
Value::new(ReferenceType::Internal(InnerAssetsVc::cell(indexmap! {
"APP_ENTRY".to_string() => asset,
"APP_BOOTSTRAP".to_string() => context.with_transition("next-client").process(
SourceAssetVc::new(next_js_file_path("entry/app/hydrate.tsx")).into(),
Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined,
)),
),
}))),
);
let Some(asset) = ChunkableAssetVc::resolve_from(asset).await? else {
bail!("Internal module is not evaluatable");
};
let asset = ChunkGroupFilesAsset {
asset,
client_root: self.output_path,
chunking_context: self.edge_chunking_context,
runtime_entries: None,
};
Ok(asset.cell().into())
}
}
...@@ -17,7 +17,7 @@ use turbopack_binding::{ ...@@ -17,7 +17,7 @@ use turbopack_binding::{
use crate::bootstrap::{route_bootstrap, BootstrapConfigVc}; use crate::bootstrap::{route_bootstrap, BootstrapConfigVc};
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct NextEdgeRouteTransition { pub struct NextEdgeTransition {
pub edge_compile_time_info: CompileTimeInfoVc, pub edge_compile_time_info: CompileTimeInfoVc,
pub edge_chunking_context: ChunkingContextVc, pub edge_chunking_context: ChunkingContextVc,
pub edge_module_options_context: Option<ModuleOptionsContextVc>, pub edge_module_options_context: Option<ModuleOptionsContextVc>,
...@@ -29,7 +29,7 @@ pub struct NextEdgeRouteTransition { ...@@ -29,7 +29,7 @@ pub struct NextEdgeRouteTransition {
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Transition for NextEdgeRouteTransition { impl Transition for NextEdgeTransition {
#[turbo_tasks::function] #[turbo_tasks::function]
fn process_compile_time_info( fn process_compile_time_info(
&self, &self,
......
...@@ -209,6 +209,12 @@ pub async fn get_next_server_import_map( ...@@ -209,6 +209,12 @@ pub async fn get_next_server_import_map(
) )
.await?; .await?;
import_map.insert_exact_alias(
"@opentelemetry/api",
// TODO(WEB-625) this actually need to prefer the local version of @opentelemetry/api
ImportMapping::External(Some("next/dist/compiled/@opentelemetry/api".to_string())).into(),
);
let ty = ty.into_value(); let ty = ty.into_value();
insert_next_server_special_aliases(&mut import_map, ty).await?; insert_next_server_special_aliases(&mut import_map, ty).await?;
...@@ -351,12 +357,6 @@ pub async fn insert_next_server_special_aliases( ...@@ -351,12 +357,6 @@ pub async fn insert_next_server_special_aliases(
) -> Result<()> { ) -> Result<()> {
match ty { match ty {
ServerContextType::Pages { pages_dir } => { ServerContextType::Pages { pages_dir } => {
import_map.insert_exact_alias(
"@opentelemetry/api",
// TODO(WEB-625) this actually need to prefer the local version of
// @opentelemetry/api
external_request_to_import_mapping("next/dist/compiled/@opentelemetry/api"),
);
insert_alias_to_alternatives( insert_alias_to_alternatives(
import_map, import_map,
format!("{VIRTUAL_PACKAGE_NAME}/pages/_app"), format!("{VIRTUAL_PACKAGE_NAME}/pages/_app"),
...@@ -386,12 +386,6 @@ pub async fn insert_next_server_special_aliases( ...@@ -386,12 +386,6 @@ pub async fn insert_next_server_special_aliases(
ServerContextType::AppSSR { app_dir } ServerContextType::AppSSR { app_dir }
| ServerContextType::AppRSC { app_dir } | ServerContextType::AppRSC { app_dir }
| ServerContextType::AppRoute { app_dir } => { | ServerContextType::AppRoute { app_dir } => {
import_map.insert_exact_alias(
"@opentelemetry/api",
// TODO(WEB-625) this actually need to prefer the local version of
// @opentelemetry/api
request_to_import_mapping(app_dir, "next/dist/compiled/@opentelemetry/api"),
);
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react", "react",
request_to_import_mapping(app_dir, "next/dist/compiled/react"), request_to_import_mapping(app_dir, "next/dist/compiled/react"),
......
...@@ -62,7 +62,7 @@ use crate::{ ...@@ -62,7 +62,7 @@ use crate::{
next_config::NextConfigVc, next_config::NextConfigVc,
next_edge::{ next_edge::{
context::{get_edge_compile_time_info, get_edge_resolve_options_context}, context::{get_edge_compile_time_info, get_edge_resolve_options_context},
route_transition::NextEdgeRouteTransition, transition::NextEdgeTransition,
}, },
next_route_matcher::{ next_route_matcher::{
NextExactMatcherVc, NextFallbackMatcherVc, NextParamsMatcherVc, NextExactMatcherVc, NextFallbackMatcherVc, NextParamsMatcherVc,
...@@ -168,12 +168,12 @@ pub async fn create_page_source( ...@@ -168,12 +168,12 @@ pub async fn create_page_source(
), ),
edge_compile_time_info.environment(), edge_compile_time_info.environment(),
) )
.reference_chunk_source_maps(should_debug("page_source")) .reference_chunk_source_maps(false)
.build(); .build();
let edge_resolve_options_context = let edge_resolve_options_context =
get_edge_resolve_options_context(project_root, server_ty, next_config, execution_context); get_edge_resolve_options_context(project_root, server_ty, next_config, execution_context);
let next_edge_transition = NextEdgeRouteTransition { let next_edge_transition = NextEdgeTransition {
edge_compile_time_info, edge_compile_time_info,
edge_chunking_context, edge_chunking_context,
edge_module_options_context: None, edge_module_options_context: None,
...@@ -374,7 +374,7 @@ async fn create_page_source_for_file( ...@@ -374,7 +374,7 @@ async fn create_page_source_for_file(
), ),
server_context.compile_time_info().environment(), server_context.compile_time_info().environment(),
) )
.reference_chunk_source_maps(should_debug("page_source")) .reference_chunk_source_maps(false)
.build(); .build();
let data_node_path = node_path.join("data"); let data_node_path = node_path.join("data");
...@@ -389,7 +389,7 @@ async fn create_page_source_for_file( ...@@ -389,7 +389,7 @@ async fn create_page_source_for_file(
), ),
server_context.compile_time_info().environment(), server_context.compile_time_info().environment(),
) )
.reference_chunk_source_maps(should_debug("page_source")) .reference_chunk_source_maps(false)
.build(); .build();
let client_chunking_context = get_client_chunking_context( let client_chunking_context = get_client_chunking_context(
...@@ -534,7 +534,7 @@ async fn create_not_found_page_source( ...@@ -534,7 +534,7 @@ async fn create_not_found_page_source(
), ),
server_context.compile_time_info().environment(), server_context.compile_time_info().environment(),
) )
.reference_chunk_source_maps(should_debug("page_source")) .reference_chunk_source_maps(false)
.build(); .build();
let client_chunking_context = get_client_chunking_context( let client_chunking_context = get_client_chunking_context(
......
...@@ -47,7 +47,7 @@ use crate::{ ...@@ -47,7 +47,7 @@ use crate::{
next_config::NextConfigVc, next_config::NextConfigVc,
next_edge::{ next_edge::{
context::{get_edge_compile_time_info, get_edge_resolve_options_context}, context::{get_edge_compile_time_info, get_edge_resolve_options_context},
route_transition::NextEdgeRouteTransition, transition::NextEdgeTransition,
}, },
next_import_map::get_next_build_import_map, next_import_map::get_next_build_import_map,
next_server::context::{get_server_module_options_context, ServerContextType}, next_server::context::{get_server_module_options_context, ServerContextType},
...@@ -250,7 +250,7 @@ fn edge_transition_map( ...@@ -250,7 +250,7 @@ fn edge_transition_map(
output_path.join("edge/assets"), output_path.join("edge/assets"),
edge_compile_time_info.environment(), edge_compile_time_info.environment(),
) )
.reference_chunk_source_maps(should_debug("router")) .reference_chunk_source_maps(false)
.build(); .build();
let edge_resolve_options_context = get_edge_resolve_options_context( let edge_resolve_options_context = get_edge_resolve_options_context(
...@@ -268,7 +268,7 @@ fn edge_transition_map( ...@@ -268,7 +268,7 @@ fn edge_transition_map(
next_config, next_config,
); );
let next_edge_transition = NextEdgeRouteTransition { let next_edge_transition = NextEdgeTransition {
edge_compile_time_info, edge_compile_time_info,
edge_chunking_context, edge_chunking_context,
edge_module_options_context: Some(server_module_options_context), edge_module_options_context: Some(server_module_options_context),
......
...@@ -92,8 +92,6 @@ lazy_static! { ...@@ -92,8 +92,6 @@ lazy_static! {
static ref DEBUG_BROWSER: bool = env::var("TURBOPACK_DEBUG_BROWSER").is_ok(); static ref DEBUG_BROWSER: bool = env::var("TURBOPACK_DEBUG_BROWSER").is_ok();
/// Only starts the dev server on port 3000, but doesn't spawn a browser or run any tests. /// Only starts the dev server on port 3000, but doesn't spawn a browser or run any tests.
static ref DEBUG_START: bool = env::var("TURBOPACK_DEBUG_START").is_ok(); static ref DEBUG_START: bool = env::var("TURBOPACK_DEBUG_START").is_ok();
/// When using TURBOPACK_DEBUG_START, this will open the browser to the dev server.
static ref DEBUG_OPEN: bool = env::var("TURBOPACK_DEBUG_OPEN").is_ok();
} }
fn run_async_test<'a, T>(future: impl Future<Output = T> + Send + 'a) -> T { fn run_async_test<'a, T>(future: impl Future<Output = T> + Send + 'a) -> T {
...@@ -139,12 +137,19 @@ fn test(resource: PathBuf) { ...@@ -139,12 +137,19 @@ fn test(resource: PathBuf) {
run_result, run_result,
} = run_async_test(run_test(resource)); } = run_async_test(run_test(resource));
let mut messages = vec![]; if !uncaught_exceptions.is_empty() {
panic!(
if run_result.test_results.is_empty() { "Uncaught exception(s) in test:\n{}",
messages.push("No tests were run.".to_string()); uncaught_exceptions.join("\n")
)
} }
assert!(
!run_result.test_results.is_empty(),
"Expected one or more tests to run."
);
let mut messages = vec![];
for test_result in run_result.test_results { for test_result in run_result.test_results {
// It's possible to fail multiple tests across these tests, // It's possible to fail multiple tests across these tests,
// so collect them and fail the respective test in Rust with // so collect them and fail the respective test in Rust with
...@@ -158,10 +163,6 @@ fn test(resource: PathBuf) { ...@@ -158,10 +163,6 @@ fn test(resource: PathBuf) {
} }
} }
for uncaught_exception in uncaught_exceptions {
messages.push(format!("Uncaught exception: {}", uncaught_exception));
}
if !messages.is_empty() { if !messages.is_empty() {
panic!( panic!(
"Failed with error(s) in the following test(s):\n\n{}", "Failed with error(s) in the following test(s):\n\n{}",
...@@ -256,11 +257,7 @@ async fn run_test(resource: PathBuf) -> JsResult { ...@@ -256,11 +257,7 @@ async fn run_test(resource: PathBuf) -> JsResult {
let test_dir = resource_temp.to_path_buf(); let test_dir = resource_temp.to_path_buf();
let workspace_root = cargo_workspace_root.parent().unwrap().parent().unwrap(); let workspace_root = cargo_workspace_root.parent().unwrap().parent().unwrap();
let project_dir = test_dir.join("input"); let project_dir = test_dir.join("input");
let requested_addr = if *DEBUG_START { let requested_addr = get_free_local_addr().unwrap();
"127.0.0.1:3000".parse().unwrap()
} else {
get_free_local_addr().unwrap()
};
let mock_dir = resource_temp.join("__httpmock__"); let mock_dir = resource_temp.join("__httpmock__");
let mock_server_future = get_mock_server_future(&mock_dir); let mock_server_future = get_mock_server_future(&mock_dir);
...@@ -268,95 +265,89 @@ async fn run_test(resource: PathBuf) -> JsResult { ...@@ -268,95 +265,89 @@ async fn run_test(resource: PathBuf) -> JsResult {
let (issue_tx, mut issue_rx) = unbounded_channel(); let (issue_tx, mut issue_rx) = unbounded_channel();
let issue_tx = TransientInstance::new(issue_tx); let issue_tx = TransientInstance::new(issue_tx);
let result; let tt = TurboTasks::new(MemoryBackend::default());
let server = NextDevServerBuilder::new(
{ tt.clone(),
let tt = TurboTasks::new(MemoryBackend::default()); project_dir.to_string_lossy().to_string(),
let server = NextDevServerBuilder::new( workspace_root.to_string_lossy().to_string(),
tt.clone(), )
project_dir.to_string_lossy().to_string(), .entry_request(EntryRequest::Module(
workspace_root.to_string_lossy().to_string(), "@turbo/pack-test-harness".to_string(),
) "/harness".to_string(),
.entry_request(EntryRequest::Module( ))
"@turbo/pack-test-harness".to_string(), .entry_request(EntryRequest::Relative("index.js".to_owned()))
"/harness".to_string(), .eager_compile(false)
)) .hostname(requested_addr.ip())
.entry_request(EntryRequest::Relative("index.js".to_owned())) .port(requested_addr.port())
.eager_compile(false) .log_level(turbopack_binding::turbopack::core::issue::IssueSeverity::Warning)
.hostname(requested_addr.ip()) .log_detail(true)
.port(requested_addr.port()) .issue_reporter(Box::new(move || {
.log_level(turbopack_binding::turbopack::core::issue::IssueSeverity::Warning) TestIssueReporterVc::new(issue_tx.clone()).into()
.log_detail(true) }))
.issue_reporter(Box::new(move || { .show_all(true)
TestIssueReporterVc::new(issue_tx.clone()).into() .build()
})) .await
.show_all(true) .unwrap();
.build()
.await
.unwrap();
let local_addr =
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), server.addr.port());
println!( let local_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), server.addr.port());
"{event_type} - server started at http://{address}",
event_type = "ready".green(),
address = server.addr
);
if *DEBUG_START { println!(
if *DEBUG_OPEN { "{event_type} - server started at http://{address}",
webbrowser::open(&format!("http://{}", local_addr)).unwrap(); event_type = "ready".green(),
} address = server.addr
tokio::select! { );
_ = mock_server_future => {},
_ = pending() => {},
_ = server.future => {},
};
panic!("Never resolves")
}
result = tokio::select! { if *DEBUG_START {
// Poll the mock_server first to add the env var webbrowser::open(&local_addr.to_string()).unwrap();
_ = mock_server_future => panic!("Never resolves"), tokio::select! {
r = run_browser(local_addr, &project_dir) => r.expect("error while running browser"), _ = mock_server_future => {},
_ = server.future => panic!("Never resolves"), _ = pending() => {},
_ = server.future => {},
}; };
panic!("Never resolves")
}
let result = tokio::select! {
// Poll the mock_server first to add the env var
_ = mock_server_future => panic!("Never resolves"),
r = run_browser(local_addr, &project_dir) => r.expect("error while running browser"),
_ = server.future => panic!("Never resolves"),
};
env::remove_var("TURBOPACK_TEST_ONLY_MOCK_SERVER"); env::remove_var("TURBOPACK_TEST_ONLY_MOCK_SERVER");
let task = tt.spawn_once_task(async move { let task = tt.spawn_once_task(async move {
let issues_fs = DiskFileSystemVc::new( let issues_fs = DiskFileSystemVc::new(
"issues".to_string(), "issues".to_string(),
resource.join("issues").to_string_lossy().to_string(), resource.join("issues").to_string_lossy().to_string(),
) )
.as_file_system(); .as_file_system();
let mut issues = vec![]; let mut issues = vec![];
while let Ok(issue) = issue_rx.try_recv() { while let Ok(issue) = issue_rx.try_recv() {
issues.push(issue); issues.push(issue);
} }
snapshot_issues( snapshot_issues(
issues.iter().cloned(), issues.iter().cloned(),
issues_fs.root(), issues_fs.root(),
&cargo_workspace_root.to_string_lossy(), &cargo_workspace_root.to_string_lossy(),
) )
.await?; .await?;
Ok(NothingVc::new().into()) Ok(NothingVc::new().into())
}); });
tt.wait_task_completion(task, true).await.unwrap(); tt.wait_task_completion(task, true).await.unwrap();
}
if let Err(err) = retry( // This sometimes fails for the following test:
// test_tests__integration__next__webpack_loaders__no_options__input
retry(
(), (),
|()| std::fs::remove_dir_all(&resource_temp), |()| std::fs::remove_dir_all(&resource_temp),
3, 3,
Duration::from_millis(100), Duration::from_millis(100),
) { )
eprintln!("Failed to remove temporary directory: {}", err); .expect("failed to remove temporary directory");
}
result result
} }
......
...@@ -10,11 +10,7 @@ async function getJson(url) { ...@@ -10,11 +10,7 @@ async function getJson(url) {
const res = await fetch(url) const res = await fetch(url)
const text = await res.text() const text = await res.text()
const jsonText = /(\{[^}]*\})/.exec(text) const jsonText = /(\{[^}]*\})/.exec(text)
try { return JSON.parse(jsonText[0].replace(/&quot;/g, '"'))
return JSON.parse(jsonText[0].replace(/&quot;/g, '"'))
} catch (err) {
throw new Error(`Expected JSON but got:\n${text}`)
}
} }
function runTests() { function runTests() {
...@@ -67,10 +63,17 @@ function runTests() { ...@@ -67,10 +63,17 @@ function runTests() {
it('app with edge runtime should import edge conditions', async () => { it('app with edge runtime should import edge conditions', async () => {
const json = await getJson('/app-edge') const json = await getJson('/app-edge')
expect(json).toMatchObject({ // TODO We don't currently support edge config in app rendering.
// When we do, this needs to be updated.
expect(json).not.toMatchObject({
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
}) })
// TODO: delete this.
expect(json).toMatchObject({
edgeThenNode: 'node',
nodeThenEdge: 'node',
})
}) })
it('app route with nodejs runtime should import node conditions', async () => { it('app route with nodejs runtime should import node conditions', async () => {
......
PlainIssue {
severity: Error,
context: "[project]/packages/next/dist/compiled/nanoid/index.cjs",
category: "resolve",
title: "Error resolving commonjs request",
description: "unable to resolve module \"crypto\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: module \"crypto\"\nPath where resolving has started: [project]/packages/next/dist/compiled/nanoid/index.cjs\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "",
source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next/dist/compiled/nanoid/index.cjs",
},
start: SourcePos {
line: 0,
column: 45,
},
end: SourcePos {
line: 0,
column: 62,
},
},
),
sub_issues: [],
processing_path: Some(
[
PlainIssueProcessingPathItem {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/import/conditions/input/app",
),
description: "Next.js App Page Route /app-edge",
},
],
),
}
\ No newline at end of file
PlainIssue {
severity: Error,
context: "[project]/packages/next/dist/compiled/nanoid/index.cjs",
category: "resolve",
title: "Error resolving commonjs request",
description: "unable to resolve module \"crypto\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: module \"crypto\"\nPath where resolving has started: [project]/packages/next/dist/compiled/nanoid/index.cjs\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "",
source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next/dist/compiled/nanoid/index.cjs",
},
start: SourcePos {
line: 0,
column: 45,
},
end: SourcePos {
line: 0,
column: 62,
},
},
),
sub_issues: [],
processing_path: Some(
[
PlainIssueProcessingPathItem {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/import/conditions/input/app",
),
description: "Next.js App Page Route /app-edge",
},
PlainIssueProcessingPathItem {
context: Some(
"[next]/entry/app-edge-renderer.tsx",
),
description: "server-side rendering /app-edge",
},
],
),
}
\ No newline at end of file
...@@ -623,22 +623,33 @@ const nextAppLoader: AppLoader = async function nextAppLoader() { ...@@ -623,22 +623,33 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
} }
} }
// Prefer to modify next/src/server/app-render/entry-base.ts since this is shared with Turbopack.
// Any changes to this code should be reflected in Turbopack's app_source.rs and/or app-renderer.tsx as well.
const result = ` const result = `
export ${treeCodeResult.treeCode} export ${treeCodeResult.treeCode}
export ${treeCodeResult.pages} export ${treeCodeResult.pages}
export { default as AppRouter } from 'next/dist/client/components/app-router'
export { default as LayoutRouter } from 'next/dist/client/components/layout-router'
export { default as RenderFromTemplateContext } from 'next/dist/client/components/render-from-template-context'
export { default as GlobalError } from ${JSON.stringify( export { default as GlobalError } from ${JSON.stringify(
treeCodeResult.globalError || 'next/dist/client/components/error-boundary' treeCodeResult.globalError || 'next/dist/client/components/error-boundary'
)} )}
export const originalPathname = ${JSON.stringify(page)}
export const __next_app__ = {
require: __webpack_require__,
// all modules are in the entry chunk, so we never actually need to load chunks in webpack
loadChunk: () => Promise.resolve()
}
export * from 'next/dist/server/app-render/entry-base' export { staticGenerationAsyncStorage } from 'next/dist/client/components/static-generation-async-storage'
export { requestAsyncStorage } from 'next/dist/client/components/request-async-storage'
export { actionAsyncStorage } from 'next/dist/client/components/action-async-storage'
export { staticGenerationBailout } from 'next/dist/client/components/static-generation-bailout'
export { default as StaticGenerationSearchParamsBailoutProvider } from 'next/dist/client/components/static-generation-searchparams-bailout-provider'
export { createSearchParamsBailoutProxy } from 'next/dist/client/components/searchparams-bailout-proxy'
export * as serverHooks from 'next/dist/client/components/hooks-server-context'
export { renderToReadableStream, decodeReply, decodeAction } from 'react-server-dom-webpack/server.edge'
export const __next_app_webpack_require__ = __webpack_require__
export { preloadStyle, preloadFont, preconnect } from 'next/dist/server/app-render/rsc/preloads'
export const originalPathname = "${page}"
` `
return result return result
......
...@@ -98,7 +98,7 @@ export function getRender({ ...@@ -98,7 +98,7 @@ export function getRender({
getServerSideProps: pageMod.getServerSideProps, getServerSideProps: pageMod.getServerSideProps,
getStaticPaths: pageMod.getStaticPaths, getStaticPaths: pageMod.getStaticPaths,
ComponentMod: pageMod, ComponentMod: pageMod,
isAppPath: !!pageMod.__next_app__, isAppPath: !!pageMod.__next_app_webpack_require__,
pathname, pathname,
} }
} }
......
...@@ -400,7 +400,7 @@ export async function handleAction({ ...@@ -400,7 +400,7 @@ export async function handleAction({
process.env.NEXT_RUNTIME === 'edge' ? 'edge' : 'node' process.env.NEXT_RUNTIME === 'edge' ? 'edge' : 'node'
][actionId].workers[workerName] ][actionId].workers[workerName]
const actionHandler = const actionHandler =
ComponentMod.__next_app__.require(actionModId)[actionId] ComponentMod.__next_app_webpack_require__(actionModId)[actionId]
const returnVal = await actionHandler.apply(null, bound) const returnVal = await actionHandler.apply(null, bound)
......
...@@ -13,10 +13,7 @@ export function createServerComponentRenderer<Props>( ...@@ -13,10 +13,7 @@ export function createServerComponentRenderer<Props>(
ComponentToRender: (props: Props) => any, ComponentToRender: (props: Props) => any,
ComponentMod: { ComponentMod: {
renderToReadableStream: any renderToReadableStream: any
__next_app__?: { __next_app_webpack_require__?: any
require: any
loadChunk: any
}
}, },
{ {
transformStream, transformStream,
...@@ -34,14 +31,14 @@ export function createServerComponentRenderer<Props>( ...@@ -34,14 +31,14 @@ export function createServerComponentRenderer<Props>(
serverComponentsErrorHandler: ReturnType<typeof createErrorHandler>, serverComponentsErrorHandler: ReturnType<typeof createErrorHandler>,
nonce?: string nonce?: string
): (props: Props) => JSX.Element { ): (props: Props) => JSX.Element {
// We need to expose the bundled `require` API globally for // We need to expose the `__webpack_require__` API globally for
// react-server-dom-webpack. This is a hack until we find a better way. // react-server-dom-webpack. This is a hack until we find a better way.
if (ComponentMod.__next_app__) { if (ComponentMod.__next_app_webpack_require__) {
// @ts-ignore // @ts-ignore
globalThis.__next_require__ = ComponentMod.__next_app__.require globalThis.__next_require__ = ComponentMod.__next_app_webpack_require__
// @ts-ignore // @ts-ignore
globalThis.__next_chunk_load__ = ComponentMod.__next_app__.loadChunk globalThis.__next_chunk_load__ = () => Promise.resolve()
} }
let RSCStream: ReadableStream<Uint8Array> let RSCStream: ReadableStream<Uint8Array>
......
const { default: AppRouter } =
require('next/dist/client/components/app-router') as typeof import('../../client/components/app-router')
const { default: LayoutRouter } =
require('next/dist/client/components/layout-router') as typeof import('../../client/components/layout-router')
const { default: RenderFromTemplateContext } =
require('next/dist/client/components/render-from-template-context') as typeof import('../../client/components/render-from-template-context')
const { staticGenerationAsyncStorage } =
require('next/dist/client/components/static-generation-async-storage') as typeof import('../../client/components/static-generation-async-storage')
const { requestAsyncStorage } =
require('next/dist/client/components/request-async-storage') as typeof import('../../client/components/request-async-storage')
const { actionAsyncStorage } =
require('next/dist/client/components/action-async-storage') as typeof import('../../client/components/action-async-storage')
const { staticGenerationBailout } =
require('next/dist/client/components/static-generation-bailout') as typeof import('../../client/components/static-generation-bailout')
const { default: StaticGenerationSearchParamsBailoutProvider } =
require('next/dist/client/components/static-generation-searchparams-bailout-provider') as typeof import('../../client/components/static-generation-searchparams-bailout-provider')
const { createSearchParamsBailoutProxy } =
require('next/dist/client/components/searchparams-bailout-proxy') as typeof import('../../client/components/searchparams-bailout-proxy')
const serverHooks =
require('next/dist/client/components/hooks-server-context') as typeof import('../../client/components/hooks-server-context')
const {
renderToReadableStream,
decodeReply,
decodeAction,
// eslint-disable-next-line import/no-extraneous-dependencies
} = require('react-server-dom-webpack/server.edge')
const { preloadStyle, preloadFont, preconnect } =
require('next/dist/server/app-render/rsc/preloads') as typeof import('../../server/app-render/rsc/preloads')
export {
AppRouter,
LayoutRouter,
RenderFromTemplateContext,
staticGenerationAsyncStorage,
requestAsyncStorage,
actionAsyncStorage,
staticGenerationBailout,
createSearchParamsBailoutProxy,
serverHooks,
renderToReadableStream,
decodeReply,
decodeAction,
preloadStyle,
preloadFont,
preconnect,
StaticGenerationSearchParamsBailoutProvider,
}
import type { ServerResponse } from 'http'
import { Writable } from 'stream'
type ContentTypeOption = string | undefined type ContentTypeOption = string | undefined
export type RenderResultMetadata = { export type RenderResultMetadata = {
...@@ -11,13 +14,6 @@ export type RenderResultMetadata = { ...@@ -11,13 +14,6 @@ export type RenderResultMetadata = {
type RenderResultResponse = string | ReadableStream<Uint8Array> | null type RenderResultResponse = string | ReadableStream<Uint8Array> | null
export interface PipeTarget {
write: (chunk: Uint8Array) => unknown
end: () => unknown
flush?: () => unknown
destroy: (err?: Error) => unknown
}
export default class RenderResult { export default class RenderResult {
/** /**
* The detected content type for the response. This is used to set the * The detected content type for the response. This is used to set the
...@@ -95,7 +91,7 @@ export default class RenderResult { ...@@ -95,7 +91,7 @@ export default class RenderResult {
return this.response return this.response
} }
public async pipe(res: PipeTarget): Promise<void> { public async pipe(res: ServerResponse | Writable): Promise<void> {
if (this.response === null) { if (this.response === null) {
throw new Error('Invariant: response is null. This is a bug in Next.js') throw new Error('Invariant: response is null. This is a bug in Next.js')
} }
......
...@@ -984,8 +984,8 @@ importers: ...@@ -984,8 +984,8 @@ importers:
'@types/react': 18.2.7 '@types/react': 18.2.7
'@types/react-dom': 18.2.4 '@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2 '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230621.2 '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230615.1
anser: ^2.1.1 anser: ^2.1.1
css.escape: ^1.5.1 css.escape: ^1.5.1
find-up: ^6.3.0 find-up: ^6.3.0
...@@ -997,8 +997,8 @@ importers: ...@@ -997,8 +997,8 @@ importers:
stacktrace-parser: ^0.1.10 stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1 strip-ansi: ^7.0.1
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230621.2' '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230615.1'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -6116,7 +6116,7 @@ packages: ...@@ -6116,7 +6116,7 @@ packages:
dependencies: dependencies:
'@mdx-js/mdx': 2.2.1 '@mdx-js/mdx': 2.2.1
source-map: 0.7.3 source-map: 0.7.3
webpack: 5.86.0_@swc+core@1.3.55 webpack: 5.86.0
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
...@@ -6790,6 +6790,7 @@ packages: ...@@ -6790,6 +6790,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-darwin-x64/1.3.55: /@swc/core-darwin-x64/1.3.55:
...@@ -6798,6 +6799,7 @@ packages: ...@@ -6798,6 +6799,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm-gnueabihf/1.3.55: /@swc/core-linux-arm-gnueabihf/1.3.55:
...@@ -6806,6 +6808,7 @@ packages: ...@@ -6806,6 +6808,7 @@ packages:
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm64-gnu/1.3.55: /@swc/core-linux-arm64-gnu/1.3.55:
...@@ -6814,6 +6817,7 @@ packages: ...@@ -6814,6 +6817,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm64-musl/1.3.55: /@swc/core-linux-arm64-musl/1.3.55:
...@@ -6822,6 +6826,7 @@ packages: ...@@ -6822,6 +6826,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-x64-gnu/1.3.55: /@swc/core-linux-x64-gnu/1.3.55:
...@@ -6830,6 +6835,7 @@ packages: ...@@ -6830,6 +6835,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-x64-musl/1.3.55: /@swc/core-linux-x64-musl/1.3.55:
...@@ -6838,6 +6844,7 @@ packages: ...@@ -6838,6 +6844,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-arm64-msvc/1.3.55: /@swc/core-win32-arm64-msvc/1.3.55:
...@@ -6846,6 +6853,7 @@ packages: ...@@ -6846,6 +6853,7 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-ia32-msvc/1.3.55: /@swc/core-win32-ia32-msvc/1.3.55:
...@@ -6854,6 +6862,7 @@ packages: ...@@ -6854,6 +6862,7 @@ packages:
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-x64-msvc/1.3.55: /@swc/core-win32-x64-msvc/1.3.55:
...@@ -6862,6 +6871,7 @@ packages: ...@@ -6862,6 +6871,7 @@ packages:
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core/1.3.55_@swc+helpers@0.5.1: /@swc/core/1.3.55_@swc+helpers@0.5.1:
...@@ -6886,6 +6896,7 @@ packages: ...@@ -6886,6 +6896,7 @@ packages:
'@swc/core-win32-arm64-msvc': 1.3.55 '@swc/core-win32-arm64-msvc': 1.3.55
'@swc/core-win32-ia32-msvc': 1.3.55 '@swc/core-win32-ia32-msvc': 1.3.55
'@swc/core-win32-x64-msvc': 1.3.55 '@swc/core-win32-x64-msvc': 1.3.55
dev: true
/@swc/helpers/0.4.14: /@swc/helpers/0.4.14:
resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
...@@ -23788,6 +23799,7 @@ packages: ...@@ -23788,6 +23799,7 @@ packages:
serialize-javascript: 6.0.1 serialize-javascript: 6.0.1
terser: 5.17.7 terser: 5.17.7
webpack: 5.86.0_@swc+core@1.3.55 webpack: 5.86.0_@swc+core@1.3.55
dev: true
/terser/5.10.0: /terser/5.10.0:
resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==} resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
...@@ -25145,6 +25157,7 @@ packages: ...@@ -25145,6 +25157,7 @@ packages:
- '@swc/core' - '@swc/core'
- esbuild - esbuild
- uglify-js - uglify-js
dev: true
/websocket-driver/0.7.3: /websocket-driver/0.7.3:
resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==} resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==}
...@@ -25553,9 +25566,9 @@ packages: ...@@ -25553,9 +25566,9 @@ packages:
/zwitch/2.0.4: /zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2_react-refresh@0.12.0': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230621.2' id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230615.1'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25566,8 +25579,8 @@ packages: ...@@ -25566,8 +25579,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230621.2': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230615.1':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230621.2} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230615.1}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
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