From 3577469dec5dcedf559f3e3be4637e55b42185e3 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Thu, 17 Sep 2020 14:35:56 -0400
Subject: [PATCH 1/7] Add Link View

---
 Package.swift                                 | 17 +++++--
 Sources/TokamakCore/Views/Buttons/Link.swift  | 48 +++++++++++++++++++
 Sources/TokamakStaticHTML/Core.swift          |  3 ++
 .../Modifiers/LayoutModifiers.swift           |  2 +-
 .../Views/Buttons/Link.swift                  | 27 +++++++++++
 5 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 Sources/TokamakCore/Views/Buttons/Link.swift
 create mode 100644 Sources/TokamakStaticHTML/Views/Buttons/Link.swift

diff --git a/Package.swift b/Package.swift
index 2496a7aa5..8491bef39 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,6 +4,16 @@
 
 import PackageDescription
 
+#if os(WASI)
+let otherDeps = [
+  .package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", from: "0.5.0"),
+]
+let otherDepsInclude: [Target.Dependency] = ["JavaScriptKit"]
+#else
+let otherDeps = [Package.Dependency]()
+let otherDepsInclude = [Target.Dependency]()
+#endif
+
 let package = Package(
   name: "Tokamak",
   platforms: [
@@ -37,10 +47,9 @@ let package = Package(
   dependencies: [
     // Dependencies declare other packages that this package depends on.
     // .package(url: /* package url */, from: "1.0.0"),
-    .package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", from: "0.5.0"),
     .package(url: "https://github.com/MaxDesiatov/Runtime.git", from: "2.1.2"),
     .package(url: "https://github.com/MaxDesiatov/OpenCombine.git", from: "0.0.1"),
-  ],
+  ] + otherDeps,
   targets: [
     // Targets are the basic building blocks of a package. A target can define
     // a module or a test suite.
@@ -66,7 +75,7 @@ let package = Package(
     ),
     .target(
       name: "TokamakDOM",
-      dependencies: ["CombineShim", "JavaScriptKit", "TokamakCore", "TokamakStaticHTML"]
+      dependencies: ["CombineShim", "TokamakCore", "TokamakStaticHTML"] + otherDepsInclude
     ),
     .target(
       name: "TokamakShim",
@@ -74,7 +83,7 @@ let package = Package(
     ),
     .target(
       name: "TokamakDemo",
-      dependencies: ["JavaScriptKit", "TokamakShim"]
+      dependencies: ["TokamakShim"] + otherDepsInclude
     ),
     .target(
       name: "TokamakStaticDemo",
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
new file mode 100644
index 000000000..2983c62c6
--- /dev/null
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -0,0 +1,48 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 9/9/20.
+//
+
+import struct Foundation.URL
+
+public struct Link<Label>: View where Label: View {
+  let destination: URL
+  let label: Label
+  
+  public init(destination: URL, @ViewBuilder label: () -> Label) {
+    (self.destination, self.label) = (destination, label())
+  }
+  
+  public var body: Never {
+    neverBody("Link")
+  }
+}
+
+extension Link where Label == Text {
+  public init<S: StringProtocol>(_ titleKey: S, destination: URL) {
+    self.init(destination: destination) { Text(titleKey) }
+  }
+}
+
+public struct _LinkProxy<Label> where Label: View {
+  public let subject: Link<Label>
+
+  public init(_ subject: Link<Label>) { self.subject = subject }
+
+  public var label: Label { subject.label }
+  public var destination: URL {
+    subject.destination
+  }
+}
diff --git a/Sources/TokamakStaticHTML/Core.swift b/Sources/TokamakStaticHTML/Core.swift
index 35963d91f..48d3bd879 100644
--- a/Sources/TokamakStaticHTML/Core.swift
+++ b/Sources/TokamakStaticHTML/Core.swift
@@ -69,6 +69,7 @@ public typealias Spacer = TokamakCore.Spacer
 public typealias Text = TokamakCore.Text
 public typealias VStack = TokamakCore.VStack
 public typealias ZStack = TokamakCore.ZStack
+public typealias Link = TokamakCore.Link
 
 // MARK: Special Views
 
@@ -87,6 +88,8 @@ public typealias SceneStorage = TokamakCore.SceneStorage
 
 // MARK: Misc
 
+public typealias ViewBuilder = TokamakCore.ViewBuilder
+
 // FIXME: I would put this inside TokamakCore, but for
 // some reason it doesn't get exported with the typealias
 extension Text {
diff --git a/Sources/TokamakStaticHTML/Modifiers/LayoutModifiers.swift b/Sources/TokamakStaticHTML/Modifiers/LayoutModifiers.swift
index fb4678f2f..a550a36da 100644
--- a/Sources/TokamakStaticHTML/Modifiers/LayoutModifiers.swift
+++ b/Sources/TokamakStaticHTML/Modifiers/LayoutModifiers.swift
@@ -97,7 +97,7 @@ extension _PaddingLayout: DOMViewModifier {
       }
     }
     return ["style": padding
-      .map { "padding-\($0.0): \($0.1);" }
+      .map { "padding-\($0.0): \($0.1)px;" }
       .joined(separator: " ")]
   }
 }
diff --git a/Sources/TokamakStaticHTML/Views/Buttons/Link.swift b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
new file mode 100644
index 000000000..e602eb7e5
--- /dev/null
+++ b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
@@ -0,0 +1,27 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 9/9/20.
+//
+
+import TokamakCore
+
+extension Link: ViewDeferredToRenderer {
+  public var deferredBody: AnyView {
+    let proxy = _LinkProxy(self)
+    return AnyView(HTML("a", ["href": proxy.destination.absoluteString]) {
+      proxy.label
+    })
+  }
+}

From 1ff0dea3148c29a7461c8aab902a0df81995bd40 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Thu, 17 Sep 2020 15:42:47 -0400
Subject: [PATCH 2/7] Add Publish support

---
 Sources/TokamakCore/Views/Buttons/Link.swift  |   4 +-
 Sources/TokamakDOM/App/App.swift              |   7 +-
 .../FoundationTokamakFactory+Views.swift      | 124 +++++++++++++++++
 .../FoundationTokamakFactory.swift            | 116 ++++++++++++++++
 .../PublishSupport/TokamakHTMLFactory.swift   | 129 ++++++++++++++++++
 .../Resources/TokamakStyles.swift             |   4 +
 .../Views/Buttons/Link.swift                  |   2 +-
 .../TokamakStaticHTML/Views/Text/Text.swift   |   2 +-
 8 files changed, 383 insertions(+), 5 deletions(-)
 create mode 100644 Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
 create mode 100644 Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
 create mode 100644 Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift

diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
index 2983c62c6..10228d868 100644
--- a/Sources/TokamakCore/Views/Buttons/Link.swift
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -20,11 +20,11 @@ import struct Foundation.URL
 public struct Link<Label>: View where Label: View {
   let destination: URL
   let label: Label
-  
+
   public init(destination: URL, @ViewBuilder label: () -> Label) {
     (self.destination, self.label) = (destination, label())
   }
-  
+
   public var body: Never {
     neverBody("Link")
   }
diff --git a/Sources/TokamakDOM/App/App.swift b/Sources/TokamakDOM/App/App.swift
index 3b5266d2e..e3d8edfeb 100644
--- a/Sources/TokamakDOM/App/App.swift
+++ b/Sources/TokamakDOM/App/App.swift
@@ -24,6 +24,7 @@ extension App {
   public static func _launch(_ app: Self, _ rootEnvironment: EnvironmentValues) {
     _launch(app, rootEnvironment, TokamakDOM.body)
   }
+
   /// The default implementation of `launch` for a `TokamakDOM` app.
   ///
   /// Creates a host `div` node and appends it to the body.
@@ -31,7 +32,11 @@ extension App {
   /// The body is styled with `margin: 0;` to match the `SwiftUI` layout
   /// system as closely as possible
   ///
-  public static func _launch(_ app: Self, _ rootEnvironment: EnvironmentValues, _ body: JSObjectRef) {
+  public static func _launch(
+    _ app: Self,
+    _ rootEnvironment: EnvironmentValues,
+    _ body: JSObjectRef
+  ) {
     if body.style.object!.all == "" {
       body.style = "margin: 0;"
     }
diff --git a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
new file mode 100644
index 000000000..0cceca4a1
--- /dev/null
+++ b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
@@ -0,0 +1,124 @@
+#if canImport(Publish)
+import Foundation
+import Publish
+
+extension FoundationTokamakFactory {
+  struct ItemList: View {
+    let items: [Item<Site>]
+    let site: Site
+
+    var body: some View {
+      VStack(alignment: .leading) {
+        ForEach(items) { item in
+          VStack(alignment: .leading) {
+            Link(destination: URL(string: item.path.absoluteString)!) {
+              Text(item.title)
+                .font(.headline)
+                .underline()
+            }
+            TagList(item: item, site: site)
+              .padding(.vertical)
+            Text(item.description)
+              .font(.caption)
+          }
+          .padding(20)
+          .background(Color(0xEEEEEE))
+          .cornerRadius(20)
+        }
+      }
+    }
+  }
+
+  struct TagList: View {
+    let item: Item<Site>
+    let site: Site
+
+    var body: some View {
+      HStack(spacing: 5) {
+        ForEach(item.tags) { tag in
+          Tag(tag: tag, site: site)
+        }
+      }
+    }
+  }
+
+  struct Header: View {
+    let context: PublishingContext<Site>
+    let selectedSection: Site.SectionID?
+
+    let sectionIDs = Site.SectionID.allCases
+
+    var body: some View {
+      VStack {
+        Link(
+          context.site.name,
+          destination: URL(string: "/", relativeTo: context.site.url)!
+        )
+        .font(.system(size: 18, weight: .bold))
+        .padding(.bottom)
+        if sectionIDs.count > 1 {
+          HStack(spacing: 16) {
+            ForEach(Array(sectionIDs), id: \.self) { section in
+              Link(destination: URL(
+                string: context.sections[section].path
+                  .absoluteString
+              )!) {
+                Text(context.sections[section].title)
+                  .underline(section == selectedSection, color: .primary)
+              }
+            }
+          }
+        }
+        // FIXME: Could not cast value of type 'Swift.Optional<TokamakCore.HStack<TokamakCore.ForEach<Swift.Array<PublishTokamak.PublishTokamak.SectionID>, PublishTokamak.PublishTokamak.SectionID, TokamakCore.ModifiedContent<TokamakCore.ModifiedContent<TokamakCore.ModifiedContent<TokamakCore.Link<TokamakCore.Text>, TokamakCore._PaddingLayout>, TokamakCore._BackgroundModifier<TokamakCore.Color>>, TokamakCore._PaddingLayout>>>>' (0x7ffac7021410) to 'TokamakCore.ViewDeferredToRenderer' (0x7ffac7021710).
+        else { EmptyView() }
+      }
+      .padding(.horizontal, 40)
+      .padding(.vertical, 30)
+      .background(Color(0xEEEEEE))
+      .frame(minWidth: 0, maxWidth: .infinity)
+    }
+  }
+
+  struct Footer: View {
+    let site: Site
+    var body: some View {
+      VStack {
+        HStack {
+          Text("Generated using")
+            .padding(.trailing)
+          Link(destination: URL(string: "https://github.com/johnsundell/publish")!) {
+            Text("Publish")
+              .underline()
+          }
+          Text("and")
+            .padding(.horizontal)
+          Link(destination: URL(string: "https://github.com/TokamakUI/Tokamak")!) {
+            Text("Tokamak")
+              .underline()
+          }
+        }
+        HStack {
+          Link("RSS Feed", destination: URL(string: "/feed.rss", relativeTo: site.url)!)
+        }
+      }
+      .foregroundColor(Color(0x8A8A8A))
+    }
+  }
+
+  struct Tag: View {
+    let tag: Publish.Tag
+    let site: Site
+
+    var body: some View {
+      Link(destination: URL(string: site.path(for: tag).absoluteString)!) {
+        Text(tag.string)
+          .padding(.horizontal, 6)
+          .padding(.vertical, 4)
+          .background(Color.black)
+          .foregroundColor(.white)
+          .cornerRadius(5)
+      }
+    }
+  }
+}
+#endif // canImport(Publish)
diff --git a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
new file mode 100644
index 000000000..61b6d6d06
--- /dev/null
+++ b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
@@ -0,0 +1,116 @@
+#if canImport(Publish)
+import Foundation
+import Publish
+
+public struct FoundationTokamakFactory<Site: Website>: TokamakHTMLFactory {
+  public func makeIndexView(for index: Index,
+                            context: PublishingContext<Site>) throws -> some View
+  {
+    Header(context: context, selectedSection: nil)
+    VStack(alignment: .leading) {
+      Text(index.title)
+        .font(.headline)
+        .bold()
+        .padding(.bottom)
+      Text(context.site.description)
+        .font(.caption)
+        .padding(.bottom)
+      Text("Latest content")
+        .font(.headline)
+      ItemList(
+        items: context.allItems(sortedBy: \.date, order: .descending),
+        site: context.site
+      )
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+
+  public func makeSectionView(
+    for section: Publish.Section<Site>,
+    context: PublishingContext<Site>
+  ) throws -> some View {
+    Header(context: context, selectedSection: section.id)
+    Text(section.title)
+      .font(.headline)
+    VStack(alignment: .leading) {
+      ItemList(items: section.items, site: context.site)
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+
+  public func makeItemView(for item: Item<Site>,
+                           context: PublishingContext<Site>) throws -> some View
+  {
+    Header(context: context, selectedSection: item.sectionID)
+    VStack(alignment: .leading) {
+      item.body
+      Text("Tagged with: ")
+      TagList(item: item, site: context.site)
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+
+  public func makePageView(for page: Page, context: PublishingContext<Site>) throws -> some View {
+    Header(context: context, selectedSection: nil)
+    VStack(alignment: .leading) {
+      page.body
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+
+  public func makeTagListView(for page: TagListPage,
+                              context: PublishingContext<Site>) throws -> some View
+  {
+    Header(context: context, selectedSection: nil)
+    VStack(alignment: .leading) {
+      Text("Browse all tags")
+        .font(.headline)
+      HStack {
+        ForEach(page.tags.sorted()) { tag in
+          Tag(tag: tag, site: context.site)
+        }
+      }
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+
+  public func makeTagDetailsView(for page: TagDetailsPage,
+                                 context: PublishingContext<Site>) throws -> some View
+  {
+    Header(context: context, selectedSection: nil)
+    VStack(alignment: .leading) {
+      HStack {
+        Text("Tagged with")
+          .padding(.trailing)
+        Tag(tag: page.tag, site: context.site)
+      }
+      .font(.headline)
+      Link(
+        "Browse all tags",
+        destination: URL(string: context.site.tagListPath.absoluteString)!
+      )
+      ItemList(
+        items: context.items(
+          taggedWith: page.tag,
+          sortedBy: \.date,
+          order: .descending
+        ),
+        site: context.site
+      )
+    }
+    .frame(idealWidth: 820, maxWidth: 820)
+    .padding(.vertical, 40)
+    Footer(site: context.site)
+  }
+}
+#endif // canImport(Publish)
diff --git a/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift b/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift
new file mode 100644
index 000000000..f51670698
--- /dev/null
+++ b/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift
@@ -0,0 +1,129 @@
+#if canImport(Publish) && canImport(Plot)
+import Plot
+import Publish
+
+public protocol TokamakHTMLFactory: HTMLFactory {
+  associatedtype IndexView: View
+  /// Create the `View` to use for the website's main index page.
+  /// - parameter index: The index page to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makeIndexView(for index: Index, context: PublishingContext<Self.Site>) throws -> IndexView
+
+  associatedtype SectionView: View
+  /// Create the `View` to use for the index page of a section.
+  /// - parameter section: The section to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makeSectionView(
+    for section: Publish.Section<Self.Site>,
+    context: PublishingContext<Self.Site>
+  ) throws -> SectionView
+
+  associatedtype ItemView: View
+  /// Create the `View` to use for an item.
+  /// - parameter item: The item to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makeItemView(for item: Item<Self.Site>, context: PublishingContext<Self.Site>) throws
+    -> ItemView
+
+  associatedtype PageView: View
+  /// Create the `View` to use for a page.
+  /// - parameter page: The page to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makePageView(for page: Page, context: PublishingContext<Self.Site>) throws -> PageView
+
+  associatedtype TagListView: View
+  /// Create the `View` to use for the website's list of tags, if supported.
+  /// Return `EmptyView` if the theme that this factory is for doesn't support tags.
+  /// - parameter page: The tag list page to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makeTagListView(for page: TagListPage, context: PublishingContext<Self.Site>) throws
+    -> TagListView
+
+  associatedtype TagDetailsView: View
+  /// Create the `View` to use for a tag details page, used to represent a single
+  /// tag. Return `EmptyView` if the theme that this factory is for doesn't support tags.
+  /// - parameter page: The tag details page to build a `View` for.
+  /// - parameter context: The current publishing context.
+  @ViewBuilder
+  func makeTagDetailsView(for page: TagDetailsPage, context: PublishingContext<Self.Site>) throws
+    -> TagDetailsView
+}
+
+fileprivate extension View {
+  var plotHTML: Plot.HTML {
+    Plot.HTML(.raw(StaticHTMLRenderer(self).html))
+  }
+}
+
+extension TokamakHTMLFactory {
+  public func makeIndexHTML(for index: Index, context: PublishingContext<Site>) throws -> Plot
+    .HTML
+  {
+    let content = try makeIndexView(for: index, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+
+  public func makeSectionHTML(
+    for section: Publish.Section<Site>,
+    context: PublishingContext<Site>
+  ) throws -> Plot.HTML {
+    let content = try makeSectionView(for: section, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+
+  public func makeItemHTML(for item: Item<Site>, context: PublishingContext<Site>) throws -> Plot
+    .HTML
+  {
+    let content = try makeItemView(for: item, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+
+  public func makePageHTML(for page: Page, context: PublishingContext<Site>) throws -> Plot.HTML {
+    let content = try makePageView(for: page, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+
+  public func makeTagListHTML(for page: TagListPage,
+                              context: PublishingContext<Site>) throws -> Plot.HTML?
+  {
+    let content = try makeTagListView(for: page, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+
+  public func makeTagDetailsHTML(for page: TagDetailsPage,
+                                 context: PublishingContext<Site>) throws -> Plot.HTML?
+  {
+    let content = try makeTagDetailsView(for: page, context: context)
+    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
+  }
+}
+
+extension Publish.Content.Body: View {
+  public var body: some View {
+    TokamakStaticHTML.HTML("div", content: html)
+  }
+}
+
+extension Publish.Item: Identifiable {
+  public var id: String {
+    path.absoluteString
+  }
+}
+
+extension Publish.Tag: Identifiable {
+  public var id: String {
+    string
+  }
+}
+
+extension Theme {
+  public static var tokamakFoundation: Self {
+    Theme(htmlFactory: FoundationTokamakFactory())
+  }
+}
+#endif // canImport(Publish) && canImport(Plot)
diff --git a/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift b/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
index 932a5ef91..56d475673 100644
--- a/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
+++ b/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
@@ -103,6 +103,10 @@ public let tokamakStyles = """
   color-scheme: light dark;
 }
 
+._tokamak-link {
+  text-decoration: none;
+}
+
 @media (prefers-color-scheme:dark) {
   ._tokamak-text-redacted::after {
     background-color: rgb(100, 100, 100);
diff --git a/Sources/TokamakStaticHTML/Views/Buttons/Link.swift b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
index e602eb7e5..38e67405e 100644
--- a/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
+++ b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
@@ -20,7 +20,7 @@ import TokamakCore
 extension Link: ViewDeferredToRenderer {
   public var deferredBody: AnyView {
     let proxy = _LinkProxy(self)
-    return AnyView(HTML("a", ["href": proxy.destination.absoluteString]) {
+    return AnyView(HTML("a", ["href": proxy.destination.absoluteString, "class": "_tokamak-link"]) {
       proxy.label
     })
   }
diff --git a/Sources/TokamakStaticHTML/Views/Text/Text.swift b/Sources/TokamakStaticHTML/Views/Text/Text.swift
index 32ac50a01..8577f1eba 100644
--- a/Sources/TokamakStaticHTML/Views/Text/Text.swift
+++ b/Sources/TokamakStaticHTML/Views/Text/Text.swift
@@ -82,7 +82,7 @@ extension Font: StylesConvertible {
       "font-family": _name == _FontNames.system.rawValue ? _design.description : _name,
       "font-weight": "\(_bold ? Font.Weight.bold.value : _weight.value)",
       "font-style": _italic ? "italic" : "normal",
-      "font-size": "\(_size)",
+      "font-size": "\(_size)pt",
       "line-height": _leading.description,
       "font-variant": _smallCaps ? "small-caps" : "normal",
     ]

From 73596656675cd850113fd058b8cd75f8819695a3 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Fri, 30 Oct 2020 09:31:29 -0400
Subject: [PATCH 3/7] Remove #if checks

---
 Package.swift | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Package.swift b/Package.swift
index 8491bef39..e94bcd1b5 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,16 +4,6 @@
 
 import PackageDescription
 
-#if os(WASI)
-let otherDeps = [
-  .package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", from: "0.5.0"),
-]
-let otherDepsInclude: [Target.Dependency] = ["JavaScriptKit"]
-#else
-let otherDeps = [Package.Dependency]()
-let otherDepsInclude = [Target.Dependency]()
-#endif
-
 let package = Package(
   name: "Tokamak",
   platforms: [
@@ -49,7 +39,8 @@ let package = Package(
     // .package(url: /* package url */, from: "1.0.0"),
     .package(url: "https://github.com/MaxDesiatov/Runtime.git", from: "2.1.2"),
     .package(url: "https://github.com/MaxDesiatov/OpenCombine.git", from: "0.0.1"),
-  ] + otherDeps,
+    .package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", from: "0.5.0"),
+  ],
   targets: [
     // Targets are the basic building blocks of a package. A target can define
     // a module or a test suite.
@@ -75,7 +66,16 @@ let package = Package(
     ),
     .target(
       name: "TokamakDOM",
-      dependencies: ["CombineShim", "TokamakCore", "TokamakStaticHTML"] + otherDepsInclude
+      dependencies: [
+        "CombineShim",
+        "TokamakCore",
+        "TokamakStaticHTML",
+        .product(
+          name: "JavaScriptKit",
+          package: "JavaScriptKit",
+          condition: .when(platforms: [.wasi])
+        )
+      ]
     ),
     .target(
       name: "TokamakShim",
@@ -83,7 +83,14 @@ let package = Package(
     ),
     .target(
       name: "TokamakDemo",
-      dependencies: ["TokamakShim"] + otherDepsInclude
+      dependencies: [
+        "TokamakShim",
+        .product(
+          name: "JavaScriptKit",
+          package: "JavaScriptKit",
+          condition: .when(platforms: [.wasi])
+        )
+      ]
     ),
     .target(
       name: "TokamakStaticDemo",

From c577873678fa1e6e3be8d59bf3afdce2a88c0f11 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Sat, 31 Oct 2020 12:14:40 -0400
Subject: [PATCH 4/7] Upgrade swift snapshot

---
 .swift-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.swift-version b/.swift-version
index 253d11f4d..2f4477f36 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-wasm-5.3-SNAPSHOT-2020-09-25-a
+wasm-5.3-SNAPSHOT-2020-10-29-c

From 27634df1569aa8ed8008ab26c4957361606e9192 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Sat, 31 Oct 2020 12:22:46 -0400
Subject: [PATCH 5/7] Try swiftwasm-action@main

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7447d75e..93314a4a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: swiftwasm/swiftwasm-action@v5.3
+      - uses: swiftwasm/swiftwasm-action@main
         with:
           shell-action: swift build --triple wasm32-unknown-wasi --product TokamakDemo
 

From edfbdd70fffa413a051d21776b70946943396d37 Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Sat, 31 Oct 2020 19:14:20 -0400
Subject: [PATCH 6/7] Remove Publish support from this repo

---
 .github/workflows/ci.yml                      |   2 +-
 Package.swift                                 |   8 ++
 .../FoundationTokamakFactory+Views.swift      | 124 -----------------
 .../FoundationTokamakFactory.swift            | 116 ----------------
 .../PublishSupport/TokamakHTMLFactory.swift   | 129 ------------------
 5 files changed, 9 insertions(+), 370 deletions(-)
 delete mode 100644 Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
 delete mode 100644 Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
 delete mode 100644 Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93314a4a0..e7447d75e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: swiftwasm/swiftwasm-action@main
+      - uses: swiftwasm/swiftwasm-action@v5.3
         with:
           shell-action: swift build --triple wasm32-unknown-wasi --product TokamakDemo
 
diff --git a/Package.swift b/Package.swift
index d1b526857..45bf65477 100644
--- a/Package.swift
+++ b/Package.swift
@@ -29,6 +29,10 @@ let package = Package(
       name: "TokamakStaticHTML",
       targets: ["TokamakStaticHTML"]
     ),
+    .library(
+      name: "TokamakPublish",
+      targets: ["TokamakPublish"]
+    ),
     .executable(
       name: "TokamakStaticDemo",
       targets: ["TokamakStaticDemo"]
@@ -80,6 +84,10 @@ let package = Package(
         )
       ]
     ),
+    .target(
+      name: "TokamakPublish",
+      dependencies: ["TokamakStaticHTML"]
+    ),
     .target(
       name: "TokamakShim",
       dependencies: [.target(name: "TokamakDOM", condition: .when(platforms: [.wasi]))]
diff --git a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
deleted file mode 100644
index 0cceca4a1..000000000
--- a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory+Views.swift
+++ /dev/null
@@ -1,124 +0,0 @@
-#if canImport(Publish)
-import Foundation
-import Publish
-
-extension FoundationTokamakFactory {
-  struct ItemList: View {
-    let items: [Item<Site>]
-    let site: Site
-
-    var body: some View {
-      VStack(alignment: .leading) {
-        ForEach(items) { item in
-          VStack(alignment: .leading) {
-            Link(destination: URL(string: item.path.absoluteString)!) {
-              Text(item.title)
-                .font(.headline)
-                .underline()
-            }
-            TagList(item: item, site: site)
-              .padding(.vertical)
-            Text(item.description)
-              .font(.caption)
-          }
-          .padding(20)
-          .background(Color(0xEEEEEE))
-          .cornerRadius(20)
-        }
-      }
-    }
-  }
-
-  struct TagList: View {
-    let item: Item<Site>
-    let site: Site
-
-    var body: some View {
-      HStack(spacing: 5) {
-        ForEach(item.tags) { tag in
-          Tag(tag: tag, site: site)
-        }
-      }
-    }
-  }
-
-  struct Header: View {
-    let context: PublishingContext<Site>
-    let selectedSection: Site.SectionID?
-
-    let sectionIDs = Site.SectionID.allCases
-
-    var body: some View {
-      VStack {
-        Link(
-          context.site.name,
-          destination: URL(string: "/", relativeTo: context.site.url)!
-        )
-        .font(.system(size: 18, weight: .bold))
-        .padding(.bottom)
-        if sectionIDs.count > 1 {
-          HStack(spacing: 16) {
-            ForEach(Array(sectionIDs), id: \.self) { section in
-              Link(destination: URL(
-                string: context.sections[section].path
-                  .absoluteString
-              )!) {
-                Text(context.sections[section].title)
-                  .underline(section == selectedSection, color: .primary)
-              }
-            }
-          }
-        }
-        // FIXME: Could not cast value of type 'Swift.Optional<TokamakCore.HStack<TokamakCore.ForEach<Swift.Array<PublishTokamak.PublishTokamak.SectionID>, PublishTokamak.PublishTokamak.SectionID, TokamakCore.ModifiedContent<TokamakCore.ModifiedContent<TokamakCore.ModifiedContent<TokamakCore.Link<TokamakCore.Text>, TokamakCore._PaddingLayout>, TokamakCore._BackgroundModifier<TokamakCore.Color>>, TokamakCore._PaddingLayout>>>>' (0x7ffac7021410) to 'TokamakCore.ViewDeferredToRenderer' (0x7ffac7021710).
-        else { EmptyView() }
-      }
-      .padding(.horizontal, 40)
-      .padding(.vertical, 30)
-      .background(Color(0xEEEEEE))
-      .frame(minWidth: 0, maxWidth: .infinity)
-    }
-  }
-
-  struct Footer: View {
-    let site: Site
-    var body: some View {
-      VStack {
-        HStack {
-          Text("Generated using")
-            .padding(.trailing)
-          Link(destination: URL(string: "https://github.com/johnsundell/publish")!) {
-            Text("Publish")
-              .underline()
-          }
-          Text("and")
-            .padding(.horizontal)
-          Link(destination: URL(string: "https://github.com/TokamakUI/Tokamak")!) {
-            Text("Tokamak")
-              .underline()
-          }
-        }
-        HStack {
-          Link("RSS Feed", destination: URL(string: "/feed.rss", relativeTo: site.url)!)
-        }
-      }
-      .foregroundColor(Color(0x8A8A8A))
-    }
-  }
-
-  struct Tag: View {
-    let tag: Publish.Tag
-    let site: Site
-
-    var body: some View {
-      Link(destination: URL(string: site.path(for: tag).absoluteString)!) {
-        Text(tag.string)
-          .padding(.horizontal, 6)
-          .padding(.vertical, 4)
-          .background(Color.black)
-          .foregroundColor(.white)
-          .cornerRadius(5)
-      }
-    }
-  }
-}
-#endif // canImport(Publish)
diff --git a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift b/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
deleted file mode 100644
index 61b6d6d06..000000000
--- a/Sources/TokamakStaticHTML/PublishSupport/FoundationTokamakFactory.swift
+++ /dev/null
@@ -1,116 +0,0 @@
-#if canImport(Publish)
-import Foundation
-import Publish
-
-public struct FoundationTokamakFactory<Site: Website>: TokamakHTMLFactory {
-  public func makeIndexView(for index: Index,
-                            context: PublishingContext<Site>) throws -> some View
-  {
-    Header(context: context, selectedSection: nil)
-    VStack(alignment: .leading) {
-      Text(index.title)
-        .font(.headline)
-        .bold()
-        .padding(.bottom)
-      Text(context.site.description)
-        .font(.caption)
-        .padding(.bottom)
-      Text("Latest content")
-        .font(.headline)
-      ItemList(
-        items: context.allItems(sortedBy: \.date, order: .descending),
-        site: context.site
-      )
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-
-  public func makeSectionView(
-    for section: Publish.Section<Site>,
-    context: PublishingContext<Site>
-  ) throws -> some View {
-    Header(context: context, selectedSection: section.id)
-    Text(section.title)
-      .font(.headline)
-    VStack(alignment: .leading) {
-      ItemList(items: section.items, site: context.site)
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-
-  public func makeItemView(for item: Item<Site>,
-                           context: PublishingContext<Site>) throws -> some View
-  {
-    Header(context: context, selectedSection: item.sectionID)
-    VStack(alignment: .leading) {
-      item.body
-      Text("Tagged with: ")
-      TagList(item: item, site: context.site)
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-
-  public func makePageView(for page: Page, context: PublishingContext<Site>) throws -> some View {
-    Header(context: context, selectedSection: nil)
-    VStack(alignment: .leading) {
-      page.body
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-
-  public func makeTagListView(for page: TagListPage,
-                              context: PublishingContext<Site>) throws -> some View
-  {
-    Header(context: context, selectedSection: nil)
-    VStack(alignment: .leading) {
-      Text("Browse all tags")
-        .font(.headline)
-      HStack {
-        ForEach(page.tags.sorted()) { tag in
-          Tag(tag: tag, site: context.site)
-        }
-      }
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-
-  public func makeTagDetailsView(for page: TagDetailsPage,
-                                 context: PublishingContext<Site>) throws -> some View
-  {
-    Header(context: context, selectedSection: nil)
-    VStack(alignment: .leading) {
-      HStack {
-        Text("Tagged with")
-          .padding(.trailing)
-        Tag(tag: page.tag, site: context.site)
-      }
-      .font(.headline)
-      Link(
-        "Browse all tags",
-        destination: URL(string: context.site.tagListPath.absoluteString)!
-      )
-      ItemList(
-        items: context.items(
-          taggedWith: page.tag,
-          sortedBy: \.date,
-          order: .descending
-        ),
-        site: context.site
-      )
-    }
-    .frame(idealWidth: 820, maxWidth: 820)
-    .padding(.vertical, 40)
-    Footer(site: context.site)
-  }
-}
-#endif // canImport(Publish)
diff --git a/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift b/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift
deleted file mode 100644
index f51670698..000000000
--- a/Sources/TokamakStaticHTML/PublishSupport/TokamakHTMLFactory.swift
+++ /dev/null
@@ -1,129 +0,0 @@
-#if canImport(Publish) && canImport(Plot)
-import Plot
-import Publish
-
-public protocol TokamakHTMLFactory: HTMLFactory {
-  associatedtype IndexView: View
-  /// Create the `View` to use for the website's main index page.
-  /// - parameter index: The index page to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makeIndexView(for index: Index, context: PublishingContext<Self.Site>) throws -> IndexView
-
-  associatedtype SectionView: View
-  /// Create the `View` to use for the index page of a section.
-  /// - parameter section: The section to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makeSectionView(
-    for section: Publish.Section<Self.Site>,
-    context: PublishingContext<Self.Site>
-  ) throws -> SectionView
-
-  associatedtype ItemView: View
-  /// Create the `View` to use for an item.
-  /// - parameter item: The item to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makeItemView(for item: Item<Self.Site>, context: PublishingContext<Self.Site>) throws
-    -> ItemView
-
-  associatedtype PageView: View
-  /// Create the `View` to use for a page.
-  /// - parameter page: The page to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makePageView(for page: Page, context: PublishingContext<Self.Site>) throws -> PageView
-
-  associatedtype TagListView: View
-  /// Create the `View` to use for the website's list of tags, if supported.
-  /// Return `EmptyView` if the theme that this factory is for doesn't support tags.
-  /// - parameter page: The tag list page to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makeTagListView(for page: TagListPage, context: PublishingContext<Self.Site>) throws
-    -> TagListView
-
-  associatedtype TagDetailsView: View
-  /// Create the `View` to use for a tag details page, used to represent a single
-  /// tag. Return `EmptyView` if the theme that this factory is for doesn't support tags.
-  /// - parameter page: The tag details page to build a `View` for.
-  /// - parameter context: The current publishing context.
-  @ViewBuilder
-  func makeTagDetailsView(for page: TagDetailsPage, context: PublishingContext<Self.Site>) throws
-    -> TagDetailsView
-}
-
-fileprivate extension View {
-  var plotHTML: Plot.HTML {
-    Plot.HTML(.raw(StaticHTMLRenderer(self).html))
-  }
-}
-
-extension TokamakHTMLFactory {
-  public func makeIndexHTML(for index: Index, context: PublishingContext<Site>) throws -> Plot
-    .HTML
-  {
-    let content = try makeIndexView(for: index, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-
-  public func makeSectionHTML(
-    for section: Publish.Section<Site>,
-    context: PublishingContext<Site>
-  ) throws -> Plot.HTML {
-    let content = try makeSectionView(for: section, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-
-  public func makeItemHTML(for item: Item<Site>, context: PublishingContext<Site>) throws -> Plot
-    .HTML
-  {
-    let content = try makeItemView(for: item, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-
-  public func makePageHTML(for page: Page, context: PublishingContext<Site>) throws -> Plot.HTML {
-    let content = try makePageView(for: page, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-
-  public func makeTagListHTML(for page: TagListPage,
-                              context: PublishingContext<Site>) throws -> Plot.HTML?
-  {
-    let content = try makeTagListView(for: page, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-
-  public func makeTagDetailsHTML(for page: TagDetailsPage,
-                                 context: PublishingContext<Site>) throws -> Plot.HTML?
-  {
-    let content = try makeTagDetailsView(for: page, context: context)
-    return ScrollView { content }.frame(minWidth: 0, maxWidth: .infinity).plotHTML
-  }
-}
-
-extension Publish.Content.Body: View {
-  public var body: some View {
-    TokamakStaticHTML.HTML("div", content: html)
-  }
-}
-
-extension Publish.Item: Identifiable {
-  public var id: String {
-    path.absoluteString
-  }
-}
-
-extension Publish.Tag: Identifiable {
-  public var id: String {
-    string
-  }
-}
-
-extension Theme {
-  public static var tokamakFoundation: Self {
-    Theme(htmlFactory: FoundationTokamakFactory())
-  }
-}
-#endif // canImport(Publish) && canImport(Plot)

From aed4fc37ec74aa67b1f9135f5d43ffdecee11c1c Mon Sep 17 00:00:00 2001
From: Carson Katri <carson.katri@gmail.com>
Date: Sat, 31 Oct 2020 19:28:37 -0400
Subject: [PATCH 7/7] Remove TokamakPublish target

---
 Package.swift | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Package.swift b/Package.swift
index 45bf65477..d1b526857 100644
--- a/Package.swift
+++ b/Package.swift
@@ -29,10 +29,6 @@ let package = Package(
       name: "TokamakStaticHTML",
       targets: ["TokamakStaticHTML"]
     ),
-    .library(
-      name: "TokamakPublish",
-      targets: ["TokamakPublish"]
-    ),
     .executable(
       name: "TokamakStaticDemo",
       targets: ["TokamakStaticDemo"]
@@ -84,10 +80,6 @@ let package = Package(
         )
       ]
     ),
-    .target(
-      name: "TokamakPublish",
-      dependencies: ["TokamakStaticHTML"]
-    ),
     .target(
       name: "TokamakShim",
       dependencies: [.target(name: "TokamakDOM", condition: .when(platforms: [.wasi]))]