fix

web-infra-dev · Aug 15, 2024 · 537e5db · 537e5db
1 parent c44c94b
commit 537e5db
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_core/src/concatenated_module.rs b/crates/rspack_core/src/concatenated_module.rs
@@ -603,6 +603,7 @@ impl Module for ConcatenatedModule {
     Ok(BuildResult::default())
   }
 
+  #[tracing::instrument(name = "ConcatenatedModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_core/src/context_module.rs b/crates/rspack_core/src/context_module.rs
@@ -897,6 +897,7 @@ impl Module for ContextModule {
     })
   }
 
+  #[tracing::instrument(name = "ContextModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_core/src/external_module.rs b/crates/rspack_core/src/external_module.rs
@@ -495,6 +495,7 @@ impl Module for ExternalModule {
     Ok(build_result)
   }
 
+  #[tracing::instrument(name = "ExternalModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_core/src/module.rs b/crates/rspack_core/src/module.rs
@@ -23,6 +23,7 @@ use crate::{
   ModuleGraph, ModuleLayer, ModuleType, NormalModule, RawModule, Resolve, RunnerContext,
   RuntimeSpec, SelfModule, SharedPluginDriver, SourceType,
 };
+
 pub struct BuildContext<'a> {
   pub runner_context: RunnerContext,
   pub plugin_driver: SharedPluginDriver,

diff --git a/crates/rspack_core/src/normal_module.rs b/crates/rspack_core/src/normal_module.rs
@@ -561,6 +561,7 @@ impl Module for NormalModule {
     })
   }
 
+  #[tracing::instrument(name = "NormalModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_core/src/raw_module.rs b/crates/rspack_core/src/raw_module.rs
@@ -120,6 +120,7 @@ impl Module for RawModule {
     })
   }
 
+  #[tracing::instrument(name = "RawModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &crate::Compilation,

diff --git a/crates/rspack_core/src/self_module.rs b/crates/rspack_core/src/self_module.rs
@@ -121,7 +121,7 @@ impl Module for SelfModule {
     })
   }
 
-  #[allow(clippy::unwrap_in_result)]
+  #[tracing::instrument(name = "SelfModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     _compilation: &Compilation,

diff --git a/crates/rspack_plugin_extract_css/src/css_module.rs b/crates/rspack_plugin_extract_css/src/css_module.rs
@@ -160,6 +160,7 @@ impl Module for CssModule {
     })
   }
 
+  #[tracing::instrument(name = "ExtractCssModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     _compilation: &Compilation,

diff --git a/crates/rspack_plugin_hmr/Cargo.toml b/crates/rspack_plugin_hmr/Cargo.toml
@@ -5,11 +5,11 @@ license     = "MIT"
 name        = "rspack_plugin_hmr"
 repository  = "https://github.com/web-infra-dev/rspack"
 version     = "0.1.0"
+
 [dependencies]
 rspack_collections = { version = "0.1.0", path = "../rspack_collections" }
 rspack_core        = { version = "0.1.0", path = "../rspack_core" }
 rspack_error       = { version = "0.1.0", path = "../rspack_error" }
-rspack_hash        = { version = "0.1.0", path = "../rspack_hash" }
 rspack_hook        = { version = "0.1.0", path = "../rspack_hook" }
 rspack_util        = { version = "0.1.0", path = "../rspack_util" }
 

diff --git a/crates/rspack_plugin_lazy_compilation/src/module.rs b/crates/rspack_plugin_lazy_compilation/src/module.rs
@@ -171,6 +171,7 @@ impl Module for LazyCompilationProxyModule {
     })
   }
 
+  #[tracing::instrument(name = "LazyCompilationProxyModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_plugin_mf/Cargo.toml b/crates/rspack_plugin_mf/Cargo.toml
@@ -11,7 +11,6 @@ version     = "0.1.0"
 rspack_collections    = { version = "0.1.0", path = "../rspack_collections" }
 rspack_core           = { version = "0.1.0", path = "../rspack_core" }
 rspack_error          = { version = "0.1.0", path = "../rspack_error" }
-rspack_hash           = { version = "0.1.0", path = "../rspack_hash" }
 rspack_hook           = { version = "0.1.0", path = "../rspack_hook" }
 rspack_loader_runner  = { version = "0.1.0", path = "../rspack_loader_runner" }
 rspack_plugin_runtime = { version = "0.1.0", path = "../rspack_plugin_runtime" }

diff --git a/crates/rspack_plugin_mf/src/container/container_entry_module.rs b/crates/rspack_plugin_mf/src/container/container_entry_module.rs
@@ -169,6 +169,7 @@ impl Module for ContainerEntryModule {
     })
   }
 
+  #[tracing::instrument(name = "ContainerEntryModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_plugin_mf/src/container/fallback_module.rs b/crates/rspack_plugin_mf/src/container/fallback_module.rs
@@ -139,6 +139,7 @@ impl Module for FallbackModule {
     })
   }
 
