fix(css,assets): wrong "publicPath: auto" asset path in windows (#9239)

chore: update

Author: SoonIter

crates/rspack_core/src/options/output.rs

@@ -6,8 +6,7 @@ use rspack_cacheable::cacheable;
 use rspack_hash::RspackHash;
 pub use rspack_hash::{HashDigest, HashFunction, HashSalt};
 use rspack_macros::MergeFrom;
-use rspack_paths::{AssertUtf8, Utf8Path, Utf8PathBuf};
-use sugar_path::SugarPath;
+use rspack_paths::Utf8PathBuf;
 
 use super::CleanOptions;
 use crate::{Chunk, ChunkGroupByUkey, ChunkKind, Compilation, Filename, FilenameTemplate};
@@ -315,6 +314,54 @@ pub enum PublicPath {
   Auto,
 }
 
+//https://github.com/webpack/webpack/blob/001cab14692eb9a833c6b56709edbab547e291a1/lib/util/identifier.js#L378
+pub fn get_undo_path(filename: &str, output_path: String, enforce_relative: bool) -> String {
+  let mut depth: i32 = -1;
+  let mut append = String::new();
+  let mut p = output_path;
+  if p.ends_with('/') || p.ends_with('\\') {
+    p.pop();
+  }
+  for part in filename.split(&['/', '\\']) {
+    if part == ".." {
+      if depth > -1 {
+        depth -= 1
+      } else {
+        let pos = match (p.rfind('/'), p.rfind('\\')) {
+          (None, None) => {
+            p.push('/');
+            return p;
+          }
+          (None, Some(j)) => j,
+          (Some(i), None) => i,
+          (Some(i), Some(j)) => usize::max(i, j),
+        };
+        append = format!("{}/{append}", &p[pos + 1..]);
+        p = p[0..pos].to_string();
+      }
+    } else if part != "." {
+      depth += 1;
+    }
+  }
+
+  if depth > 0 {
+    format!("{}{append}", "../".repeat(depth as usize))
+  } else if enforce_relative {
+    format!("./{append}")
+  } else {
+    append
+  }
+}
+
+#[test]
+fn test_get_undo_path() {
+  assert_eq!(get_undo_path("a", "/a/b/c".to_string(), true), "./");
+  assert_eq!(
+    get_undo_path("static/js/a.js", "/a/b/c".to_string(), false),
+    "../../"
+  );
+}
+
 impl PublicPath {
   pub fn render(&self, compilation: &Compilation, filename: &str) -> String {
     match self {
@@ -342,26 +389,7 @@ impl PublicPath {
   }
 
   pub fn render_auto_public_path(compilation: &Compilation, filename: &str) -> String {
-    let public_path = match Utf8Path::new(filename).parent() {
-      None => String::new(),
-      Some(dirname) => compilation
-        .options
-        .output
-        .path
-        .as_std_path()
-        .relative(
-          compilation
-            .options
-            .output
-            .path
-            .join(dirname)
-            .into_std_path_buf()
-            .absolutize(),
-        )
-        .assert_utf8()
-        .as_str()
-        .to_owned(),
-    };
+    let public_path = get_undo_path(filename, compilation.options.output.path.to_string(), false);
     Self::ensure_ends_with_slash(public_path)
   }
 }

crates/rspack_plugin_extract_css/src/plugin.rs

@@ -1,11 +1,12 @@
 use std::sync::LazyLock;
-use std::{borrow::Cow, cmp::max, hash::Hash, sync::Arc};
+use std::{borrow::Cow, hash::Hash, sync::Arc};
 
 use cow_utils::CowUtils;
 use regex::Regex;
 use rspack_cacheable::cacheable;
 use rspack_collections::{DatabaseItem, IdentifierMap, IdentifierSet, UkeySet};
 use rspack_core::rspack_sources::{BoxSource, CachedSource, SourceExt};
+use rspack_core::{get_undo_path, AssetInfo, ChunkGraph};
 use rspack_core::{
   rspack_sources::{
     ConcatSource, RawStringSource, SourceMap, SourceMapSource, WithoutOriginalOptions,
@@ -16,7 +17,6 @@ use rspack_core::{
   ModuleIdentifier, ModuleType, NormalModuleFactoryParser, ParserAndGenerator, ParserOptions,
   PathData, Plugin, PluginContext, RenderManifestEntry, RuntimeGlobals, SourceType,
 };
-use rspack_core::{AssetInfo, ChunkGraph};
 use rspack_error::{Diagnostic, Result};
 use rspack_hash::RspackHash;
 use rspack_hook::{plugin, plugin_hook};
@@ -433,7 +433,7 @@ despite it was not able to fulfill desired ordering with these modules:
         // different from webpack, add `enforce_relative` to preserve './'
         let undo_path = get_undo_path(
           filename,
-          compilation.options.output.path.as_str(),
+          compilation.options.output.path.to_string(),
           self.options.enforce_relative,
         );
 
@@ -721,54 +721,3 @@ impl Plugin for PluginCssExtract {
     Ok(())
   }
 }
-
-#[allow(clippy::unwrap_used)]
-fn get_undo_path(filename: &str, output_path: &str, enforce_relative: bool) -> String {
-  let mut depth: isize = -1;
-  let mut append = "".into();
-
-  let output_path = output_path.strip_suffix('\\').unwrap_or(output_path);
-  let mut output_path = output_path
-    .strip_suffix('/')
-    .unwrap_or(output_path)
-    .to_string();
-
-  static PATH_SEP: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r#"[\\/]+"#).expect("should compile"));
-
-  for part in PATH_SEP.split(filename) {
-    if part == ".." {
-      if depth > -1 {
-        depth -= 1;
-      } else {
-        let i = output_path.find('/');
-        let j = output_path.find('\\');
-        let pos = if i.is_none() {
-          j
-        } else if j.is_none() {
-          i
-        } else {
-          max(i, j)
-        };
-
-        if pos.is_none() {
-          return format!("{output_path}/");
-        }
-
-        append = format!("{}/{append}", &output_path[pos.unwrap() + 1..]);
-
-        output_path = output_path[0..pos.unwrap()].to_string();
-      }
-    } else if part != "." {
-      depth += 1;
-    }
-  }
-
-  if depth > 0 {
-    format!("{}{append}", "../".repeat(depth as usize))
-  } else if enforce_relative {
-    format!("./{append}")
-  } else {
-    append
-  }
-}

crates/rspack_plugin_javascript/src/runtime.rs

@@ -4,8 +4,8 @@ use rspack_core::rspack_sources::{
   BoxSource, ConcatSource, RawStringSource, ReplaceSource, Source, SourceExt,
 };
 use rspack_core::{
-  to_normal_comment, BoxModule, ChunkGraph, ChunkInitFragments, ChunkUkey,
-  CodeGenerationPublicPathAutoReplace, Compilation, PublicPath, RuntimeGlobals, SourceType,
+  get_undo_path, to_normal_comment, BoxModule, ChunkGraph, ChunkInitFragments, ChunkUkey,
+  CodeGenerationPublicPathAutoReplace, Compilation, RuntimeGlobals, SourceType,
 };
 use rspack_error::{error, Result};
 use rspack_util::diff_mode::is_diff_mode;
@@ -109,10 +109,11 @@ pub fn render_module(
     if !auto_public_path_matches.is_empty() {
       let mut replace = ReplaceSource::new(origin_source.clone());
       for (start, end) in auto_public_path_matches {
-        let mut relative = PublicPath::render_auto_public_path(compilation, output_path);
-        if relative.is_empty() {
-          relative = String::from("./");
-        }
+        let relative = get_undo_path(
+          output_path,
+          compilation.options.output.path.to_string(),
+          true,
+        );
         replace.replace(start as u32, end as u32, &relative, None);
       }
       RenderSource {

crates/rspack_plugin_runtime/src/runtime_module/auto_public_path.rs

@@ -1,13 +1,11 @@
 use rspack_collections::Identifier;
 use rspack_core::{
-  get_js_chunk_filename_template, impl_runtime_module,
+  get_js_chunk_filename_template, get_undo_path, impl_runtime_module,
   rspack_sources::{BoxSource, RawStringSource, SourceExt},
   ChunkUkey, Compilation, OutputOptions, PathData, RuntimeGlobals, RuntimeModule,
   RuntimeModuleStage, SourceType,
 };
 
-use super::utils::get_undo_path;
-
 #[impl_runtime_module]
 #[derive(Debug)]
 pub struct AutoPublicPathRuntimeModule {

crates/rspack_plugin_runtime/src/runtime_module/utils.rs

@@ -2,8 +2,8 @@ use cow_utils::CowUtils;
 use itertools::Itertools;
 use rspack_collections::{UkeyIndexMap, UkeyIndexSet};
 use rspack_core::{
-  chunk_graph_chunk::ChunkId, get_js_chunk_filename_template, Chunk, ChunkLoading, ChunkUkey,
-  Compilation, PathData, SourceType,
+  chunk_graph_chunk::ChunkId, get_js_chunk_filename_template, get_undo_path, Chunk, ChunkLoading,
+  ChunkUkey, Compilation, PathData, SourceType,
 };
 use rspack_util::test::{
   HOT_TEST_ACCEPT, HOT_TEST_DISPOSE, HOT_TEST_OUTDATED, HOT_TEST_RUNTIME, HOT_TEST_UPDATED,
@@ -79,44 +79,6 @@ pub fn chunk_has_css(chunk: &ChunkUkey, compilation: &Compilation) -> bool {
     .is_empty()
 }
 
-pub fn get_undo_path(filename: &str, p: String, enforce_relative: bool) -> String {
-  let mut depth: i32 = -1;
-  let mut append = String::new();
-  let mut p = p;
-  if p.ends_with('/') || p.ends_with('\\') {
-    p.pop();
-  }
-  for part in filename.split(&['/', '\\']) {
-    if part == ".." {
-      if depth > -1 {
-        depth -= 1
-      } else {
-        let pos = match (p.rfind('/'), p.rfind('\\')) {
-          (None, None) => {
-            p.push('/');
-            return p;
-          }
-          (None, Some(j)) => j,
-          (Some(i), None) => i,
-          (Some(i), Some(j)) => usize::max(i, j),
-        };
-        append = format!("{}/{append}", &p[pos + 1..]);
-        p = p[0..pos].to_string();
-      }
-    } else if part != "." {
-      depth += 1;
-    }
-  }
-
-  if depth > 0 {
-    format!("{}{append}", "../".repeat(depth as usize))
-  } else if enforce_relative {
-    format!("./{append}")
-  } else {
-    append
-  }
-}
-
 pub fn get_output_dir(
   chunk: &Chunk,
   compilation: &Compilation,
@@ -277,15 +239,6 @@ fn stringify_map<T: std::fmt::Display>(map: &HashMap<&str, T>) -> String {
   )
 }
 
-#[test]
-fn test_get_undo_path() {
-  assert_eq!(get_undo_path("a", "/a/b/c".to_string(), true), "./");
-  assert_eq!(
-    get_undo_path("static/js/a.js", "/a/b/c".to_string(), false),
-    "../../"
-  );
-}
-
 pub fn generate_javascript_hmr_runtime(method: &str) -> String {
   include_str!("runtime/javascript_hot_module_replacement.js")
     .cow_replace("$key$", method)

packages/rspack-test-tools/tests/configCases/css/rspack-issue-9237/index.js

@@ -0,0 +1 @@
+import "./style.css";

packages/rspack-test-tools/tests/configCases/css/rspack-issue-9237/logo.svg

@@ -0,0 +1,51 @@
+const { rspack } = require("@rspack/core");
+
+class Plugin {
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap("MyPlugin", compilation => {
+			compilation.hooks.processAssets.tap(
+				{
+					name: "MyPlugin",
+					stage: compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH
+				},
+				() => {
+					const cssFilename = compilation
+						.getAssets()
+						.find(asset => asset.name.endsWith(".css")).name;
+
+					compilation.updateAsset(cssFilename, old => {
+						const oldSource = old.source().toString();
+						expect(
+							oldSource.includes("url(../../static/svg/logo.svg)")
+						).toBeTruthy();
+						return old;
+					});
+				}
+			);
+		});
+	}
+}
+
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	entry: "./index.js",
+	target: "web",
+	plugins: [new Plugin()],
+	output: {
+		cssFilename: "static/initial/index.css"
+	},
+	module: {
+		rules: [
+			{
+				test: /\.svg$/,
+				type: "asset/resource",
+				generator: {
+					filename: "static/svg/[name][ext]"
+				}
+			}
+		]
+	},
+	experiments: {
+		css: true
+	}
+};

packages/rspack-test-tools/tests/configCases/css/rspack-issue-9237/rspack.config.js

@@ -0,0 +1,3 @@
+.example {
+	background: url('./logo.svg');
+}