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

[Turbopack] allow to configure last successful parse cache state (#75851)

### What?

Add an option for using the parser AST state and only enable it in development mode.
parent 203fa9f3
...@@ -338,6 +338,7 @@ pub async fn get_client_module_options_context( ...@@ -338,6 +338,7 @@ pub async fn get_client_module_options_context(
tree_shaking_mode: tree_shaking_mode_for_user_code, tree_shaking_mode: tree_shaking_mode_for_user_code,
enable_postcss_transform, enable_postcss_transform,
side_effect_free_packages: next_config.optimize_package_imports().await?.clone_value(), side_effect_free_packages: next_config.optimize_package_imports().await?.clone_value(),
keep_last_successful_parse: next_mode.is_development(),
..Default::default() ..Default::default()
}; };
......
...@@ -556,6 +556,7 @@ pub async fn get_server_module_options_context( ...@@ -556,6 +556,7 @@ pub async fn get_server_module_options_context(
} else { } else {
None None
}, },
keep_last_successful_parse: next_mode.is_development(),
..Default::default() ..Default::default()
}; };
......
...@@ -109,16 +109,18 @@ async fn get_client_module_options_context( ...@@ -109,16 +109,18 @@ async fn get_client_module_options_context(
node_env: Vc<NodeEnv>, node_env: Vc<NodeEnv>,
source_maps_type: SourceMapsType, source_maps_type: SourceMapsType,
) -> Result<Vc<ModuleOptionsContext>> { ) -> Result<Vc<ModuleOptionsContext>> {
let is_dev = matches!(*node_env.await?, NodeEnv::Development);
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
preset_env_versions: Some(env), preset_env_versions: Some(env),
execution_context: Some(execution_context), execution_context: Some(execution_context),
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
keep_last_successful_parse: is_dev,
..Default::default() ..Default::default()
}; };
let resolve_options_context = get_client_resolve_options_context(project_path, node_env); let resolve_options_context = get_client_resolve_options_context(project_path, node_env);
let enable_react_refresh = matches!(*node_env.await?, NodeEnv::Development) let enable_react_refresh = is_dev
&& assert_can_resolve_react_refresh(project_path, resolve_options_context) && assert_can_resolve_react_refresh(project_path, resolve_options_context)
.await? .await?
.is_found(); .is_found();
...@@ -153,7 +155,7 @@ async fn get_client_module_options_context( ...@@ -153,7 +155,7 @@ async fn get_client_module_options_context(
TypescriptTransformOptions::default().resolved_cell(), TypescriptTransformOptions::default().resolved_cell(),
), ),
source_maps: source_maps_type, source_maps: source_maps_type,
..Default::default() ..module_options_context.ecmascript.clone()
}, },
enable_postcss_transform: Some(PostCssTransformOptions::default().resolved_cell()), enable_postcss_transform: Some(PostCssTransformOptions::default().resolved_cell()),
rules: vec![( rules: vec![(
......
...@@ -151,6 +151,10 @@ pub struct EcmascriptOptions { ...@@ -151,6 +151,10 @@ pub struct EcmascriptOptions {
/// If true, it reads a sourceMappingURL comment from the end of the file, /// If true, it reads a sourceMappingURL comment from the end of the file,
/// reads and generates a source map. /// reads and generates a source map.
pub extract_source_map: bool, pub extract_source_map: bool,
/// If true, it stores the last successful parse result in state and keeps using it when
/// parsing fails. This is useful to keep the module graph structure intact when syntax errors
/// are temporarily introduced.
pub keep_last_successful_parse: bool,
} }
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
...@@ -347,16 +351,20 @@ impl EcmascriptParsable for EcmascriptModuleAsset { ...@@ -347,16 +351,20 @@ impl EcmascriptParsable for EcmascriptModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn failsafe_parse(self: Vc<Self>) -> Result<Vc<ParseResult>> { async fn failsafe_parse(self: Vc<Self>) -> Result<Vc<ParseResult>> {
let real_result = self.parse(); let real_result = self.parse();
let real_result_value = real_result.await?;
let this = self.await?; let this = self.await?;
let result_value = if matches!(*real_result_value, ParseResult::Ok { .. }) { if this.options.await?.keep_last_successful_parse {
this.last_successful_parse.set(real_result_value.clone()); let real_result_value = real_result.await?;
real_result_value let result_value = if matches!(*real_result_value, ParseResult::Ok { .. }) {
this.last_successful_parse.set(real_result_value.clone());
real_result_value
} else {
let state_ref = this.last_successful_parse.get();
state_ref.as_ref().unwrap_or(&real_result_value).clone()
};
Ok(ReadRef::cell(result_value))
} else { } else {
let state_ref = this.last_successful_parse.get(); Ok(real_result)
state_ref.as_ref().unwrap_or(&real_result_value).clone() }
};
Ok(ReadRef::cell(result_value))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -98,6 +98,7 @@ impl ModuleOptions { ...@@ -98,6 +98,7 @@ impl ModuleOptions {
execution_context, execution_context,
ref rules, ref rules,
tree_shaking_mode, tree_shaking_mode,
keep_last_successful_parse,
.. ..
} = *module_options_context.await?; } = *module_options_context.await?;
...@@ -141,6 +142,7 @@ impl ModuleOptions { ...@@ -141,6 +142,7 @@ impl ModuleOptions {
ignore_dynamic_requests, ignore_dynamic_requests,
refresh, refresh,
extract_source_map: matches!(ecmascript_source_maps, SourceMapsType::Full), extract_source_map: matches!(ecmascript_source_maps, SourceMapsType::Full),
keep_last_successful_parse,
..Default::default() ..Default::default()
}; };
let ecmascript_options_vc = ecmascript_options.resolved_cell(); let ecmascript_options_vc = ecmascript_options.resolved_cell();
......
...@@ -135,6 +135,11 @@ pub struct ModuleOptionsContext { ...@@ -135,6 +135,11 @@ pub struct ModuleOptionsContext {
/// runtime. /// runtime.
pub enable_externals_tracing: Option<ResolvedVc<FileSystemPath>>, pub enable_externals_tracing: Option<ResolvedVc<FileSystemPath>>,
/// If true, it stores the last successful parse result in state and keeps using it when
/// parsing fails. This is useful to keep the module graph structure intact when syntax errors
/// are temporarily introduced.
pub keep_last_successful_parse: bool,
/// Custom rules to be applied after all default rules. /// Custom rules to be applied after all default rules.
pub module_rules: Vec<ModuleRule>, pub module_rules: Vec<ModuleRule>,
/// A list of rules to use a different module option context for certain /// A list of rules to use a different module option context for certain
......
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