fix: should transform output.path while emitting assets (#12181)

* fix: should transform output.path while emitting assets

* fix: should transform output.path while emitting assets

Author: LingyuCoder

crates/rspack_core/src/compiler/mod.rs

@@ -15,7 +15,8 @@ use tracing::instrument;
 pub use self::rebuild::CompilationRecords;
 use crate::{
   BoxPlugin, CleanOptions, Compilation, CompilationAsset, CompilerOptions, ContextModuleFactory,
-  KeepPattern, Logger, NormalModuleFactory, PluginDriver, ResolverFactory, SharedPluginDriver,
+  Filename, KeepPattern, Logger, NormalModuleFactory, PluginDriver, ResolverFactory,
+  SharedPluginDriver,
   cache::{Cache, new_cache},
   compilation::make::ModuleExecutor,
   fast_set, include_hash,
@@ -349,7 +350,15 @@ impl Compiler {
 
   #[instrument("emit_assets", skip_all)]
   pub async fn emit_assets(&mut self) -> Result<()> {
-    self.run_clean_options().await?;
+    let output_path_str = self
+      .compilation
+      .get_path(
+        &Filename::from(&self.options.output.path),
+        Default::default(),
+      )
+      .await?;
+    let output_path = Utf8Path::new(&output_path_str);
+    self.run_clean_options(output_path).await?;
 
     self
       .plugin_driver
@@ -383,10 +392,10 @@ impl Compiler {
           }
 
           // SAFETY: await immediately and trust caller to poll future entirely
-          let s = unsafe { token.used((&self, filename, asset)) };
+          let s = unsafe { token.used((&self, filename, asset, output_path)) };
 
-          s.spawn(|(this, filename, asset)| {
-            this.emit_asset(&this.options.output.path, filename, asset)
+          s.spawn(|(this, filename, asset, output_path)| {
+            this.emit_asset(output_path, filename, asset)
           });
         })
     })
@@ -480,7 +489,7 @@ impl Compiler {
     Ok(())
   }
 
-  async fn run_clean_options(&mut self) -> Result<()> {
+  async fn run_clean_options(&mut self, output_path: &Utf8Path) -> Result<()> {
     let clean_options = &self.options.output.clean;
 
     // keep all
@@ -491,37 +500,24 @@ impl Compiler {
     if self.emitted_asset_versions.is_empty() {
       match clean_options {
         CleanOptions::CleanAll(true) => {
-          self
-            .output_filesystem
-            .remove_dir_all(&self.options.output.path)
-            .await?;
+          self.output_filesystem.remove_dir_all(output_path).await?;
         }
         CleanOptions::KeepPath(p) => {
-          let path = self.options.output.path.join(p);
+          let path = output_path.join(p);
           trim_dir(
             &*self.output_filesystem,
-            &self.options.output.path,
+            output_path,
             KeepPattern::Path(&path),
           )
           .await?;
         }
         CleanOptions::KeepRegex(r) => {
           let keep_pattern = KeepPattern::Regex(r);
-          trim_dir(
-            &*self.output_filesystem,
-            &self.options.output.path,
-            keep_pattern,
-          )
-          .await?;
+          trim_dir(&*self.output_filesystem, output_path, keep_pattern).await?;
         }
         CleanOptions::KeepFunc(f) => {
           let keep_pattern = KeepPattern::Func(f);
-          trim_dir(
-            &*self.output_filesystem,
-            &self.options.output.path,
-            keep_pattern,
-          )
-          .await?;
+          trim_dir(&*self.output_filesystem, output_path, keep_pattern).await?;
         }
         _ => {}
       }
@@ -539,7 +535,7 @@ impl Compiler {
             let filename = filename.to_owned();
             Some(async {
               if !clean_options.keep(&filename).await {
-                let filename = Utf8Path::new(&self.options.output.path).join(filename);
+                let filename = output_path.join(filename);
                 let _ = self.output_filesystem.remove_file(&filename).await;
               }
             })

crates/rspack_core/src/options/filename.rs

@@ -12,6 +12,7 @@ use rspack_cacheable::{
   with::{AsPreset, Unsupported},
 };
 use rspack_error::ToStringResultToRspackResultExt;
+use rspack_paths::Utf8PathBuf;
 use rspack_util::{MergeFrom, atom::Atom, base64, ext::CowExt};
 
 use crate::{AssetInfo, PathData, ReplaceAllPlaceholder, ResourceParsedData, parse_resource};
@@ -98,6 +99,11 @@ impl From<String> for Filename {
     Self(FilenameKind::Template(Atom::from(value)))
   }
 }
+impl From<&Utf8PathBuf> for Filename {
+  fn from(value: &Utf8PathBuf) -> Self {
+    Self(FilenameKind::Template(Atom::from(value.as_str())))
+  }
+}
 impl From<&str> for Filename {
   fn from(value: &str) -> Self {
     Self(FilenameKind::Template(Atom::from(value)))

tests/rspack-test/Incremental-node.test.js

@@ -20,8 +20,6 @@ describeByWalk(
 		dist: path.resolve(__dirname, `./js/incremental/hot-node`),
 		exclude: [
 			/^css$/,
-			// FIXME: incremental failed
-			/^rebuild-abnormal-module$/
 		]
 	}
 );

tests/rspack-test/configCases/output/path-template/index.js

@@ -0,0 +1,2 @@
+it("should work", async () => {
+});

tests/rspack-test/configCases/output/path-template/rspack.config.js

@@ -0,0 +1,15 @@
+const path = require("path");
+const fs = require("fs");
+module.exports = (_, { testPath }) => ({
+  output: {
+    path: path.join(testPath, "__[fullhash]__")
+  },
+  plugins: [{
+    apply(compiler) {
+      compiler.hooks.done.tap("Test", (stats) => {
+        const dirs = fs.readdirSync(testPath);
+        expect(dirs).not.toContain("__[fullhash]__");
+      });
+    }
+  }]
+});