some progress compiling

fastn-stack · Nov 24, 2024 · d46e238 · d46e238
1 parent 89c14e8
commit d46e238
Show file tree

Hide file tree

Showing 15 changed files with 485 additions and 562 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fastn-core/src/package/package_doc.rs b/fastn-core/src/package/package_doc.rs
@@ -368,7 +368,7 @@ pub(crate) async fn read_ftd_(
     test: bool,
     only_js: bool,
     preview_session_id: &Option<String>,
-) -> fastn_core::Result<fastn_resolved::CompiledDocument> {
+) -> fastn_core::Result<FTDResult> {
     tracing::info!(document = main.id);
     match config.config.ftd_edition {
         fastn_core::FTDEdition::FTD2022 => {

diff --git a/fastn-core/src/utils.rs b/fastn-core/src/utils.rs
@@ -631,7 +631,7 @@ pub async fn replace_markers_2022(
     font_style: &str,
     base_url: &str,
     session_id: &Option<String>,
-) -> String {
+) -> fastn_resolved::CompiledDocument {
     ftd::html::utils::trim_all_lines(
         s.replace(
             "__ftd_meta_data__",
@@ -731,7 +731,7 @@ pub async fn replace_markers_2023(
     base_url: &str,
     config: &fastn_core::Config,
     session_id: &Option<String>,
-) -> String {
+) -> fastn_resolved::CompiledDocument {
     format!(
         include_str!("../../ftd/ftd-js.html"),
         fastn_package = get_fastn_package_data(&config.package).as_str(),