Unverified Commit ec385dec authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

replace defined values and add `__NEXT_HAS_REWRITES` define (#48628)

### What?

This fixes a problem when the router fails to load the correct JS file
from the page_loader and opts out to full refresh

### Why?

The router behaves incorrect when `__NEXT_HAS_REWRITES` is missing in
turbopack

### How?

see also https://github.com/vercel/turbo/pull/4652

### Turbopack changes

* https://github.com/vercel/turbo/pull/4650 <!-- Tobias Koppers - reduce
size of TypeType from 32bytes to 16bytes -->
* https://github.com/vercel/turbo/pull/4648 <!-- Tobias Koppers - handle
chunk register in the sync runtime.none correctly -->
* https://github.com/vercel/turbo/pull/4609 <!-- OJ Kwon -
fix(ecmascript): eval assignop to the ident -->
* https://github.com/vercel/turbo/pull/4652 <!-- Tobias Koppers - allow
to pass constant values to free var references -->
* https://github.com/vercel/turbo/pull/4649 <!-- Tobias Koppers - Image
processing improvements -->
parent 8ab6c4ca
This diff is collapsed.
......@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.5" }
testing = { version = "0.33.4" }
# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230419.4" }
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230420.2" }
# [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-230419.4" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230420.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230419.4" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230420.2" }
# General Deps
......
......@@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230419.4",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230419.4",
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
......
......@@ -9,8 +9,8 @@ use turbo_binding::{
chunk::ChunkingContextVc,
compile_time_defines,
compile_time_info::{
CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference,
FreeVarReferencesVc,
CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc,
FreeVarReference, FreeVarReferencesVc,
},
context::AssetContextVc,
environment::{
......@@ -53,17 +53,27 @@ use crate::{
util::foreign_code_context_condition,
};
pub fn next_client_defines() -> CompileTimeDefinesVc {
fn defines() -> CompileTimeDefines {
compile_time_defines!(
process.turbopack = true,
process.env.NODE_ENV = "development",
process.env.__NEXT_CLIENT_ROUTER_FILTER_ENABLED = false
process.env.__NEXT_CLIENT_ROUTER_FILTER_ENABLED = false,
process.env.__NEXT_HAS_REWRITES = true,
process.env.__NEXT_I18N_SUPPORT = false,
)
.cell()
// TODO(WEB-937) there are more defines needed, see
// packages/next/src/build/webpack-config.ts
}
pub fn next_client_free_vars() -> FreeVarReferencesVc {
free_var_references!(
#[turbo_tasks::function]
pub fn next_client_defines() -> CompileTimeDefinesVc {
defines().cell()
}
#[turbo_tasks::function]
pub async fn next_client_free_vars() -> Result<FreeVarReferencesVc> {
Ok(free_var_references!(
..defines().into_iter(),
Buffer = FreeVarReference::EcmaScriptModule {
request: "node:buffer".to_string(),
context: None,
......@@ -75,7 +85,7 @@ pub fn next_client_free_vars() -> FreeVarReferencesVc {
export: Some("default".to_string()),
}
)
.cell()
.cell())
}
#[turbo_tasks::function]
......
......@@ -5,8 +5,8 @@ use turbo_binding::{
core::{
compile_time_defines,
compile_time_info::{
CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference,
FreeVarReferencesVc,
CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc,
FreeVarReference, FreeVarReferencesVc,
},
environment::{
EdgeWorkerEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment,
......@@ -25,18 +25,26 @@ use crate::{
next_server::context::ServerContextType, util::foreign_code_context_condition,
};
pub fn next_edge_defines() -> CompileTimeDefinesVc {
fn defines() -> CompileTimeDefines {
compile_time_defines!(
process.turbopack = true,
process.env.NODE_ENV = "development",
process.env.__NEXT_CLIENT_ROUTER_FILTER_ENABLED = false,
process.env.NEXT_RUNTIME = "edge"
)
.cell()
// TODO(WEB-937) there are more defines needed, see
// packages/next/src/build/webpack-config.ts
}
#[turbo_tasks::function]
pub fn next_edge_defines() -> CompileTimeDefinesVc {
defines().cell()
}
#[turbo_tasks::function]
pub fn next_edge_free_vars(project_path: FileSystemPathVc) -> FreeVarReferencesVc {
free_var_references!(
..defines().into_iter(),
Buffer = FreeVarReference::EcmaScriptModule {
request: "next/dist/compiled/buffer".to_string(),
context: Some(project_path),
......
......@@ -4,11 +4,15 @@ use turbo_binding::{
turbopack::{
core::{
compile_time_defines,
compile_time_info::{CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc},
compile_time_info::{
CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc,
FreeVarReferencesVc,
},
environment::{
EnvironmentIntention, EnvironmentVc, ExecutionEnvironment, NodeJsEnvironmentVc,
ServerAddrVc,
},
free_var_references,
},
ecmascript::EcmascriptInputTransform,
node::execution_context::ExecutionContextVc,
......@@ -168,14 +172,25 @@ pub async fn get_server_resolve_options_context(
.cell())
}
pub fn next_server_defines() -> CompileTimeDefinesVc {
fn defines() -> CompileTimeDefines {
compile_time_defines!(
process.turbopack = true,
process.env.NODE_ENV = "development",
process.env.__NEXT_CLIENT_ROUTER_FILTER_ENABLED = false,
process.env.NEXT_RUNTIME = "nodejs"
)
.cell()
// TODO(WEB-937) there are more defines needed, see
// packages/next/src/build/webpack-config.ts
}
#[turbo_tasks::function]
pub fn next_server_defines() -> CompileTimeDefinesVc {
defines().cell()
}
#[turbo_tasks::function]
pub async fn next_server_free_vars() -> Result<FreeVarReferencesVc> {
Ok(free_var_references!(..defines().into_iter()).cell())
}
#[turbo_tasks::function]
......@@ -199,6 +214,7 @@ pub fn get_server_compile_time_info(
},
))
.defines(next_server_defines())
.free_var_references(next_server_free_vars())
.cell()
}
......
......@@ -8,10 +8,14 @@ use turbo_binding::{
core::{
chunk::{ChunkableAsset, ChunkableAssetVc, ChunkingContext},
compile_time_defines,
compile_time_info::{CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc},
compile_time_info::{
CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc,
FreeVarReferencesVc,
},
environment::{
BrowserEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment,
},
free_var_references,
reference_type::{EntryReferenceSubType, ReferenceType},
resolve::{origin::PlainResolveOriginVc, parse::RequestVc},
source_asset::SourceAssetVc,
......@@ -38,12 +42,21 @@ use crate::{
next_config::NextConfigVc,
};
pub fn web_defines() -> CompileTimeDefinesVc {
fn defines() -> CompileTimeDefines {
compile_time_defines!(
process.turbopack = true,
process.env.NODE_ENV = "development",
)
.cell()
}
#[turbo_tasks::function]
pub fn web_defines() -> CompileTimeDefinesVc {
defines().cell()
}
#[turbo_tasks::function]
pub async fn web_free_vars() -> Result<FreeVarReferencesVc> {
Ok(free_var_references!(..defines().into_iter()).cell())
}
#[turbo_tasks::function]
......@@ -61,6 +74,7 @@ pub fn get_compile_time_info(browserslist_query: &str) -> CompileTimeInfoVc {
Value::new(EnvironmentIntention::Client),
))
.defines(web_defines())
.free_var_references(web_free_vars())
.cell()
}
......
......@@ -3,7 +3,7 @@ PlainIssue {
context: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/next/image/basic/input/public/broken.jpeg",
category: "image",
title: "Processing image failed",
description: "unable to decode image data\n\nCaused by:\n- The image format could not be determined",
description: "unable to decode image data\n\nCaused by:\n- failed to fill whole buffer",
detail: "",
documentation_link: "",
source: None,
......
......@@ -1008,8 +1008,8 @@ importers:
'@types/react': ^18.0.26
'@types/react-dom': ^18.0.9
'@vercel/ncc': ^0.36.0
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230419.4
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230419.4
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2
anser: ^2.1.1
css.escape: ^1.5.1
find-up: ^6.3.0
......@@ -1021,8 +1021,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-230419.4_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230419.4'
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2'
anser: 2.1.1
css.escape: 1.5.1
next: link:../../../../next
......@@ -25577,9 +25577,9 @@ packages:
/zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230419.4_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230419.4}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230419.4'
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2'
name: '@vercel/turbopack-dev'
version: 0.0.0
dependencies:
......@@ -25589,8 +25589,8 @@ packages:
- webpack
dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230419.4':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230419.4}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2}
name: '@vercel/turbopack-node'
version: 0.0.0
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