Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
ad12f487
Unverified
Commit
ad12f487
authored
Jan 27, 2023
by
JJ Kasper
Committed by
GitHub
Jan 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add turbopack route resolve handling (#45314)
Relies on:
https://github.com/vercel/turbo/pull/3446
parent
9822f78f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
145 additions
and
0 deletions
+145
-0
next-dev.ts
packages/next/src/cli/next-dev.ts
+4
-0
router.ts
packages/next/src/server/router.ts
+107
-0
taskfile.js
packages/next/taskfile.js
+3
-0
index.test.js
test/integration/custom-routes/test/index.test.js
+31
-0
No files found.
packages/next/src/cli/next-dev.ts
View file @
ad12f487
...
@@ -205,6 +205,10 @@ const nextDev: CliCommand = async (argv) => {
...
@@ -205,6 +205,10 @@ const nextDev: CliCommand = async (argv) => {
'experimental.turbopackLoaders'
,
'experimental.turbopackLoaders'
,
'images'
,
'images'
,
'pageExtensions'
,
'pageExtensions'
,
'onDemandEntries'
,
'rewrites'
,
'redirects'
,
'headers'
,
'reactStrictMode'
,
'reactStrictMode'
,
'swcMinify'
,
'swcMinify'
,
'transpilePackages'
,
'transpilePackages'
,
...
...
packages/next/src/server/router.ts
View file @
ad12f487
...
@@ -21,6 +21,8 @@ import { removePathPrefix } from '../shared/lib/router/utils/remove-path-prefix'
...
@@ -21,6 +21,8 @@ import { removePathPrefix } from '../shared/lib/router/utils/remove-path-prefix'
import
{
getRequestMeta
}
from
'./request-meta'
import
{
getRequestMeta
}
from
'./request-meta'
import
{
formatNextPathnameInfo
}
from
'../shared/lib/router/utils/format-next-pathname-info'
import
{
formatNextPathnameInfo
}
from
'../shared/lib/router/utils/format-next-pathname-info'
import
{
getNextPathnameInfo
}
from
'../shared/lib/router/utils/get-next-pathname-info'
import
{
getNextPathnameInfo
}
from
'../shared/lib/router/utils/get-next-pathname-info'
import
type
{
IncomingMessage
,
ServerResponse
}
from
'http'
import
type
{
UnwrapPromise
}
from
'../lib/coalesced-function'
type
RouteResult
=
{
type
RouteResult
=
{
finished
:
boolean
finished
:
boolean
...
@@ -501,3 +503,108 @@ export default class Router {
...
@@ -501,3 +503,108 @@ export default class Router {
}
}
}
}
}
}
let
_makeResolver
:
any
=
()
=>
{}
if
(
process
.
env
.
NEXT_RUNTIME
!==
'edge'
)
{
_makeResolver
=
async
function
makeResolver
(
dir
:
string
,
nextConfig
:
NextConfig
)
{
// TODO: why are there double defaults here?
const
{
default
:
DevServer
}
=
require
(
'./dev/next-dev-server.js'
)
as
typeof
import
(
'./dev/next-dev-server'
)
const
{
default
:
loadCustomRoutes
}
=
require
(
'../lib/load-custom-routes'
)
as
typeof
import
(
'../lib/load-custom-routes'
)
const
{
NodeNextRequest
,
NodeNextResponse
}
=
require
(
'./base-http/node'
)
as
typeof
import
(
'./base-http/node'
)
const
url
=
require
(
'url'
)
as
typeof
import
(
'url'
)
const
devServer
=
new
DevServer
({
dir
,
conf
:
nextConfig
,
})
as
any
as
{
customRoutes
:
UnwrapPromise
<
ReturnType
<
typeof
loadCustomRoutes
>>
router
:
Router
generateRoutes
:
any
}
devServer
.
customRoutes
=
await
loadCustomRoutes
(
nextConfig
)
const
routes
=
devServer
.
generateRoutes
.
bind
(
devServer
)()
devServer
.
router
=
new
Router
(
routes
)
const
routeResults
=
new
Map
<
string
,
string
>
()
// @ts-expect-error internal field
devServer
.
router
.
catchAllRoute
=
{
match
:
getPathMatch
(
'/:path*'
),
name
:
'catchall route'
,
fn
:
async
(
req
,
_res
,
_params
,
parsedUrl
)
=>
{
// clean up internal query values
for
(
const
key
of
Object
.
keys
(
parsedUrl
.
query
||
{}))
{
if
(
key
.
startsWith
(
'_next'
))
{
delete
parsedUrl
.
query
[
key
]
}
}
routeResults
.
set
(
(
req
as
any
).
_initUrl
,
url
.
format
({
pathname
:
parsedUrl
.
pathname
,
query
:
parsedUrl
.
query
,
hash
:
parsedUrl
.
hash
,
})
)
return
{
finished
:
true
}
},
}
as
Route
// @ts-expect-error internal field
devServer
.
router
.
compiledRoutes
=
devServer
.
router
.
compiledRoutes
.
filter
(
(
route
)
=>
{
return
(
route
.
type
===
'rewrite'
||
route
.
type
===
'redirect'
||
route
.
type
===
'header'
||
route
.
name
===
'catchall route'
||
route
.
name
?.
includes
(
'check'
)
)
}
)
return
async
function
resolveRoute
(
_req
:
IncomingMessage
,
_res
:
ServerResponse
)
{
const
req
=
new
NodeNextRequest
(
_req
)
const
res
=
new
NodeNextResponse
(
_res
)
;(
req
as
any
).
_initUrl
=
req
.
url
await
devServer
.
router
.
execute
.
bind
(
devServer
.
router
)(
req
,
res
,
url
.
parse
(
req
.
url
!
,
true
)
)
if
(
!
res
.
originalResponse
.
headersSent
)
{
res
.
setHeader
(
'x-nextjs-route-result'
,
'1'
)
const
resolvedUrl
=
routeResults
.
get
((
req
as
any
).
_initUrl
)
||
req
.
url
!
const
routeResult
:
{
url
:
string
statusCode
:
number
headers
:
Record
<
string
,
undefined
|
number
|
string
|
string
[]
>
isRedirect
?:
boolean
}
=
{
url
:
resolvedUrl
,
statusCode
:
200
,
headers
:
{},
}
res
.
body
(
JSON
.
stringify
(
routeResult
)).
send
()
}
}
}
}
export
const
makeResolver
=
_makeResolver
packages/next/taskfile.js
View file @
ad12f487
...
@@ -99,6 +99,9 @@ export async function ncc_next_server(task, opts) {
...
@@ -99,6 +99,9 @@ export async function ncc_next_server(task, opts) {
// minify: false,
// minify: false,
externals
:
{
externals
:
{
...
externals
,
...
externals
,
'/(.*)next-dev-server(.*)/'
:
'$1next-dev-server$1'
,
sharp
:
'sharp'
,
sharp
:
'sharp'
,
react
:
'react'
,
react
:
'react'
,
'react-dom'
:
'react-dom'
,
'react-dom'
:
'react-dom'
,
...
...
test/integration/custom-routes/test/index.test.js
View file @
ad12f487
...
@@ -2404,6 +2404,37 @@ describe('Custom routes', () => {
...
@@ -2404,6 +2404,37 @@ describe('Custom routes', () => {
runTests
(
true
)
runTests
(
true
)
})
})
describe
(
'dev mode turbo'
,
()
=>
{
let
nextConfigContent
beforeAll
(
async
()
=>
{
// ensure cache with rewrites disabled doesn't persist
// after enabling rewrites
await
fs
.
remove
(
join
(
appDir
,
'.next'
))
nextConfigContent
=
await
fs
.
readFile
(
nextConfigPath
,
'utf8'
)
await
fs
.
writeFile
(
nextConfigPath
,
nextConfigContent
.
replace
(
'// no-rewrites comment'
,
'return []'
)
)
const
tempPort
=
await
findPort
()
const
tempApp
=
await
launchApp
(
appDir
,
tempPort
,
{
turbo
:
true
})
await
renderViaHTTP
(
tempPort
,
'/'
)
await
killApp
(
tempApp
)
await
fs
.
writeFile
(
nextConfigPath
,
nextConfigContent
)
appPort
=
await
findPort
()
app
=
await
launchApp
(
appDir
,
appPort
)
buildId
=
'development'
})
afterAll
(
async
()
=>
{
await
fs
.
writeFile
(
nextConfigPath
,
nextConfigContent
)
await
killApp
(
app
)
})
runTests
(
true
)
})
describe
(
'no-op rewrite'
,
()
=>
{
describe
(
'no-op rewrite'
,
()
=>
{
beforeAll
(
async
()
=>
{
beforeAll
(
async
()
=>
{
appPort
=
await
findPort
()
appPort
=
await
findPort
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment