diff --git a/samhuri.net/Sources/samhuri.net/Templates/HTMLElements.swift b/samhuri.net/Sources/samhuri.net/Templates/HTMLElements.swift index 6df1879..b4299a6 100644 --- a/samhuri.net/Sources/samhuri.net/Templates/HTMLElements.swift +++ b/samhuri.net/Sources/samhuri.net/Templates/HTMLElements.swift @@ -24,23 +24,6 @@ extension Node where Context == HTML.HeadContext { } } -extension Node where Context == HTML.BodyContext { - static func asyncStylesheetLinks(_ urls: [URLRepresentable]) -> Self { - .script(""" - (function() { - var urls = [\(urls.map { "'\($0)'" }.joined(separator: ", "))]; - urls.forEach(function(url) { - var css = document.createElement('link'); - css.href = url; - css.rel = 'stylesheet'; - css.type = 'text/css'; - document.getElementsByTagName('head')[0].appendChild(css); - }); - })(); - """) - } -} - extension Node where Context == HTML.BodyContext { static func time(_ nodes: Node...) -> Self { .element(named: "time", nodes: nodes) diff --git a/samhuri.net/Sources/samhuri.net/Templates/SiteTemplate.swift b/samhuri.net/Sources/samhuri.net/Templates/SiteTemplate.swift index 93c8c76..e498686 100644 --- a/samhuri.net/Sources/samhuri.net/Templates/SiteTemplate.swift +++ b/samhuri.net/Sources/samhuri.net/Templates/SiteTemplate.swift @@ -10,7 +10,8 @@ import Plot enum Template { static func site(body: Node, context: TemplateContext) -> HTML { - HTML(.lang("en"), + HTML( + .lang("en"), .comment("meow"), .head( .encoding(.utf8), @@ -30,7 +31,10 @@ enum Template { .meta(.name("theme-color"), .content("#ffffff")), .link(.rel(.dnsPrefetch), .href("https://use.typekit.net")), .link(.rel(.dnsPrefetch), .href("https://netdna.bootstrapcdn.com")), - .link(.rel(.dnsPrefetch), .href("https://gist.github.com")) + .link(.rel(.dnsPrefetch), .href("https://gist.github.com")), + .group(context.styles.map { url in + .link(.rel(.stylesheet), .type("text/css"), .href(url)) + }) ), .body( .header(.class("primary"), @@ -60,8 +64,6 @@ enum Template { .a(.href(context.url(for: "about")), .text(context.site.author)) ), - .asyncStylesheetLinks(context.styles), - .group(context.scripts.map { script in .script(.attribute(named: "defer"), .src(script)) }),