From a604ef526930e853dad77195fdc70f2a8a9219df Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Tue, 24 May 2022 10:59:21 +0100 Subject: [PATCH] Revert "Add html5 doctype to static renderer (#486)" (#487) * Revert "Add html5 doctype to static renderer (#486)" This reverts commit 3081f5521a7bfc10e4b3087f5744887a1c7f4947 which causes failing layout snapshots we've recently turned back on in https://github.com/TokamakUI/Tokamak/pull/484. * Fix newlines inconsistency --- Sources/TokamakStaticHTML/StaticHTMLRenderer.swift | 6 +++--- .../__Snapshots__/HTMLTests/testDoubleTitle.1.html | 2 -- .../__Snapshots__/HTMLTests/testDoubleTitleModifier.1.html | 2 -- .../__Snapshots__/HTMLTests/testFontStacks.1.html | 2 -- .../__Snapshots__/HTMLTests/testFontStacks.2.html | 2 -- .../__Snapshots__/HTMLTests/testHTMLSanitizer.1.html | 2 -- .../__Snapshots__/HTMLTests/testHTMLSanitizer.2.html | 2 -- .../__Snapshots__/HTMLTests/testMetaAll.1.html | 1 - .../__Snapshots__/HTMLTests/testMetaCharset.1.html | 1 - .../__Snapshots__/HTMLTests/testMetaCharsetModifier.1.html | 1 - .../__Snapshots__/HTMLTests/testOptional.1.html | 2 -- .../__Snapshots__/HTMLTests/testPaddingFusion.1.html | 2 -- .../__Snapshots__/HTMLTests/testPaddingFusion.2.html | 2 -- .../HTMLTests/testPreferencePropagation.1.html | 2 -- .../__Snapshots__/HTMLTests/testTitle.1.html | 2 -- .../__Snapshots__/HTMLTests/testTitleModifier.1.html | 2 -- 16 files changed, 3 insertions(+), 30 deletions(-) diff --git a/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift b/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift index 63641fda4..1164b07c1 100644 --- a/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift +++ b/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift @@ -88,11 +88,11 @@ public final class StaticHTMLRenderer: Renderer { public func render(shouldSortAttributes: Bool = false) -> String { """ - - \(title) - \(meta.map { $0.outerHTML() }.joined(separator: "\n ")) + \(title)\( + !meta.isEmpty ? "\n " + meta.map { $0.outerHTML() }.joined(separator: "\n ") : "" + ) diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testDoubleTitle.1.html b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testDoubleTitle.1.html index 67adb4d7d..76693aeff 100644 --- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testDoubleTitle.1.html +++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testDoubleTitle.1.html @@ -1,8 +1,6 @@ - Tokamak 2 -