Unverified Commit e58c63b9 authored by OJ Kwon's avatar OJ Kwon Committed by GitHub

fix(next_core): do not apply user config to internal assets (#48210)



### What?
This is necessary changes for the WEB-862, however dependent to https://github.com/vercel/turbo/pull/4521.
parent e6acd40c
...@@ -23,9 +23,11 @@ use turbo_binding::{ ...@@ -23,9 +23,11 @@ use turbo_binding::{
env::ProcessEnvAssetVc, env::ProcessEnvAssetVc,
node::execution_context::ExecutionContextVc, node::execution_context::ExecutionContextVc,
turbopack::{ turbopack::{
condition::ContextCondition,
module_options::{ module_options::{
module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc}, module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc},
PostCssTransformOptions, WebpackLoadersOptions, JsxTransformOptions, PostCssTransformOptions, TypescriptTransformOptions,
WebpackLoadersOptions,
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
transition::TransitionsByNameVc, transition::TransitionsByNameVc,
...@@ -34,10 +36,12 @@ use turbo_binding::{ ...@@ -34,10 +36,12 @@ use turbo_binding::{
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use super::transforms::get_next_client_transforms_rules; use super::transforms::get_next_client_transforms_rules;
use crate::{ use crate::{
babel::maybe_add_babel_loader, babel::maybe_add_babel_loader,
embed_js::next_js_fs,
env::env_for_js, env::env_for_js,
next_build::{get_external_next_compiled_package_mapping, get_postcss_package_mapping}, next_build::{get_external_next_compiled_package_mapping, get_postcss_package_mapping},
next_client::runtime_entry::{RuntimeEntriesVc, RuntimeEntry}, next_client::runtime_entry::{RuntimeEntriesVc, RuntimeEntry},
...@@ -219,10 +223,23 @@ pub async fn get_client_module_options_context( ...@@ -219,10 +223,23 @@ pub async fn get_client_module_options_context(
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition(next_config).await?, (
module_options_context.clone().cell(), foreign_code_context_condition(next_config).await?,
)], module_options_context.clone().cell(),
),
// If the module is an internal asset (i.e overlay, fallback) coming from the embedded
// FS, don't apply user defined transforms.
(
ContextCondition::InPath(next_js_fs().root()),
ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
enable_jsx: Some(JsxTransformOptions::default().cell()),
..module_options_context.clone()
}
.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
......
...@@ -17,21 +17,24 @@ use turbo_binding::{ ...@@ -17,21 +17,24 @@ use turbo_binding::{
ecmascript::EcmascriptInputTransform, ecmascript::EcmascriptInputTransform,
node::execution_context::ExecutionContextVc, node::execution_context::ExecutionContextVc,
turbopack::{ turbopack::{
condition::ContextCondition,
module_options::{ module_options::{
ModuleOptionsContext, ModuleOptionsContextVc, PostCssTransformOptions, JsxTransformOptions, ModuleOptionsContext, ModuleOptionsContextVc,
WebpackLoadersOptions, PostCssTransformOptions, TypescriptTransformOptions, WebpackLoadersOptions,
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
}, },
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use super::{ use super::{
resolve::ExternalCjsModulesResolvePluginVc, transforms::get_next_server_transforms_rules, resolve::ExternalCjsModulesResolvePluginVc, transforms::get_next_server_transforms_rules,
}; };
use crate::{ use crate::{
babel::maybe_add_babel_loader, babel::maybe_add_babel_loader,
embed_js::next_js_fs,
next_build::{get_external_next_compiled_package_mapping, get_postcss_package_mapping}, next_build::{get_external_next_compiled_package_mapping, get_postcss_package_mapping},
next_config::NextConfigVc, next_config::NextConfigVc,
next_import_map::get_next_server_import_map, next_import_map::get_next_server_import_map,
...@@ -270,6 +273,13 @@ pub async fn get_server_module_options_context( ...@@ -270,6 +273,13 @@ pub async fn get_server_module_options_context(
execution_context: Some(execution_context), execution_context: Some(execution_context),
..Default::default() ..Default::default()
}; };
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
enable_jsx: Some(JsxTransformOptions::default().cell()),
..module_options_context.clone()
};
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_styled_jsx: true, enable_styled_jsx: true,
...@@ -280,10 +290,16 @@ pub async fn get_server_module_options_context( ...@@ -280,10 +290,16 @@ pub async fn get_server_module_options_context(
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition, (
module_options_context.clone().cell(), foreign_code_context_condition,
)], module_options_context.clone().cell(),
),
(
ContextCondition::InPath(next_js_fs().root()),
internal_module_options_context.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
...@@ -298,6 +314,11 @@ pub async fn get_server_module_options_context( ...@@ -298,6 +314,11 @@ pub async fn get_server_module_options_context(
execution_context: Some(execution_context), execution_context: Some(execution_context),
..Default::default() ..Default::default()
}; };
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
..module_options_context.clone()
};
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_styled_jsx: true, enable_styled_jsx: true,
...@@ -308,10 +329,16 @@ pub async fn get_server_module_options_context( ...@@ -308,10 +329,16 @@ pub async fn get_server_module_options_context(
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition, (
module_options_context.clone().cell(), foreign_code_context_condition,
)], module_options_context.clone().cell(),
),
(
ContextCondition::InPath(next_js_fs().root()),
internal_module_options_context.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
...@@ -332,6 +359,10 @@ pub async fn get_server_module_options_context( ...@@ -332,6 +359,10 @@ pub async fn get_server_module_options_context(
execution_context: Some(execution_context), execution_context: Some(execution_context),
..Default::default() ..Default::default()
}; };
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
..module_options_context.clone()
};
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_emotion, enable_emotion,
...@@ -341,10 +372,16 @@ pub async fn get_server_module_options_context( ...@@ -341,10 +372,16 @@ pub async fn get_server_module_options_context(
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition, (
module_options_context.clone().cell(), foreign_code_context_condition,
)], module_options_context.clone().cell(),
),
(
ContextCondition::InPath(next_js_fs().root()),
internal_module_options_context.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
...@@ -354,16 +391,26 @@ pub async fn get_server_module_options_context( ...@@ -354,16 +391,26 @@ pub async fn get_server_module_options_context(
execution_context: Some(execution_context), execution_context: Some(execution_context),
..Default::default() ..Default::default()
}; };
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
..module_options_context.clone()
};
ModuleOptionsContext { ModuleOptionsContext {
enable_postcss_transform, enable_postcss_transform,
enable_webpack_loaders, enable_webpack_loaders,
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition, (
module_options_context.clone().cell(), foreign_code_context_condition,
)], module_options_context.clone().cell(),
),
(
ContextCondition::InPath(next_js_fs().root()),
internal_module_options_context.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
...@@ -373,6 +420,10 @@ pub async fn get_server_module_options_context( ...@@ -373,6 +420,10 @@ pub async fn get_server_module_options_context(
execution_context: Some(execution_context), execution_context: Some(execution_context),
..Default::default() ..Default::default()
}; };
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
..module_options_context.clone()
};
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_emotion, enable_emotion,
...@@ -383,10 +434,16 @@ pub async fn get_server_module_options_context( ...@@ -383,10 +434,16 @@ pub async fn get_server_module_options_context(
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_mdx_rs: mdx_rs_options, enable_mdx_rs: mdx_rs_options,
decorators: Some(decorators_options), decorators: Some(decorators_options),
rules: vec![( rules: vec![
foreign_code_context_condition, (
module_options_context.clone().cell(), foreign_code_context_condition,
)], module_options_context.clone().cell(),
),
(
ContextCondition::InPath(next_js_fs().root()),
internal_module_options_context.cell(),
),
],
custom_rules, custom_rules,
..module_options_context ..module_options_context
} }
......
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