feat(asset): add importMode: "newURL"

Author: SoonIter

crates/node_binding/napi-binding.d.ts

@@ -1732,7 +1732,7 @@ export interface RawAssetGeneratorOptions {
   outputPath?: JsFilename
   publicPath?: "auto" | JsFilename
   dataUrl?: RawAssetGeneratorDataUrlOptions | ((source: Buffer, context: RawAssetGeneratorDataUrlFnCtx) => string)
-  importMode?: "url" | "preserve"
+  importMode?: "url" | "preserve" | "newURL"
   binary?: boolean
 }
 
@@ -1759,7 +1759,7 @@ export interface RawAssetResourceGeneratorOptions {
   filename?: JsFilename
   outputPath?: JsFilename
   publicPath?: "auto" | JsFilename
-  importMode?: "url" | "preserve"
+  importMode?: "url" | "preserve" | "newURL"
   binary?: boolean
 }
 

crates/rspack_core/src/options/module.rs

@@ -504,6 +504,7 @@ bitflags! {
   impl AssetGeneratorImportModeFlags: u8 {
     const URL = 1 << 0;
     const PRESERVE = 1 << 1;
+    const NEW_URL = 1 << 2;
   }
 }
 
@@ -518,14 +519,18 @@ impl AssetGeneratorImportMode {
   pub fn is_preserve(&self) -> bool {
     self.0.contains(AssetGeneratorImportModeFlags::PRESERVE)
   }
+  pub fn is_new_url(&self) -> bool {
+    self.0.contains(AssetGeneratorImportModeFlags::NEW_URL)
+  }
 }
 
 impl From<String> for AssetGeneratorImportMode {
   fn from(s: String) -> Self {
     match s.as_str() {
       "url" => Self(AssetGeneratorImportModeFlags::URL),
       "preserve" => Self(AssetGeneratorImportModeFlags::PRESERVE),
-      _ => unreachable!("AssetGeneratorImportMode error"),
+      "newURL" => Self(AssetGeneratorImportModeFlags::NEW_URL),
+      _ => unreachable!("asset generator import mode should be url, preserve or newURL"),
     }
   }
 }

crates/rspack_plugin_asset/src/lib.rs

@@ -562,7 +562,7 @@ impl ParserAndGenerator for AssetParserAndGenerator {
             )
             .await?;
 
-          let asset_path = if import_mode.is_preserve() {
+          let asset_path = if import_mode.is_preserve() || import_mode.is_new_url() {
             generate_context
               .data
               .insert(CodeGenerationPublicPathAutoReplace(true));
@@ -631,37 +631,60 @@ impl ParserAndGenerator for AssetParserAndGenerator {
           return Ok(RawStringSource::from("").boxed());
         }
 
-        if import_mode.is_preserve() && parsed_asset_config.is_resource() {
-          let is_module = compilation.options.output.module;
-          if let Some(ref mut scope) = generate_context.concatenation_scope {
-            scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);
-            if is_module {
+        if parsed_asset_config.is_resource() {
+          if import_mode.is_preserve() {
+            let is_module = compilation.options.output.module;
+            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 {
+                let supports_const = compilation.options.output.environment.supports_const();
+                let declaration_kind = if supports_const { "const" } else { "var" };
+                return Ok(
+                  RawStringSource::from(format!(
+                    r#"{declaration_kind} {NAMESPACE_OBJECT_EXPORT} = require({exported_content});"#
+                  ))
+                  .boxed(),
+                );
+              }
+            } else {
+              generate_context
+                .runtime_requirements
+                .insert(RuntimeGlobals::MODULE);
+              return Ok(
+                RawStringSource::from(format!(r#"module.exports = require({exported_content});"#))
+                  .boxed(),
+              );
+            }
+          };
+
+          if import_mode.is_new_url() {
+            if let Some(ref mut scope) = generate_context.concatenation_scope {
+              let supports_const = compilation.options.output.environment.supports_const();
+              let declaration_kind = if supports_const { "const" } else { "var" };
+              scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);
               return Ok(
                 RawStringSource::from(format!(
-                  r#"import {NAMESPACE_OBJECT_EXPORT} from {exported_content};"#
+                  r#"{declaration_kind} {NAMESPACE_OBJECT_EXPORT} = /*#__PURE__*/ new URL({exported_content}, import.meta.url).href;"#
                 ))
                 .boxed(),
               );
             } else {
-              let supports_const = compilation.options.output.environment.supports_const();
-              let declaration_kind = if supports_const { "const" } else { "var" };
               return Ok(
                 RawStringSource::from(format!(
-                  r#"{declaration_kind} {NAMESPACE_OBJECT_EXPORT} = require({exported_content});"#
+                  r#"module.exports = /*#__PURE__*/ new URL({exported_content}, import.meta.url).href;"#
                 ))
                 .boxed(),
               );
             }
-          } else {
-            generate_context
-              .runtime_requirements
-              .insert(RuntimeGlobals::MODULE);
-            return Ok(
-              RawStringSource::from(format!(r#"module.exports = require({exported_content});"#))
-                .boxed(),
-            );
           }
-        };
+        }
 
         if let Some(ref mut scope) = generate_context.concatenation_scope {
           scope.register_namespace_export(NAMESPACE_OBJECT_EXPORT);

packages/rspack/etc/core.api.md

@@ -237,7 +237,7 @@ export type AssetInlineGeneratorOptions = {
 export type AssetModuleFilename = Filename;
 
 // @public
-export type AssetModuleImportMode = "url" | "preserve";
+export type AssetModuleImportMode = "url" | "preserve" | "newURL";
 
 // @public
 export type AssetModuleOutputPath = Filename;

packages/rspack/src/config/types.ts

@@ -1202,7 +1202,7 @@ export type AssetModuleOutputPath = Filename;
  * Only for modules with module type 'asset' or 'asset/resource'.
  * @default "url"
  */
-export type AssetModuleImportMode = "url" | "preserve";
+export type AssetModuleImportMode = "url" | "preserve" | "newURL";
 
 /** Options for asset modules. */
 export type AssetResourceGeneratorOptions = {
@@ -1224,6 +1224,7 @@ export type AssetResourceGeneratorOptions = {
 	/**
 	 * If "url", a URL pointing to the asset will be generated based on publicPath.
 	 * If "preserve", preserve import/require statement from generated asset.
+	 * If "newURL", a new URL object will be created for the asset.
 	 * Only for modules with module type 'asset' or 'asset/resource'.
 	 * @default "url"
 	 */