archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render app pages with original url (#49198)

Browse source 
### What?

Use pre-rewrite URL for rendering

### Why?

Rendering app pages needs the original user facing URL.

### Turbopack changes

* https://github.com/vercel/turbo/pull/4818 <!-- Tobias Koppers - pass
original url with content source data -->
* https://github.com/vercel/turbo/pull/4817 <!-- Tobias Koppers - avoid
errors in computing issue details -->
This commit is contained in:
Tobias Koppers 2023-05-04 15:46:36 +02:00 committed by GitHub
parent aabc1d9cc3
commit e96fce41c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Cargo.lock generated
View file

@ -400,7 +400,7 @@ dependencies = [
[[package]]
name = "auto-hash-map"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"serde",
]
@ -3413,7 +3413,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"serde",
@ -6980,7 +6980,7 @@ dependencies = [
[[package]]
name = "turbo-binding"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"auto-hash-map",
"mdxjs",
@ -7020,7 +7020,7 @@ dependencies = [
[[package]]
name = "turbo-malloc"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"mimalloc",
]
@ -7028,7 +7028,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7058,7 +7058,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"cargo-lock",
@ -7070,7 +7070,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"bytes",
@ -7085,7 +7085,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"dotenvy",
@ -7099,7 +7099,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"indexmap",
@ -7116,7 +7116,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7145,7 +7145,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"base16",
"hex",
@ -7157,7 +7157,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@ -7171,7 +7171,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"proc-macro2",
"quote",
@ -7181,7 +7181,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7203,7 +7203,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-testing"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7215,7 +7215,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-recursion",
@ -7244,7 +7244,7 @@ dependencies = [
[[package]]
name = "turbopack-bench"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"chromiumoxide",
@ -7274,7 +7274,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"clap 4.1.11",
@ -7291,7 +7291,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-trait",
@ -7318,7 +7318,7 @@ dependencies = [
[[package]]
name = "turbopack-create-test-app"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"clap 4.1.11",
@ -7331,7 +7331,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-trait",
@ -7353,7 +7353,7 @@ dependencies = [
[[package]]
name = "turbopack-dev"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"indexmap",
@ -7374,7 +7374,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-compression",
@ -7408,7 +7408,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-trait",
@ -7444,7 +7444,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"serde",
@ -7458,7 +7458,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"indexmap",
@ -7474,7 +7474,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"base64 0.21.0",
@ -7494,7 +7494,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"serde",
@ -7509,7 +7509,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"mdxjs",
@ -7524,7 +7524,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"async-stream",
@ -7558,7 +7558,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"serde",
@ -7574,7 +7574,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"swc_core",
"turbo-tasks",
@ -7585,7 +7585,7 @@ dependencies = [
[[package]]
name = "turbopack-test-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.2#12dd16a99ac1b64b66219e593980aadc1f161352"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230504.3#a68486bd15982ba1634a3f672d0808b061f72e28"
dependencies = [
"anyhow",
"once_cell",

6
Cargo.toml
View file

@ -42,11 +42,11 @@ swc_relay = { version = "0.2.7" }
testing = { version = "0.33.6" }
# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.2" }
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
# [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-230504.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
# General Deps

4
packages/next-swc/crates/next-core/js/package.json
View file

@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.2",
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",

2
packages/next-swc/crates/next-core/js/src/entry/app-renderer.tsx
View file

@ -245,7 +245,7 @@ async function runOperation(renderData: RenderData) {
cssModules: {},
}
const req: IncomingMessage = {
url: renderData.url,
url: renderData.originalUrl,
method: renderData.method,
headers: headersFromEntries(renderData.rawHeaders),
} as any

1
packages/next-swc/crates/next-core/js/types/turbopack.d.ts vendored
View file

@ -4,6 +4,7 @@ export type RenderData = {
params: Record<string, string | string[]>
method: string
url: string
originalUrl: string
path: string
rawQuery: string
rawHeaders: Array<[string, string]>

18
pnpm-lock.yaml
View file

@ -1020,8 +1020,8 @@ importers:
'@types/react': 18.0.37
'@types/react-dom': 18.0.11
'@vercel/ncc': ^0.36.0
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.2
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3
anser: ^2.1.1
css.escape: ^1.5.1
find-up: ^6.3.0
@ -1033,8 +1033,8 @@ importers:
stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1
dependencies:
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.2'
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3'
anser: 2.1.1
css.escape: 1.5.1
next: link:../../../../next
@ -25605,9 +25605,9 @@ packages:
/zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.2'
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3'
name: '@vercel/turbopack-dev'
version: 0.0.0
dependencies:
@ -25617,8 +25617,8 @@ packages:
- webpack
dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.2':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.2}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3}
name: '@vercel/turbopack-node'
version: 0.0.0
dependencies: