Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions turbopack/crates/turbopack-browser/src/ecmascript/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use turbopack_ecmascript::{
EcmascriptHmrChunkContent, merger::EcmascriptChunkContentMerger,
version::EcmascriptChunkVersion,
},
minify::{get_compress_options, minify},
minify::{get_compress_options_for_target, minify},
utils::StringifyJs,
};

Expand Down Expand Up @@ -125,11 +125,17 @@ impl EcmascriptBrowserChunkContent {
if let MinifyType::Minify { mangle, compress } =
*this.chunking_context.minify_type().await?
{
let supports_arrow_functions = *this
.chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
code = minify(
code,
source_maps,
mangle,
get_compress_options(compress, mangle),
get_compress_options_for_target(compress, mangle, supports_arrow_functions),
)?;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use turbopack_core::{
};
use turbopack_ecmascript::{
chunk::{EcmascriptChunkData, EcmascriptChunkPlaceable},
minify::{get_compress_options, minify},
minify::{get_compress_options_for_target, minify},
references::external_module::CachedExternalModule,
utils::StringifyJs,
};
Expand Down Expand Up @@ -256,11 +256,17 @@ impl EcmascriptBrowserEvaluateChunk {
if let MinifyType::Minify { mangle, compress } =
*this.chunking_context.minify_type().await?
{
let supports_arrow_functions = *this
.chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
code = minify(
code,
source_maps,
mangle,
get_compress_options(compress, mangle),
get_compress_options_for_target(compress, mangle, supports_arrow_functions),
)?;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use turbopack_core::{
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, SourceMapAsset},
};
use turbopack_ecmascript::minify::{get_compress_options, minify};
use turbopack_ecmascript::minify::{get_compress_options_for_target, minify};
use turbopack_ecmascript_runtime::{RuntimeType, browser_runtime_options};

use crate::BrowserChunkingContext;
Expand Down Expand Up @@ -94,11 +94,15 @@ impl EcmascriptBrowserRuntimeChunk {
let mut code = code.build();

if let MinifyType::Minify { mangle, compress } = *chunking_context.minify_type().await? {
let supports_arrow_functions = *environment
.runtime_versions()
.supports_arrow_functions()
.await?;
code = minify(
code,
source_maps,
mangle,
get_compress_options(compress, mangle),
get_compress_options_for_target(compress, mangle, supports_arrow_functions),
)?;
}

Expand Down
10 changes: 8 additions & 2 deletions turbopack/crates/turbopack-browser/src/ecmascript/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use turbopack_core::{
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, SourceMapAsset},
};
use turbopack_ecmascript::minify::{get_compress_options, minify};
use turbopack_ecmascript::minify::{get_compress_options_for_target, minify};

use crate::BrowserChunkingContext;

Expand Down Expand Up @@ -71,11 +71,17 @@ impl EcmascriptBrowserWorkerEntrypoint {
if let MinifyType::Minify { mangle, compress } =
*this.chunking_context.minify_type().await?
{
let supports_arrow_functions = *this
.chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
code = minify(
code,
source_maps,
mangle,
get_compress_options(compress, mangle),
get_compress_options_for_target(compress, mangle, supports_arrow_functions),
)?;
}

Expand Down
49 changes: 35 additions & 14 deletions turbopack/crates/turbopack-ecmascript/src/async_chunk/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,41 @@ impl EcmascriptChunkPlaceable for AsyncLoaderModule {
_async_module_info: Option<Vc<AsyncModuleInfo>>,
estimated: bool,
) -> Result<Vc<EcmascriptChunkItemContent>> {
let supports_arrow_functions = *chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
let options = EcmascriptChunkItemOptions {
supports_arrow_functions: *chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?,
supports_arrow_functions,
..Default::default()
};
let parent_import_function = if supports_arrow_functions {
"(parentImport) => {"
} else {
"function(parentImport) {"
};
let no_args_function = if supports_arrow_functions {
"() => {"
} else {
"function() {"
};
let empty_function = if supports_arrow_functions {
"() => {}"
} else {
"function() {}"
};
let load_chunk_function = if supports_arrow_functions {
format!("(chunk) => {TURBOPACK_LOAD}(chunk)")
} else {
format!("function(chunk) {{ return {TURBOPACK_LOAD}(chunk); }}")
};

if estimated {
let code = formatdoc! {
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
return Promise.all([].map((chunk) => {TURBOPACK_LOAD}(chunk))).then(() => {{}});
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.all([].map({load_chunk_function})).then({empty_function});
}});
"#,
};
Expand Down Expand Up @@ -206,8 +227,8 @@ impl EcmascriptChunkPlaceable for AsyncLoaderModule {
(Some(id), true) => {
formatdoc! {
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
return Promise.resolve().then(() => {{
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.resolve().then({no_args_function}
return parentImport({id});
}});
}});
Expand All @@ -218,8 +239,8 @@ impl EcmascriptChunkPlaceable for AsyncLoaderModule {
(Some(id), false) => {
formatdoc! {
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
return Promise.all({chunks:#}.map((chunk) => {TURBOPACK_LOAD}(chunk))).then(() => {{
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.all({chunks:#}.map({load_chunk_function})).then({no_args_function}
return parentImport({id});
}});
}});
Expand All @@ -231,7 +252,7 @@ impl EcmascriptChunkPlaceable for AsyncLoaderModule {
(None, true) => {
formatdoc! {
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.resolve();
}});
"#,
Expand All @@ -240,8 +261,8 @@ impl EcmascriptChunkPlaceable for AsyncLoaderModule {
(None, false) => {
formatdoc! {
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
return Promise.all({chunks:#}.map((chunk) => {TURBOPACK_LOAD}(chunk))).then(() => {{}});
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.all({chunks:#}.map({load_chunk_function})).then({empty_function});
}});
"#,
chunks = StringifyJs(&chunks_data),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ use turbopack_core::{
use super::chunk_asset::ManifestAsyncModule;
use crate::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
data::EcmascriptChunkData, ecmascript_chunk_item,
EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkPlaceable,
EcmascriptExports, data::EcmascriptChunkData, ecmascript_chunk_item,
},
runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_LOAD, TURBOPACK_REQUIRE},
utils::{StringifyJs, StringifyModuleId},
Expand Down Expand Up @@ -129,11 +129,40 @@ impl EcmascriptChunkPlaceable for ManifestLoaderModule {
#[turbo_tasks::function]
async fn chunk_item_content(
self: Vc<Self>,
_chunking_context: Vc<Box<dyn ChunkingContext>>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
_module_graph: Vc<ModuleGraph>,
_async_module_info: Option<Vc<AsyncModuleInfo>>,
_estimated: bool,
) -> Result<Vc<EcmascriptChunkItemContent>> {
let supports_arrow_functions = *chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
let options = EcmascriptChunkItemOptions {
supports_arrow_functions,
..Default::default()
};
let parent_import_function = if supports_arrow_functions {
"(parentImport) => {"
} else {
"function(parentImport) {"
};
let no_args_function = if supports_arrow_functions {
"() => {"
} else {
"function() {"
};
let chunks_function = if supports_arrow_functions {
"(chunks) => {"
} else {
"function(chunks) {"
};
let load_chunk_function = if supports_arrow_functions {
format!("(chunk) => {TURBOPACK_LOAD}(chunk)")
} else {
format!("function(chunk) {{ return {TURBOPACK_LOAD}(chunk); }}")
};
let this = self.await?;
let mut code = Vec::new();

Expand Down Expand Up @@ -168,12 +197,12 @@ impl EcmascriptChunkPlaceable for ManifestLoaderModule {
writedoc!(
code,
r#"
{TURBOPACK_EXPORT_VALUE}((parentImport) => {{
return Promise.all({chunks_server_data}.map((chunk) => {TURBOPACK_LOAD}(chunk))).then(() => {{
{TURBOPACK_EXPORT_VALUE}({parent_import_function}
return Promise.all({chunks_server_data}.map({load_chunk_function})).then({no_args_function}
return {TURBOPACK_REQUIRE}({item_id});
}}).then((chunks) => {{
return Promise.all(chunks.map((chunk) => {TURBOPACK_LOAD}(chunk)));
}}).then(() => {{
}}).then({chunks_function}
return Promise.all(chunks.map({load_chunk_function}));
}}).then({no_args_function}
return parentImport({dynamic_id});
}});
}});
Expand All @@ -190,6 +219,7 @@ impl EcmascriptChunkPlaceable for ManifestLoaderModule {

Ok(EcmascriptChunkItemContent {
inner_code: code.into(),
options,
..Default::default()
}
.cell())
Expand Down
55 changes: 53 additions & 2 deletions turbopack/crates/turbopack-ecmascript/src/minify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@ pub fn get_compress_options(
})
}

pub fn get_compress_options_for_target(
compress: Option<CompressType>,
mangle: Option<MangleType>,
supports_arrow_functions: bool,
) -> Option<CompressOptions> {
let mut options = get_compress_options(compress, mangle);
if let Some(options) = &mut options {
// SWC's default compression can turn functions and object methods into arrow functions,
// even when `ecma` is set to ES5.
options.arrows = supports_arrow_functions;
}
options
}

#[instrument(level = "info", name = "minify ecmascript code", skip_all)]
pub fn minify(
code: Code,
Expand Down Expand Up @@ -361,9 +375,46 @@ fn print_program(

#[cfg(test)]
mod tests {
use turbopack_core::code_builder::CodeBuilder;
use turbopack_core::{chunk::CompressType, code_builder::CodeBuilder};

use super::{
default_compress_options, get_compress_options_for_target, minify,
minify_with_legal_comments,
};

fn minified_source(supports_arrow_functions: bool) -> Vec<u8> {
let mut code = CodeBuilder::default();
code += "const queue = { delete(value) { return value; } }; globalThis.queue = queue;";

use super::{default_compress_options, minify_with_legal_comments};
minify(
code.build(),
false,
None,
get_compress_options_for_target(
Some(CompressType::Default),
None,
supports_arrow_functions,
),
)
.unwrap()
.into_source_code()
.into_bytes()
.to_vec()
}

#[test]
fn respects_arrow_function_support() {
assert!(
minified_source(true)
.windows(2)
.any(|window| window == b"=>")
);
assert!(
!minified_source(false)
.windows(2)
.any(|window| window == b"=>")
);
}

#[test]
fn extracts_and_deduplicates_legal_comments() {
Expand Down
10 changes: 8 additions & 2 deletions turbopack/crates/turbopack-nodejs/src/ecmascript/node/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use turbopack_ecmascript::{
EcmascriptHmrChunkContent, merger::EcmascriptChunkContentMerger,
version::EcmascriptChunkVersion,
},
minify::{get_compress_options, minify},
minify::{get_compress_options_for_target, minify},
utils::StringifyJs,
};

Expand Down Expand Up @@ -85,11 +85,17 @@ impl EcmascriptNodeChunkContent {
if let MinifyType::Minify { mangle, compress } =
*self.chunking_context.minify_type().await?
{
let supports_arrow_functions = *self
.chunking_context
.environment()
.runtime_versions()
.supports_arrow_functions()
.await?;
code = minify(
code,
source_maps,
mangle,
get_compress_options(compress, mangle),
get_compress_options_for_target(compress, mangle, supports_arrow_functions),
)?;
}

Expand Down
Loading