Unverified Commit 36e401ec authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Enable minification for Turbopack (#62994)

## What?

Implementation for https://github.com/vercel/turbo/pull/7660. Enables
minification of browser files.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->


Closes NEXT-2742

---------
Co-authored-by: 's avatarTobias Koppers <tobias.koppers@googlemail.com>
parent ff1d4cb3
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [
testing = { version = "0.35.20" } testing = { version = "0.35.20" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
# [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-240307.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
# [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-240307.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
# General Deps # General Deps
......
...@@ -28,9 +28,9 @@ turbopack-binding = { workspace = true, features = [ ...@@ -28,9 +28,9 @@ turbopack-binding = { workspace = true, features = [
"__turbo_tasks_env", "__turbo_tasks_env",
"__turbo_tasks_fs", "__turbo_tasks_fs",
"__turbopack", "__turbopack",
"__turbopack_build", "__turbopack_nodejs",
"__turbopack_core", "__turbopack_core",
"__turbopack_dev", "__turbopack_browser",
"__turbopack_env", "__turbopack_env",
"__turbopack_cli_utils", "__turbopack_cli_utils",
"__turbopack_node", "__turbopack_node",
......
...@@ -41,7 +41,6 @@ use turbopack_binding::{ ...@@ -41,7 +41,6 @@ use turbopack_binding::{
tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPath}, tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPath},
}, },
turbopack::{ turbopack::{
build::EntryChunkGroupResult,
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
...@@ -50,6 +49,7 @@ use turbopack_binding::{ ...@@ -50,6 +49,7 @@ use turbopack_binding::{
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}, },
nodejs::EntryChunkGroupResult,
turbopack::{ turbopack::{
module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext, module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
transition::ContextTransition, ModuleAssetContext, transition::ContextTransition, ModuleAssetContext,
......
...@@ -12,7 +12,6 @@ use turbopack_binding::{ ...@@ -12,7 +12,6 @@ use turbopack_binding::{
visit::{Visit, VisitWith}, visit::{Visit, VisitWith},
}, },
turbopack::{ turbopack::{
build::BuildChunkingContext,
core::{ core::{
chunk::{ chunk::{
availability_info::AvailabilityInfo, ChunkableModule, ChunkingContextExt, availability_info::AvailabilityInfo, ChunkableModule, ChunkingContextExt,
...@@ -31,6 +30,7 @@ use turbopack_binding::{ ...@@ -31,6 +30,7 @@ use turbopack_binding::{
resolve::esm_resolve, resolve::esm_resolve,
EcmascriptModuleAsset, EcmascriptModuleAsset,
}, },
nodejs::NodeJsChunkingContext,
}, },
}; };
...@@ -79,7 +79,7 @@ where ...@@ -79,7 +79,7 @@ where
} }
pub(crate) async fn collect_chunk_group( pub(crate) async fn collect_chunk_group(
chunking_context: Vc<BuildChunkingContext>, chunking_context: Vc<NodeJsChunkingContext>,
dynamic_import_entries: IndexMap<Vc<Box<dyn Module>>, DynamicImportedModules>, dynamic_import_entries: IndexMap<Vc<Box<dyn Module>>, DynamicImportedModules>,
availability_info: Value<AvailabilityInfo>, availability_info: Value<AvailabilityInfo>,
) -> Result<Vc<DynamicImportedChunks>> { ) -> Result<Vc<DynamicImportedChunks>> {
......
...@@ -10,7 +10,6 @@ use turbo_tasks::{Completion, Value, Vc}; ...@@ -10,7 +10,6 @@ use turbo_tasks::{Completion, Value, Vc};
use turbopack_binding::{ use turbopack_binding::{
turbo::tasks_fs::{File, FileContent}, turbo::tasks_fs::{File, FileContent},
turbopack::{ turbopack::{
build::EntryChunkGroupResult,
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::{availability_info::AvailabilityInfo, ChunkingContextExt}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt},
...@@ -22,6 +21,7 @@ use turbopack_binding::{ ...@@ -22,6 +21,7 @@ use turbopack_binding::{
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}, },
ecmascript::chunk::EcmascriptChunkPlaceable, ecmascript::chunk::EcmascriptChunkPlaceable,
nodejs::EntryChunkGroupResult,
}, },
}; };
......
...@@ -19,6 +19,6 @@ shadow_rs::shadow!(build); ...@@ -19,6 +19,6 @@ shadow_rs::shadow!(build);
pub fn register() { pub fn register() {
next_core::register(); next_core::register();
turbopack_binding::turbopack::build::register(); turbopack_binding::turbopack::nodejs::register();
include!(concat!(env!("OUT_DIR"), "/register.rs")); include!(concat!(env!("OUT_DIR"), "/register.rs"));
} }
...@@ -36,7 +36,6 @@ use turbopack_binding::{ ...@@ -36,7 +36,6 @@ use turbopack_binding::{
File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
}, },
turbopack::{ turbopack::{
build::{BuildChunkingContext, EntryChunkGroupResult},
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
...@@ -57,6 +56,7 @@ use turbopack_binding::{ ...@@ -57,6 +56,7 @@ use turbopack_binding::{
resolve::esm_resolve, resolve::esm_resolve,
EcmascriptModuleAsset, EcmascriptModuleAsset,
}, },
nodejs::{EntryChunkGroupResult, NodeJsChunkingContext},
turbopack::{ turbopack::{
module_options::ModuleOptionsContext, module_options::ModuleOptionsContext,
resolve_options_context::ResolveOptionsContext, resolve_options_context::ResolveOptionsContext,
...@@ -658,7 +658,7 @@ impl PageEndpoint { ...@@ -658,7 +658,7 @@ impl PageEndpoint {
project_root: Vc<FileSystemPath>, project_root: Vc<FileSystemPath>,
module_context: Vc<ModuleAssetContext>, module_context: Vc<ModuleAssetContext>,
edge_module_context: Vc<ModuleAssetContext>, edge_module_context: Vc<ModuleAssetContext>,
chunking_context: Vc<BuildChunkingContext>, chunking_context: Vc<NodeJsChunkingContext>,
edge_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, edge_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>,
runtime_entries: Vc<EvaluatableAssets>, runtime_entries: Vc<EvaluatableAssets>,
edge_runtime_entries: Vc<EvaluatableAssets>, edge_runtime_entries: Vc<EvaluatableAssets>,
......
...@@ -33,7 +33,7 @@ use turbopack_binding::{ ...@@ -33,7 +33,7 @@ use turbopack_binding::{
tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem}, tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem},
}, },
turbopack::{ turbopack::{
build::BuildChunkingContext, browser::BrowserChunkingContext,
core::{ core::{
changed::content_changed, changed::content_changed,
compile_time_info::CompileTimeInfo, compile_time_info::CompileTimeInfo,
...@@ -48,9 +48,9 @@ use turbopack_binding::{ ...@@ -48,9 +48,9 @@ use turbopack_binding::{
version::{Update, Version, VersionState, VersionedContent}, version::{Update, Version, VersionState, VersionedContent},
PROJECT_FILESYSTEM_NAME, PROJECT_FILESYSTEM_NAME,
}, },
dev::DevChunkingContext,
ecmascript::chunk::EcmascriptChunkingContext, ecmascript::chunk::EcmascriptChunkingContext,
node::execution_context::ExecutionContext, node::execution_context::ExecutionContext,
nodejs::NodeJsChunkingContext,
turbopack::{evaluate_context::node_build_environment, ModuleAssetContext}, turbopack::{evaluate_context::node_build_environment, ModuleAssetContext},
}, },
}; };
...@@ -497,7 +497,7 @@ impl Project { ...@@ -497,7 +497,7 @@ impl Project {
let node_root = self.node_root(); let node_root = self.node_root();
let node_execution_chunking_context = Vc::upcast( let node_execution_chunking_context = Vc::upcast(
DevChunkingContext::builder( BrowserChunkingContext::builder(
self.project_path(), self.project_path(),
node_root, node_root,
node_root, node_root,
...@@ -555,25 +555,31 @@ impl Project { ...@@ -555,25 +555,31 @@ impl Project {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub(super) fn server_chunking_context(self: Vc<Self>) -> Vc<BuildChunkingContext> { pub(super) async fn server_chunking_context(
get_server_chunking_context( self: Vc<Self>,
) -> Result<Vc<NodeJsChunkingContext>> {
Ok(get_server_chunking_context(
self.next_mode(),
self.project_path(), self.project_path(),
self.node_root(), self.node_root(),
self.client_relative_path(), self.client_relative_path(),
self.next_config().computed_asset_prefix(), self.next_config().computed_asset_prefix(),
self.server_compile_time_info().environment(), self.server_compile_time_info().environment(),
) ))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub(super) fn edge_chunking_context(self: Vc<Self>) -> Vc<Box<dyn EcmascriptChunkingContext>> { pub(super) fn edge_chunking_context(
get_edge_chunking_context( self: Vc<Self>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
Ok(get_edge_chunking_context(
self.next_mode(),
self.project_path(), self.project_path(),
self.node_root(), self.node_root(),
self.client_relative_path(), self.client_relative_path(),
self.next_config().computed_asset_prefix(), self.next_config().computed_asset_prefix(),
self.edge_compile_time_info().environment(), self.edge_compile_time_info().environment(),
) ))
} }
/// Emit a telemetry event corresponding to [webpack configuration telemetry](https://github.com/vercel/next.js/blob/9da305fe320b89ee2f8c3cfb7ecbf48856368913/packages/next/src/build/webpack-config.ts#L2516) /// Emit a telemetry event corresponding to [webpack configuration telemetry](https://github.com/vercel/next.js/blob/9da305fe320b89ee2f8c3cfb7ecbf48856368913/packages/next/src/build/webpack-config.ts#L2516)
......
...@@ -27,9 +27,9 @@ turbopack-binding = { workspace = true, features = [ ...@@ -27,9 +27,9 @@ turbopack-binding = { workspace = true, features = [
"__turbo_tasks_fs", "__turbo_tasks_fs",
"__turbo_tasks_memory", "__turbo_tasks_memory",
"__turbopack", "__turbopack",
"__turbopack_build", "__turbopack_nodejs",
"__turbopack_core", "__turbopack_core",
"__turbopack_dev", "__turbopack_browser",
"__turbopack_ecmascript", "__turbopack_ecmascript",
"__turbopack_ecmascript_runtime", "__turbopack_ecmascript_runtime",
"__turbopack_env", "__turbopack_env",
......
...@@ -11,8 +11,8 @@ pub fn register() { ...@@ -11,8 +11,8 @@ pub fn register() {
turbopack_binding::turbopack::turbopack::register(); turbopack_binding::turbopack::turbopack::register();
turbopack_binding::turbopack::core::register(); turbopack_binding::turbopack::core::register();
turbopack_binding::turbopack::node::register(); turbopack_binding::turbopack::node::register();
turbopack_binding::turbopack::dev::register(); turbopack_binding::turbopack::browser::register();
turbopack_binding::turbopack::build::register(); turbopack_binding::turbopack::nodejs::register();
next_core::register(); next_core::register();
include!(concat!(env!("OUT_DIR"), "/register.rs")); include!(concat!(env!("OUT_DIR"), "/register.rs"));
} }
...@@ -44,9 +44,9 @@ turbopack-binding = { workspace = true, features = [ ...@@ -44,9 +44,9 @@ turbopack-binding = { workspace = true, features = [
"__turbo_tasks_fs", "__turbo_tasks_fs",
"__turbo_tasks_hash", "__turbo_tasks_hash",
"__turbopack", "__turbopack",
"__turbopack_build", "__turbopack_nodejs",
"__turbopack_core", "__turbopack_core",
"__turbopack_dev", "__turbopack_browser",
"__turbopack_ecmascript", "__turbopack_ecmascript",
"__turbopack_ecmascript_plugin", "__turbopack_ecmascript_plugin",
"__turbopack_ecmascript_runtime", "__turbopack_ecmascript_runtime",
...@@ -74,5 +74,5 @@ image-avif = ["turbopack-binding/__turbopack_image_avif"] ...@@ -74,5 +74,5 @@ image-avif = ["turbopack-binding/__turbopack_image_avif"]
# enable "HMR" for embedded assets # enable "HMR" for embedded assets
dynamic_embed_contents = [ dynamic_embed_contents = [
"turbopack-binding/__turbo_tasks_fs_dynamic_embed_contents", "turbopack-binding/__turbo_tasks_fs_dynamic_embed_contents",
"turbopack-binding/__turbopack_dev_dynamic_embed_contents", "turbopack-binding/__turbopack_browser_dynamic_embed_contents",
] ]
...@@ -57,7 +57,7 @@ pub fn register() { ...@@ -57,7 +57,7 @@ pub fn register() {
turbo::tasks_bytes::register(); turbo::tasks_bytes::register();
turbo::tasks_fs::register(); turbo::tasks_fs::register();
turbo::tasks_fetch::register(); turbo::tasks_fetch::register();
turbopack::dev::register(); turbopack::browser::register();
turbopack::node::register(); turbopack::node::register();
turbopack::turbopack::register(); turbopack::turbopack::register();
turbopack::image::register(); turbopack::image::register();
......
...@@ -40,4 +40,11 @@ impl NextMode { ...@@ -40,4 +40,11 @@ impl NextMode {
NextMode::Build => true, NextMode::Build => true,
} }
} }
pub fn should_minify(&self) -> bool {
match self {
NextMode::Development => false,
NextMode::Build => true,
}
}
} }
...@@ -7,7 +7,9 @@ use turbo_tasks_fs::FileSystem; ...@@ -7,7 +7,9 @@ use turbo_tasks_fs::FileSystem;
use turbopack_binding::{ use turbopack_binding::{
turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath}, turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath},
turbopack::{ turbopack::{
browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext},
core::{ core::{
chunk::MinifyType,
compile_time_info::{ compile_time_info::{
CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference, CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
FreeVarReferences, FreeVarReferences,
...@@ -16,7 +18,6 @@ use turbopack_binding::{ ...@@ -16,7 +18,6 @@ use turbopack_binding::{
free_var_references, free_var_references,
resolve::{parse::Request, pattern::Pattern}, resolve::{parse::Request, pattern::Pattern},
}, },
dev::{react_refresh::assert_can_resolve_react_refresh, DevChunkingContext},
ecmascript::{chunk::EcmascriptChunkingContext, TreeShakingMode}, ecmascript::{chunk::EcmascriptChunkingContext, TreeShakingMode},
node::{ node::{
execution_context::ExecutionContext, execution_context::ExecutionContext,
...@@ -336,7 +337,8 @@ pub async fn get_client_chunking_context( ...@@ -336,7 +337,8 @@ pub async fn get_client_chunking_context(
environment: Vc<Environment>, environment: Vc<Environment>,
mode: Vc<NextMode>, mode: Vc<NextMode>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> { ) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
let mut builder = DevChunkingContext::builder( let next_mode = mode.await?;
let mut builder = BrowserChunkingContext::builder(
project_path, project_path,
client_root, client_root,
client_root, client_root,
...@@ -345,9 +347,14 @@ pub async fn get_client_chunking_context( ...@@ -345,9 +347,14 @@ pub async fn get_client_chunking_context(
environment, environment,
) )
.chunk_base_path(asset_prefix) .chunk_base_path(asset_prefix)
.minify_type(if next_mode.should_minify() {
MinifyType::Minify
} else {
MinifyType::NoMinify
})
.asset_base_path(asset_prefix); .asset_base_path(asset_prefix);
if mode.await?.is_development() { if next_mode.is_development() {
builder = builder.hot_module_replacement(); builder = builder.hot_module_replacement();
} }
......
...@@ -4,7 +4,9 @@ use turbo_tasks::{Value, Vc}; ...@@ -4,7 +4,9 @@ use turbo_tasks::{Value, Vc};
use turbopack_binding::{ use turbopack_binding::{
turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath}, turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath},
turbopack::{ turbopack::{
browser::BrowserChunkingContext,
core::{ core::{
chunk::MinifyType,
compile_time_info::{ compile_time_info::{
CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference, CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
FreeVarReferences, FreeVarReferences,
...@@ -12,7 +14,6 @@ use turbopack_binding::{ ...@@ -12,7 +14,6 @@ use turbopack_binding::{
environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment}, environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment},
free_var_references, free_var_references,
}, },
dev::DevChunkingContext,
ecmascript::chunk::EcmascriptChunkingContext, ecmascript::chunk::EcmascriptChunkingContext,
node::{debug::should_debug, execution_context::ExecutionContext}, node::{debug::should_debug, execution_context::ExecutionContext},
turbopack::resolve_options_context::ResolveOptionsContext, turbopack::resolve_options_context::ResolveOptionsContext,
...@@ -148,16 +149,17 @@ pub async fn get_edge_resolve_options_context( ...@@ -148,16 +149,17 @@ pub async fn get_edge_resolve_options_context(
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn get_edge_chunking_context( pub async fn get_edge_chunking_context(
mode: Vc<NextMode>,
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
node_root: Vc<FileSystemPath>, node_root: Vc<FileSystemPath>,
client_root: Vc<FileSystemPath>, client_root: Vc<FileSystemPath>,
asset_prefix: Vc<Option<String>>, asset_prefix: Vc<Option<String>>,
environment: Vc<Environment>, environment: Vc<Environment>,
) -> Vc<Box<dyn EcmascriptChunkingContext>> { ) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
let output_root = node_root.join("server/edge".to_string()); let output_root = node_root.join("server/edge".to_string());
Vc::upcast( Ok(Vc::upcast(
DevChunkingContext::builder( BrowserChunkingContext::builder(
project_path, project_path,
output_root, output_root,
client_root, client_root,
...@@ -167,6 +169,11 @@ pub fn get_edge_chunking_context( ...@@ -167,6 +169,11 @@ pub fn get_edge_chunking_context(
) )
.asset_base_path(asset_prefix) .asset_base_path(asset_prefix)
.reference_chunk_source_maps(should_debug("edge")) .reference_chunk_source_maps(should_debug("edge"))
.minify_type(if mode.await?.should_minify() {
MinifyType::Minify
} else {
MinifyType::NoMinify
})
.build(), .build(),
) ))
} }
...@@ -8,8 +8,8 @@ use turbopack_binding::{ ...@@ -8,8 +8,8 @@ use turbopack_binding::{
tasks_fs::FileSystemPath, tasks_fs::FileSystemPath,
}, },
turbopack::{ turbopack::{
build::{BuildChunkingContext, MinifyType},
core::{ core::{
chunk::MinifyType,
compile_time_info::{ compile_time_info::{
CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReferences, CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReferences,
}, },
...@@ -22,6 +22,7 @@ use turbopack_binding::{ ...@@ -22,6 +22,7 @@ use turbopack_binding::{
execution_context::ExecutionContext, execution_context::ExecutionContext,
transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions},
}, },
nodejs::NodeJsChunkingContext,
turbopack::{ turbopack::{
condition::ContextCondition, condition::ContextCondition,
module_options::{ module_options::{
...@@ -725,7 +726,8 @@ pub fn get_server_runtime_entries( ...@@ -725,7 +726,8 @@ pub fn get_server_runtime_entries(
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn get_server_chunking_context( pub async fn get_server_chunking_context(
mode: Vc<NextMode>,
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
node_root: Vc<FileSystemPath>, node_root: Vc<FileSystemPath>,
// TODO(alexkirsz) Is this even necessary? Are assets not always on the client chunking context // TODO(alexkirsz) Is this even necessary? Are assets not always on the client chunking context
...@@ -733,11 +735,11 @@ pub fn get_server_chunking_context( ...@@ -733,11 +735,11 @@ pub fn get_server_chunking_context(
client_root: Vc<FileSystemPath>, client_root: Vc<FileSystemPath>,
asset_prefix: Vc<Option<String>>, asset_prefix: Vc<Option<String>>,
environment: Vc<Environment>, environment: Vc<Environment>,
) -> Vc<BuildChunkingContext> { ) -> Result<Vc<NodeJsChunkingContext>> {
// TODO(alexkirsz) This should return a trait that can be implemented by the // TODO(alexkirsz) This should return a trait that can be implemented by the
// different server chunking contexts. OR the build chunking context should // different server chunking contexts. OR the build chunking context should
// support both production and development modes. // support both production and development modes.
BuildChunkingContext::builder( Ok(NodeJsChunkingContext::builder(
project_path, project_path,
node_root, node_root,
client_root, client_root,
...@@ -746,6 +748,10 @@ pub fn get_server_chunking_context( ...@@ -746,6 +748,10 @@ pub fn get_server_chunking_context(
environment, environment,
) )
.asset_prefix(asset_prefix) .asset_prefix(asset_prefix)
.minify_type(MinifyType::NoMinify) .minify_type(if mode.await?.should_minify() {
.build() MinifyType::Minify
} else {
MinifyType::NoMinify
})
.build())
} }
...@@ -3,12 +3,12 @@ use turbo_tasks::Vc; ...@@ -3,12 +3,12 @@ use turbo_tasks::Vc;
use turbopack_binding::{ use turbopack_binding::{
turbo::tasks_fs::{FileJsonContent, FileSystemPath}, turbo::tasks_fs::{FileJsonContent, FileSystemPath},
turbopack::{ turbopack::{
browser::react_refresh::assert_can_resolve_react_refresh,
core::{ core::{
file_source::FileSource, file_source::FileSource,
resolve::{find_context_file, node::node_cjs_resolve_options, FindContextFileResult}, resolve::{find_context_file, node::node_cjs_resolve_options, FindContextFileResult},
source::Source, source::Source,
}, },
dev::react_refresh::assert_can_resolve_react_refresh,
ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig}, ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig},
turbopack::{ turbopack::{
module_options::{ module_options::{
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4", "@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3",
"acorn": "8.5.0", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
This diff is collapsed.
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