Fix serializing template contents

devongovett · devongovett · commit e6fe231b0374 · 2025-05-14T19:58:48.000-07:00
Fixes #10155
diff --git a/crates/core/src/environment.rs b/crates/core/src/environment.rs
@@ -5,7 +5,7 @@ use bitflags::bitflags;
 use browserslist::Distrib;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Environment {
   pub context: EnvironmentContext,
@@ -421,7 +421,7 @@ impl Engines {
 }
 
 bitflags! {
-  #[derive(Clone, Copy, Hash, Debug, PartialEq, Eq)]
+  #[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, Default)]
   pub struct EnvironmentFlags: u8 {
     const IS_LIBRARY = 1 << 0;
     const SHOULD_OPTIMIZE = 1 << 1;
@@ -431,9 +431,10 @@ bitflags! {
 
 impl_bitflags_serde!(EnvironmentFlags);
 
-#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Default, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum EnvironmentContext {
+  #[default]
   Browser,
   WebWorker,
   ServiceWorker,
@@ -470,16 +471,18 @@ impl EnvironmentContext {
   }
 }
 
-#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Default, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum SourceType {
+  #[default]
   Module,
   Script,
 }
 
-#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, Default, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum OutputFormat {
+  #[default]
   Global,
   Commonjs,
   Esmodule,
diff --git a/crates/html/src/arena.rs b/crates/html/src/arena.rs
@@ -626,6 +626,7 @@ impl<'a, 'arena> Serialize for SerializableHandle<'a, 'arena> {
           NodeData::Element {
             ref name,
             ref attrs,
+            ref template_contents,
             ..
           } => {
             serializer.start_elem(
@@ -640,6 +641,10 @@ impl<'a, 'arena> Serialize for SerializableHandle<'a, 'arena> {
               ops.push_front(SerializeOp::Open(c));
               child = c.previous_sibling.get();
             }
+
+            if let Some(template) = template_contents {
+              ops.push_front(SerializeOp::Open(template));
+            }
           }
 
           NodeData::Doctype { ref name, .. } => serializer.write_doctype(name)?,
@@ -653,7 +658,13 @@ impl<'a, 'arena> Serialize for SerializableHandle<'a, 'arena> {
             ref contents,
           } => serializer.write_processing_instruction(target, &*contents.borrow())?,
 
-          NodeData::Document => panic!("Can't serialize Document node itself"),
+          NodeData::Document => {
+            let mut child = handle.last_child.get();
+            while let Some(c) = child {
+              ops.push_front(SerializeOp::Open(c));
+              child = c.previous_sibling.get();
+            }
+          }
         },
 
         SerializeOp::Close(name) => {
diff --git a/crates/html/src/lib.rs b/crates/html/src/lib.rs
@@ -308,3 +308,24 @@ pub fn svg_react(mut options: SvgReactOptions) -> Result<PackageResult, ()> {
     })
   })
 }
+
+#[cfg(test)]
+mod tests {
+  use crate::transform_html;
+
+  #[test]
+  fn test_transform() {
+    let res = transform_html(crate::TransformOptions {
+      code: "<html><body><template><div>test</div><span>hi</span></template></body></html>".into(),
+      file_path: "foo.html".into(),
+      xml: false,
+      env: Default::default(),
+      hmr: false,
+    });
+
+    assert_eq!(
+      std::str::from_utf8(&res.code).unwrap(),
+      "<html><head></head><body><template><div>test</div><span>hi</span></template></body></html>"
+    );
+  }
+}
