chore: update

Author: SoonIter

Cargo.lock

@@ -1106,6 +1106,17 @@ export interface JsTap {
   stage: number
 }
 
+export interface NodeFsStats {
+  isFile: boolean
+  isDirectory: boolean
+  isSymlink: boolean
+  atimeMs: number
+  mtimeMs: number
+  ctimeMs: number
+  birthtimeMs: number
+  size: number
+}
+
 export interface PathWithInfo {
   path: string
   info: JsAssetInfo
@@ -2131,3 +2142,23 @@ export interface RegisterJsTaps {
   registerHtmlPluginBeforeEmitTaps: (stages: Array<number>) => Array<{ function: ((arg: JsBeforeEmitData) => JsBeforeEmitData); stage: number; }>
   registerHtmlPluginAfterEmitTaps: (stages: Array<number>) => Array<{ function: ((arg: JsAfterEmitData) => JsAfterEmitData); stage: number; }>
 }
+
+export interface ThreadsafeNodeFS {
+  writeFile: (name: string, content: Buffer) => Promise<void>
+  removeFile: (name: string) => Promise<void>
+  mkdir: (name: string) => Promise<void>
+  mkdirp: (name: string) => Promise<string | void>
+  removeDirAll: (name: string) => Promise<string | void>
+  readDir: (name: string) => Promise<string[] | void>
+  readFile: (name: string) => Promise<Buffer | string | void>
+  stat: (name: string) => Promise<NodeFsStats | void>
+  lstat: (name: string) => Promise<NodeFsStats | void>
+  open: (name: string, flags: string) => Promise<number | void>
+  rename: (from: string, to: string) => Promise<void>
+  close: (fd: number) => Promise<void>
+  write: (fd: number, content: Buffer, position: number) => Promise<number | void>
+  writeAll: (fd: number, content: Buffer) => Promise<number | void>
+  read: (fd: number, length: number, position: number) => Promise<Buffer | void>
+  readUntil: (fd: number, code: number, position: number) => Promise<Buffer | void>
+  readToEnd: (fd: number, position: number) => Promise<Buffer | void>
+}

crates/node_binding/binding.d.ts

@@ -9,7 +9,6 @@ version     = "0.2.0"
 
 [dependencies]
 async-trait      = { workspace = true }
-cow-utils        = { workspace = true }
 mime_guess       = { workspace = true }
 rayon            = { workspace = true }
 rspack_base64    = { workspace = true }

crates/rspack_plugin_asset/Cargo.toml

@@ -6,7 +6,7 @@ use rspack_core::{
 };
 
 #[cacheable]
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct AssetExportsDependency {
   id: DependencyId,
 }

crates/rspack_plugin_asset/src/asset_exports_dependency.rs

@@ -562,19 +562,16 @@ impl ParserAndGenerator for AssetParserAndGenerator {
 
         if experimental_lib_preserve_import {
           let is_module = compilation.options.output.module;
-          if is_module {
-            if let Some(ref mut scope) = generate_context.concatenation_scope {
-              scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);
+          if let Some(ref mut scope) = generate_context.concatenation_scope {
+            scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);
+            if is_module {
               return Ok(
                 RawStringSource::from(format!(
                   r#"import {NAMESPACE_OBJECT_EXPORT} from {exported_content};"#
                 ))
                 .boxed(),
               );
-            }
-          } else {
-            if let Some(ref mut scope) = generate_context.concatenation_scope {
-              scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);
+            } else {
               let supports_const = compilation.options.output.environment.supports_const();
               let declaration_kind = if supports_const { "const" } else { "var" };
               return Ok(
@@ -583,15 +580,15 @@ impl ParserAndGenerator for AssetParserAndGenerator {
                 ))
                 .boxed(),
               );
-            } else {
-              generate_context
-                .runtime_requirements
-                .insert(RuntimeGlobals::MODULE);
-              return Ok(
-                RawStringSource::from(format!(r#"module.exports = require({exported_content});"#))
-                  .boxed(),
-              );
             }
+          } else {
+            generate_context
+              .runtime_requirements
+              .insert(RuntimeGlobals::MODULE);
+            return Ok(
+              RawStringSource::from(format!(r#"module.exports = require({exported_content});"#))
+                .boxed(),
+            );
           }
         };
 

crates/rspack_plugin_asset/src/lib.rs

@@ -800,6 +800,7 @@ impl JsPlugin {
     })
   }
 
+  #[allow(clippy::too_many_arguments)]
   pub fn get_renamed_inline_module(
     &self,
     all_modules: &[&BoxModule],

crates/rspack_plugin_javascript/src/plugin/mod.rs

@@ -106,11 +106,13 @@ pub fn render_module(
       .match_indices(AUTO_PUBLIC_PATH_PLACEHOLDER)
       .map(|(index, _)| (index, index + len))
       .collect();
-    dbg!(&auto_public_path_matches);
     if !auto_public_path_matches.is_empty() {
       let mut replace = ReplaceSource::new(origin_source.clone());
       for (start, end) in auto_public_path_matches {
-        let relative = PublicPath::render_auto_public_path(compilation, output_path);
+        let mut relative = PublicPath::render_auto_public_path(compilation, output_path);
+        if relative.is_empty() {
+          relative = String::from("./");
+        }
         replace.replace(start as u32, end as u32, &relative, None);
       }
       RenderSource {

crates/rspack_plugin_javascript/src/runtime.rs

@@ -0,0 +1,2 @@
+import IMG from "./img.png";
+IMG;

packages/rspack-test-tools/tests/configCases/asset/preserve-import/img.png

@@ -0,0 +1,35 @@
+const assert = require("assert");
+
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	context: __dirname,
+	entry: {
+		index: './img.png'
+	},
+	module: {
+		rules: [
+			{
+				test: /\.png$/,
+				type: "asset/resource",
+				generator: {
+					experimentalLibPreserveImport: true
+				}
+			}
+		]
+	},
+	plugins: [
+		new (class {
+			apply(compiler) {
+				compiler.hooks.compilation.tap("MyPlugin", compilation => {
+					compilation.hooks.processAssets.tap("MyPlugin", assets => {
+						let list = Object.keys(assets);
+						const js = list.find(item => item.endsWith("js"));
+						const jsContent = assets[js].source().toString();
+						console.log(jsContent)
+						assert(/require\(['"]\.\/(\w*)\.png['"]\)/.test(jsContent))
+					})
+				});
+			}
+		})()
+	]
+};