+  #[tracing::instrument(name = "FallbackModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_plugin_mf/src/container/remote_module.rs b/crates/rspack_plugin_mf/src/container/remote_module.rs
@@ -160,6 +160,7 @@ impl Module for RemoteModule {
     })
   }
 
+  #[tracing::instrument(name = "RemoteModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_plugin_mf/src/sharing/consume_shared_module.rs b/crates/rspack_plugin_mf/src/sharing/consume_shared_module.rs
@@ -169,7 +169,7 @@ impl Module for ConsumeSharedModule {
     })
   }
 
-  #[allow(clippy::unwrap_in_result)]
+  #[tracing::instrument(name = "ConsumeSharedModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/crates/rspack_plugin_mf/src/sharing/provide_shared_module.rs b/crates/rspack_plugin_mf/src/sharing/provide_shared_module.rs
@@ -164,7 +164,7 @@ impl Module for ProvideSharedModule {
     })
   }
 
-  #[allow(clippy::unwrap_in_result)]
+  #[tracing::instrument(name = "ProvideSharedModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
   fn code_generation(
     &self,
     compilation: &Compilation,

diff --git a/...js.$2faf8431c36246aaa99efe65186ef7b1$.css → ...js.$2f93a97aa04d990659bb6450539d9bf9$.css b/...js.$2faf8431c36246aaa99efe65186ef7b1$.css → ...js.$2f93a97aa04d990659bb6450539d9bf9$.css
diff --git a/...js.$108a632b35566ba6e10f21437dc1e449$.css → ...js.$96fc5c6cb322ec288f4a5497b0cedac9$.css b/...js.$108a632b35566ba6e10f21437dc1e449$.css → ...js.$96fc5c6cb322ec288f4a5497b0cedac9$.css
diff --git a/...in.$2948667d05523e0bdd4b433a8b432330$.css → ...in.$296408a492fdf2232d2d9e34da7e0002$.css b/...in.$2948667d05523e0bdd4b433a8b432330$.css → ...in.$296408a492fdf2232d2d9e34da7e0002$.css
diff --git a/...yA.$63eb4b2b7412624c84340d8ef2383cb3$.css → ...yA.$4d33e3a417f3501849de6198cf874070$.css b/...yA.$63eb4b2b7412624c84340d8ef2383cb3$.css → ...yA.$4d33e3a417f3501849de6198cf874070$.css
diff --git a/...yB.$7dc4057bc127528eb3d6e30affb70fc5$.css → ...yB.$1aafde33cd7d82fced010e68d76fbb4b$.css b/...yB.$7dc4057bc127528eb3d6e30affb70fc5$.css → ...yB.$1aafde33cd7d82fced010e68d76fbb4b$.css
diff --git a/...in.$fcf981e297c26c27907740d422c8fbb8$.css → ...in.$db8ccfd38278ff640827fcf25338ca6e$.css b/...in.$fcf981e297c26c27907740d422c8fbb8$.css → ...in.$db8ccfd38278ff640827fcf25338ca6e$.css
diff --git a/...in.$a033229f200a2cfbacbc9213dd60155a$.css → ...in.$0128dfc0c9cfe270fddcd3f30aad3f61$.css b/...in.$a033229f200a2cfbacbc9213dd60155a$.css → ...in.$0128dfc0c9cfe270fddcd3f30aad3f61$.css
diff --git a/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js b/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js
@@ -100,14 +100,14 @@ __webpack_require__.e = function (chunkId) {
           // return url for filenames not based on template
 
           // return url for filenames based on template
-          return "" + chunkId + ".$" + "fcf981e297c26c279077" + "$.css";
+          return "" + chunkId + ".$" + "3c46e7c70e9c35a7c0c2" + "$.css";
         };
 
 })();
 // webpack/runtime/get_full_hash
 (() => {
 __webpack_require__.h = function () {
-	return "9795acfd15167201fff0";
+	return "390adcbb2f3e066ff2d0";
 };
 
 })();

diff --git a/....$2ebc9424ae217f7031ea75743effd066$.2.css → ....$7bc131b60ce1982956ed07f85d4783c6$.2.css b/....$2ebc9424ae217f7031ea75743effd066$.2.css → ....$7bc131b60ce1982956ed07f85d4783c6$.2.css
diff --git a/....$fc35cd7d3442366ea0e20c936c0d399c$.1.css → ....$e55940b0b8bcba5d5cbdaf4b7684b266$.1.css b/....$fc35cd7d3442366ea0e20c936c0d399c$.1.css → ....$e55940b0b8bcba5d5cbdaf4b7684b266$.1.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -897,6 +897,7 @@ impl Module for ContextModule { @@
         })
       }
+      #[tracing::instrument(name = "ContextModule::code_generation", skip_all, fields(identifier = ?self.identifier()))]
       fn code_generation(
         &self,
         compilation: &Compilation,
@@ Expand Down @@