chore: bump version to 0.1.9

Author: LingyuCoder

Cargo.lock

@@ -79,7 +79,7 @@ swc_html            = { version = "=0.148.0" }
 swc_html_minifier   = { version = "=0.145.0", default-features = false }
 swc_node_comments   = { version = "=0.24.0" }
 
-rspack_dojang = { version = "0.1.8" }
+rspack_dojang = { version = "0.1.9" }
 [workspace.metadata.release]
 rate-limit = { existing-packages = 70, new-packages = 70 }
 [profile.dev]

Cargo.toml

@@ -15,10 +15,12 @@ use rspack_core::{
   Plugin,
 };
 use rspack_dojang::dojang::{Dojang, DojangOptions};
+use rspack_dojang::Operand;
 use rspack_error::{miette, AnyhowError, Diagnostic, Result};
 use rspack_hook::{plugin, plugin_hook};
 use rspack_paths::AssertUtf8;
 use rspack_util::infallible::ResultInfallibleExt as _;
+use serde_json::Value;
 use sugar_path::SugarPath;
 use swc_html::visit::VisitMutWith;
 
@@ -286,10 +288,6 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
       .collect::<Vec<_>>(),
   );
 
-  for tag in tags.iter_mut() {
-    tag.html = Some(html_tag_object_to_string(tag));
-  }
-
   let mut render_data = serde_json::json!(&self.config.template_parameters);
 
   let mut body_tags = vec![];
@@ -312,9 +310,7 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
       "htmlRspackPlugin": {
         "tags": {
           "headTags": head_tags,
-          "headTagsHtml": head_tags.iter().map(|tag| tag.html.clone().unwrap_or_default()).collect::<Vec<_>>().join(""),
           "bodyTags": body_tags,
-          "bodyTagsHtml": body_tags.iter().map(|tag| tag.html.clone().unwrap_or_default()).collect::<Vec<_>>().join(""),
         },
         "files": {
           "favicon": favicon,
@@ -353,6 +349,9 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
     unescape: "=".to_string(),
   });
 
+  dj.add_function_1("toHtml".into(), render_tag)
+    .expect("failed to add template function `renderTag`");
+
   dj.add_with_option(url.clone(), content.clone())
     .expect("failed to add template");
   let mut template_result = match dj.render(&url, render_data) {
@@ -514,3 +513,22 @@ fn url_encode_path(file_path: &str) -> String {
     query_string.replace("&", "$$RSPACK_URL_AMP$$")
   )
 }
+
+pub fn render_tag(op: Operand) -> Operand {
+  match op {
+    Operand::Value(obj) => match serde_json::from_value::<HTMLPluginTag>(obj) {
+      Ok(tag) => Operand::Value(Value::from(html_tag_object_to_string(&tag))),
+      Err(_) => Operand::Value(Value::from("")),
+    },
+    Operand::Array(obj) => Operand::Value(Value::from(
+      obj
+        .iter()
+        .map(|val| match render_tag(val.to_owned()) {
+          Operand::Value(val) => val.as_str().unwrap_or_default().to_string(),
+          _ => "".to_string(),
+        })
+        .join(""),
+    )),
+    _ => Operand::Value(Value::from("")),
+  }
+}

crates/rspack_plugin_html/src/plugin.rs

@@ -1,4 +1,4 @@
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use swc_core::{common::DUMMY_SP, ecma::atoms::Atom};
 use swc_html::ast::{Child, Element, Namespace, Text};
 use swc_html::visit::{VisitMut, VisitMutWith};
@@ -9,7 +9,7 @@ use crate::config::{HtmlInject, HtmlRspackPluginOptions};
 
 // attributes are presented as plain string.
 // namespace is not supported currently.
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HtmlPluginAttribute {
   pub attr_name: String,

crates/rspack_plugin_html/src/visitors/asset.rs

@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
 use itertools::Itertools;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use super::asset::HtmlPluginAttribute;
 use crate::config::{HtmlInject, HtmlRspackPluginBaseOptions, HtmlScriptLoading};
 
-#[derive(Debug, Default, Serialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HTMLPluginTag {
   pub tag_name: String,
@@ -16,7 +16,6 @@ pub struct HTMLPluginTag {
   // `head`, `body`, `false`
   #[serde(skip)]
   pub append_to: HtmlInject,
-  pub html: Option<String>,
 }
 
 impl HTMLPluginTag {