From cde0b1f54b1ab0ee1fe15c75ad088ef84fa0fa07 Mon Sep 17 00:00:00 2001 From: ahabhgk Date: Tue, 17 Oct 2023 18:50:44 +0800 Subject: [PATCH] rename --- crates/rspack_core/src/external_module.rs | 4 ++-- crates/rspack_core/src/module.rs | 2 +- .../src/dependency/esm/harmony_compatibility_dependency.rs | 2 +- .../src/plugin/infer_async_modules_plugin.rs | 2 +- .../src/visitors/dependency/harmony_detection_scanner.rs | 2 +- crates/rspack_plugin_wasm/src/parser_and_generator.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/rspack_core/src/external_module.rs b/crates/rspack_core/src/external_module.rs index 6f51163541b8..f7268b138dce 100644 --- a/crates/rspack_core/src/external_module.rs +++ b/crates/rspack_core/src/external_module.rs @@ -306,9 +306,9 @@ impl Module for ExternalModule { "this" => build_result.build_info.strict = false, "system" => build_result.build_meta.exports_type = BuildMetaExportsType::Namespace, "module" => build_result.build_meta.exports_type = BuildMetaExportsType::Namespace, - "script" | "promise" => build_result.build_meta.has_await = true, + "script" | "promise" => build_result.build_meta.has_top_level_await = true, "import" => { - build_result.build_meta.has_await = true; + build_result.build_meta.has_top_level_await = true; build_result.build_meta.exports_type = BuildMetaExportsType::Namespace; } _ => build_result.build_meta.exports_type = BuildMetaExportsType::Dynamic, diff --git a/crates/rspack_core/src/module.rs b/crates/rspack_core/src/module.rs index f3f8342ff6fd..2c9c2ca0dd77 100644 --- a/crates/rspack_core/src/module.rs +++ b/crates/rspack_core/src/module.rs @@ -111,7 +111,7 @@ impl Display for ExportsArgument { pub struct BuildMeta { pub strict: bool, pub strict_harmony_module: bool, - pub has_await: bool, + pub has_top_level_await: bool, pub esm: bool, pub exports_type: BuildMetaExportsType, pub default_object: BuildMetaDefaultObject, diff --git a/crates/rspack_plugin_javascript/src/dependency/esm/harmony_compatibility_dependency.rs b/crates/rspack_plugin_javascript/src/dependency/esm/harmony_compatibility_dependency.rs index 6bf24e36c52f..4bfd3d5473f4 100644 --- a/crates/rspack_plugin_javascript/src/dependency/esm/harmony_compatibility_dependency.rs +++ b/crates/rspack_plugin_javascript/src/dependency/esm/harmony_compatibility_dependency.rs @@ -59,7 +59,7 @@ impl DependencyTemplate for HarmonyCompatibilityDependency { InitFragmentStage::StageAsyncBoundary, 0, InitFragmentKey::uniqie(), - Some(format!("\n__webpack_async_result__();\n}} catch(e) {{ __webpack_async_result__(e); }} }}{});", if matches!(mgm.build_meta.as_ref().map(|meta| meta.has_await), Some(true)) { ", 1" } else { "" })), + Some(format!("\n__webpack_async_result__();\n}} catch(e) {{ __webpack_async_result__(e); }} }}{});", if matches!(mgm.build_meta.as_ref().map(|meta| meta.has_top_level_await), Some(true)) { ", 1" } else { "" })), ))); } } diff --git a/crates/rspack_plugin_javascript/src/plugin/infer_async_modules_plugin.rs b/crates/rspack_plugin_javascript/src/plugin/infer_async_modules_plugin.rs index eb4af563da57..d6e01ca5e7e7 100644 --- a/crates/rspack_plugin_javascript/src/plugin/infer_async_modules_plugin.rs +++ b/crates/rspack_plugin_javascript/src/plugin/infer_async_modules_plugin.rs @@ -25,7 +25,7 @@ impl Plugin for InferAsyncModulesPlugin { .values() .filter(|m| { if let Some(meta) = &m.build_meta { - meta.has_await + meta.has_top_level_await } else { false } diff --git a/crates/rspack_plugin_javascript/src/visitors/dependency/harmony_detection_scanner.rs b/crates/rspack_plugin_javascript/src/visitors/dependency/harmony_detection_scanner.rs index a9a3c3be90c7..d2c11dd2090f 100644 --- a/crates/rspack_plugin_javascript/src/visitors/dependency/harmony_detection_scanner.rs +++ b/crates/rspack_plugin_javascript/src/visitors/dependency/harmony_detection_scanner.rs @@ -63,7 +63,7 @@ impl Visit for HarmonyDetectionScanner<'_> { if !self.top_level_await { self.errors.push(internal_error!("The top-level-await experiment is not enabled (set experiments.topLevelAwait: true to enabled it)")); } else if is_harmony || strict_harmony_module { - self.build_meta.has_await = true; + self.build_meta.has_top_level_await = true; } else { self.errors.push(internal_error!( "Top-level-await is only supported in EcmaScript Modules: {}", diff --git a/crates/rspack_plugin_wasm/src/parser_and_generator.rs b/crates/rspack_plugin_wasm/src/parser_and_generator.rs index 607a258ed3c6..7dbe8638ea69 100644 --- a/crates/rspack_plugin_wasm/src/parser_and_generator.rs +++ b/crates/rspack_plugin_wasm/src/parser_and_generator.rs @@ -30,7 +30,7 @@ impl ParserAndGenerator for AsyncWasmParserAndGenerator { fn parse(&mut self, parse_context: ParseContext) -> Result> { parse_context.build_info.strict = true; - parse_context.build_meta.has_await = true; + parse_context.build_meta.has_top_level_await = true; parse_context.build_meta.exports_type = BuildMetaExportsType::Namespace; let source = parse_context.source;