From b4968f3210d67ae458053a2ee30044b59477424a Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Thu, 4 Mar 2021 18:16:51 +0200
Subject: [PATCH 01/11] Add '_spi(TokamakCore)' to ideally internal public
 members.

---
 Sources/TokamakCore/App/Scenes/WindowGroup.swift |  3 ++-
 .../TokamakCore/App/Scenes/_SceneModifier.swift  |  2 ++
 Sources/TokamakCore/App/_AnyApp.swift            | 16 +++++++++++-----
 Sources/TokamakCore/App/_AnyScene.swift          |  3 ++-
 Sources/TokamakCore/App/_TupleScene.swift        |  3 ++-
 Sources/TokamakCore/Shapes/Path.swift            |  1 +
 Sources/TokamakCore/Shapes/Shape.swift           |  3 ++-
 Sources/TokamakCore/Styles/ButtonStyle.swift     |  3 +++
 Sources/TokamakCore/Tokens/Color.swift           |  1 +
 Sources/TokamakCore/Tokens/Font.swift            |  1 +
 Sources/TokamakCore/Views/AnyView.swift          |  4 +++-
 Sources/TokamakCore/Views/Buttons/Button.swift   |  5 ++++-
 Sources/TokamakCore/Views/Buttons/Link.swift     |  4 +++-
 .../Views/Containers/DisclosureGroup.swift       |  4 +++-
 .../TokamakCore/Views/Containers/ForEach.swift   |  5 ++++-
 Sources/TokamakCore/Views/Containers/Group.swift |  2 ++
 Sources/TokamakCore/Views/Containers/List.swift  |  2 ++
 .../TokamakCore/Views/Containers/TupleView.swift |  1 +
 Sources/TokamakCore/Views/Image.swift            |  4 +++-
 .../Views/Layout/GeometryReader.swift            |  1 +
 Sources/TokamakCore/Views/Layout/HStack.swift    |  4 +++-
 Sources/TokamakCore/Views/Layout/LazyHGrid.swift |  3 ++-
 Sources/TokamakCore/Views/Layout/LazyVGrid.swift |  4 +++-
 .../TokamakCore/Views/Layout/ScrollView.swift    |  4 +++-
 Sources/TokamakCore/Views/Layout/VStack.swift    |  4 +++-
 Sources/TokamakCore/Views/Layout/ZStack.swift    |  4 +++-
 .../Views/Navigation/NavigationLink.swift        |  4 +++-
 .../Views/Navigation/NavigationView.swift        |  4 +++-
 Sources/TokamakCore/Views/Selectors/Picker.swift | 11 +++++++++--
 Sources/TokamakCore/Views/Selectors/Slider.swift |  6 +++++-
 Sources/TokamakCore/Views/Selectors/Toggle.swift |  1 +
 Sources/TokamakCore/Views/Spacers/Divider.swift  |  3 +++
 Sources/TokamakCore/Views/Spacers/Spacer.swift   |  3 ++-
 Sources/TokamakCore/Views/Text/SecureField.swift |  5 ++++-
 Sources/TokamakCore/Views/Text/Text.swift        |  4 +++-
 Sources/TokamakCore/Views/Text/TextEditor.swift  |  3 ++-
 Sources/TokamakCore/Views/Text/TextField.swift   |  5 ++++-
 Sources/TokamakCore/Views/ViewBuilder.swift      |  7 +++++--
 Sources/TokamakDOM/Styles/ButtonStyle.swift      |  1 +
 Sources/TokamakDOM/Views/Buttons/Button.swift    |  1 +
 .../Views/Containers/DisclosureGroup.swift       |  1 +
 Sources/TokamakDOM/Views/DynamicHTML.swift       |  6 ++++--
 .../TokamakDOM/Views/Layout/GeometryReader.swift |  1 +
 .../Views/Navigation/NavigationLink.swift        |  1 +
 Sources/TokamakDOM/Views/Selectors/Picker.swift  |  2 ++
 Sources/TokamakDOM/Views/Selectors/Slider.swift  |  1 +
 Sources/TokamakDOM/Views/Text/SecureField.swift  |  1 +
 Sources/TokamakDOM/Views/Text/TextEditor.swift   |  1 +
 Sources/TokamakDOM/Views/Text/TextField.swift    |  3 ++-
 .../TokamakGTK/Modifiers/WidgetModifier.swift    |  1 +
 Sources/TokamakGTK/Shapes/Shape.swift            |  1 +
 Sources/TokamakGTK/Views/List.swift              |  1 +
 Sources/TokamakGTK/Views/NavigationView.swift    |  2 ++
 Sources/TokamakGTK/Views/ScrollView.swift        |  1 +
 Sources/TokamakGTK/Views/Stack.swift             |  2 ++
 Sources/TokamakGTK/Views/TextField.swift         |  2 ++
 .../Modifiers/ModifiedContent.swift              |  1 +
 Sources/TokamakStaticHTML/Shapes/Path.swift      |  1 +
 .../TokamakStaticHTML/Shapes/_ShapeView.swift    |  1 +
 .../TokamakStaticHTML/Views/Buttons/Link.swift   |  1 +
 Sources/TokamakStaticHTML/Views/HTML.swift       |  6 ++++--
 .../TokamakStaticHTML/Views/Images/Image.swift   |  1 +
 .../TokamakStaticHTML/Views/Layout/HStack.swift  |  1 +
 .../Views/Layout/LazyHGrid.swift                 |  1 +
 .../Views/Layout/LazyVGrid.swift                 |  1 +
 .../Views/Layout/ScrollView.swift                |  1 +
 .../TokamakStaticHTML/Views/Layout/VStack.swift  |  1 +
 .../TokamakStaticHTML/Views/Layout/ZStack.swift  |  1 +
 .../Views/Navigation/NavigationView.swift        |  1 +
 .../TokamakStaticHTML/Views/Spacers/Spacer.swift |  1 +
 70 files changed, 157 insertions(+), 38 deletions(-)

diff --git a/Sources/TokamakCore/App/Scenes/WindowGroup.swift b/Sources/TokamakCore/App/Scenes/WindowGroup.swift
index f3e4192bd..f84afb76e 100644
--- a/Sources/TokamakCore/App/Scenes/WindowGroup.swift
+++ b/Sources/TokamakCore/App/Scenes/WindowGroup.swift
@@ -62,7 +62,8 @@ public struct WindowGroup<Content>: Scene, TitledScene where Content: View {
     self.title = Text(title)
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverScene("WindowGroup")
   }
diff --git a/Sources/TokamakCore/App/Scenes/_SceneModifier.swift b/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
index b9030669e..4ea669c1f 100644
--- a/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
+++ b/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
@@ -25,6 +25,8 @@ public struct _SceneModifier_Content<Modifier>: Scene where Modifier: _SceneModi
   public let modifier: Modifier
   public let scene: _AnyScene
 
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverScene("_SceneModifier_Content")
   }
diff --git a/Sources/TokamakCore/App/_AnyApp.swift b/Sources/TokamakCore/App/_AnyApp.swift
index 488cf2f2a..21182d603 100644
--- a/Sources/TokamakCore/App/_AnyApp.swift
+++ b/Sources/TokamakCore/App/_AnyApp.swift
@@ -30,27 +30,33 @@ public struct _AnyApp: App {
     bodyClosure = { _AnyScene(($0 as! A).body) }
     bodyType = A.Body.self
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverScene("_AnyApp")
   }
 
+  @_spi(TokamakCore)
   public init() {
     fatalError("`_AnyApp` cannot be initialized without an underlying `App` type.")
   }
-
+    
+  @_spi(TokamakCore)
   public static func _launch(_ app: Self, _ rootEnvironment: EnvironmentValues) {
     fatalError("`_AnyApp` cannot be launched. Access underlying `app` value.")
   }
-
+    
+  @_spi(TokamakCore)
   public static func _setTitle(_ title: String) {
     fatalError("`title` cannot be set for `AnyApp`. Access underlying `app` value.")
   }
-
+    
+  @_spi(TokamakCore)
   public var _phasePublisher: AnyPublisher<ScenePhase, Never> {
     fatalError("`_AnyApp` cannot monitor scenePhase. Access underlying `app` value.")
   }
-
+    
+  @_spi(TokamakCore)
   public var _colorSchemePublisher: AnyPublisher<ColorScheme, Never> {
     fatalError("`_AnyApp` cannot monitor colorScheme. Access underlying `app` value.")
   }
diff --git a/Sources/TokamakCore/App/_AnyScene.swift b/Sources/TokamakCore/App/_AnyScene.swift
index 59156bdbb..1482faf9d 100644
--- a/Sources/TokamakCore/App/_AnyScene.swift
+++ b/Sources/TokamakCore/App/_AnyScene.swift
@@ -65,7 +65,8 @@ public struct _AnyScene: Scene {
       typeConstructorName = TokamakCore.typeConstructorName(type)
     }
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverScene("_AnyScene")
   }
diff --git a/Sources/TokamakCore/App/_TupleScene.swift b/Sources/TokamakCore/App/_TupleScene.swift
index 2c2543b5c..84c3f85bc 100644
--- a/Sources/TokamakCore/App/_TupleScene.swift
+++ b/Sources/TokamakCore/App/_TupleScene.swift
@@ -23,7 +23,8 @@ struct _TupleScene<T>: Scene, GroupScene {
     self.value = value
     self.children = children
   }
-
+    
+  @_spi(TokamakCore)
   var body: Never {
     neverScene("_TupleScene")
   }
diff --git a/Sources/TokamakCore/Shapes/Path.swift b/Sources/TokamakCore/Shapes/Path.swift
index 20010b6e6..3dbb769dd 100644
--- a/Sources/TokamakCore/Shapes/Path.swift
+++ b/Sources/TokamakCore/Shapes/Path.swift
@@ -25,6 +25,7 @@ import WASILibc
 
 /// The outline of a 2D shape.
 public struct Path: Equatable, LosslessStringConvertible {
+  @_spi(TokamakCore)
   public class _PathBox: Equatable {
     var elements: [Element] = []
     public static func == (lhs: Path._PathBox, rhs: Path._PathBox) -> Bool {
diff --git a/Sources/TokamakCore/Shapes/Shape.swift b/Sources/TokamakCore/Shapes/Shape.swift
index 3f72340d0..cc8fcd756 100644
--- a/Sources/TokamakCore/Shapes/Shape.swift
+++ b/Sources/TokamakCore/Shapes/Shape.swift
@@ -58,7 +58,8 @@ public struct _ShapeView<Content, Style>: View where Content: Shape, Style: Shap
     self.style = style
     self.fillStyle = fillStyle
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("_ShapeView")
   }
diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index feab28f70..957b4bc89 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -17,6 +17,8 @@
 public struct ButtonStyleConfiguration {
   public struct Label: View {
     let content: AnyView
+    
+    @_spi(TokamakCore)
     public var body: Never {
       neverBody("ButtonStyleConfiguration.Label")
     }
@@ -34,6 +36,7 @@ public struct DefaultButtonStyle: ButtonStyle {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _ButtonStyleConfigurationProxy {
   public struct Label {
     public typealias Subject = ButtonStyleConfiguration.Label
diff --git a/Sources/TokamakCore/Tokens/Color.swift b/Sources/TokamakCore/Tokens/Color.swift
index f0e942c02..9646227e0 100644
--- a/Sources/TokamakCore/Tokens/Color.swift
+++ b/Sources/TokamakCore/Tokens/Color.swift
@@ -241,6 +241,7 @@ public struct Color: Hashable, Equatable {
   }
 
   /// Create a `Color` dependent on the current `ColorScheme`.
+  @_spi(TokamakCore)
   public static func _withScheme(_ resolver: @escaping (ColorScheme) -> Self) -> Self {
     .init(_EnvironmentDependentColorBox {
       resolver($0.colorScheme)
diff --git a/Sources/TokamakCore/Tokens/Font.swift b/Sources/TokamakCore/Tokens/Font.swift
index 3ea487f20..73204535b 100644
--- a/Sources/TokamakCore/Tokens/Font.swift
+++ b/Sources/TokamakCore/Tokens/Font.swift
@@ -33,6 +33,7 @@ public protocol AnyFontBoxDeferredToRenderer: AnyFontBox {
 }
 
 public class AnyFontBox: AnyTokenBox, Hashable, Equatable {
+  @_spi(TokamakCore)
   public struct _Font: Hashable, Equatable {
     public var _name: String
     public var _size: CGFloat
diff --git a/Sources/TokamakCore/Views/AnyView.swift b/Sources/TokamakCore/Views/AnyView.swift
index 13e5a9606..d620b0d6b 100644
--- a/Sources/TokamakCore/Views/AnyView.swift
+++ b/Sources/TokamakCore/Views/AnyView.swift
@@ -67,7 +67,8 @@ public struct AnyView: View {
       }
     }
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("AnyView")
   }
@@ -80,6 +81,7 @@ public func mapAnyView<T, V>(_ anyView: AnyView, transform: (V) -> T) -> T? {
 }
 
 extension AnyView: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (view as? ParentView)?.children ?? []
   }
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
index eaf5136e8..7d523954d 100644
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ b/Sources/TokamakCore/Views/Buttons/Button.swift
@@ -47,6 +47,7 @@ public struct Button<Label>: View where Label: View {
   }
 }
 
+@_spi(TokamakCore)
 public struct _Button<Label>: View where Label: View {
   public let label: Label
   public let action: () -> ()
@@ -57,7 +58,8 @@ public struct _Button<Label>: View where Label: View {
     self.label = label
     self.action = action
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("_Button")
   }
@@ -72,6 +74,7 @@ public extension Button where Label == Text {
 }
 
 extension Button: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (implementation.label as? GroupView)?.children ?? [AnyView(implementation.label)]
   }
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
index 0d80d27f1..ab3592445 100644
--- a/Sources/TokamakCore/Views/Buttons/Link.swift
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -24,7 +24,8 @@ public struct Link<Label>: View where Label: View {
   public init(destination: URL, @ViewBuilder label: () -> Label) {
     (self.destination, self.label) = (destination, label())
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Link")
   }
@@ -36,6 +37,7 @@ public extension Link where Label == Text {
   }
 }
 
+@_spi(TokamakCore)
 public struct _LinkProxy<Label> where Label: View {
   public let subject: Link<Label>
 
diff --git a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
index 4df73a3e2..866c95039 100644
--- a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
+++ b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
@@ -39,7 +39,8 @@ public struct DisclosureGroup<Label, Content>: View where Label: View, Content:
     self.label = label()
     self.content = content
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("DisclosureGroup")
   }
@@ -70,6 +71,7 @@ public extension DisclosureGroup where Label == Text {
   }
 }
 
+@_spi(TokamakCore)
 public struct _DisclosureGroupProxy<Label, Content>
   where Label: View, Content: View
 {
diff --git a/Sources/TokamakCore/Views/Containers/ForEach.swift b/Sources/TokamakCore/Views/Containers/ForEach.swift
index fa97cd58f..82ccd6c74 100644
--- a/Sources/TokamakCore/Views/Containers/ForEach.swift
+++ b/Sources/TokamakCore/Views/Containers/ForEach.swift
@@ -47,7 +47,8 @@ public struct ForEach<Data, ID, Content>: View where Data: RandomAccessCollectio
     self.id = id
     self.content = content
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("ForEach")
   }
@@ -79,6 +80,7 @@ public extension ForEach where Data == Range<Int>, ID == Int {
 }
 
 extension ForEach: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     data.map { AnyView(IDView(content($0), id: $0[keyPath: id])) }
   }
@@ -101,6 +103,7 @@ public extension EnvironmentValues {
   }
 }
 
+@_spi(TokamakCore)
 public protocol _AnyIDView {
   var anyId: AnyHashable { get }
   var anyContent: AnyView { get }
diff --git a/Sources/TokamakCore/Views/Containers/Group.swift b/Sources/TokamakCore/Views/Containers/Group.swift
index 59fd18358..198499876 100644
--- a/Sources/TokamakCore/Views/Containers/Group.swift
+++ b/Sources/TokamakCore/Views/Containers/Group.swift
@@ -20,12 +20,14 @@ public struct Group<Content> {
 }
 
 extension Group: View where Content: View {
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Group")
   }
 }
 
 extension Group: ParentView where Content: View {
+  @_spi(TokamakCore)
   public var children: [AnyView] { (content as? ParentView)?.children ?? [AnyView(content)] }
 }
 
diff --git a/Sources/TokamakCore/Views/Containers/List.swift b/Sources/TokamakCore/Views/Containers/List.swift
index e2f02e309..9a2a6c3a5 100644
--- a/Sources/TokamakCore/Views/Containers/List.swift
+++ b/Sources/TokamakCore/Views/Containers/List.swift
@@ -18,6 +18,7 @@
 public struct List<SelectionValue, Content>: View
   where SelectionValue: Hashable, Content: View
 {
+  @_spi(TokamakCore)
   public enum _Selection {
     case one(Binding<SelectionValue?>?)
     case many(Binding<Set<SelectionValue>>?)
@@ -120,6 +121,7 @@ public enum _ListRow {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _ListProxy<SelectionValue, Content>
   where SelectionValue: Hashable, Content: View
 {
diff --git a/Sources/TokamakCore/Views/Containers/TupleView.swift b/Sources/TokamakCore/Views/Containers/TupleView.swift
index 9a2af4f9b..66881969f 100644
--- a/Sources/TokamakCore/Views/Containers/TupleView.swift
+++ b/Sources/TokamakCore/Views/Containers/TupleView.swift
@@ -19,6 +19,7 @@
 ///
 /// Mainly for use with `@ViewBuilder`.
 public struct TupleView<T>: View {
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("TupleView")
   }
diff --git a/Sources/TokamakCore/Views/Image.swift b/Sources/TokamakCore/Views/Image.swift
index 7f0345b7b..75e4b33f2 100644
--- a/Sources/TokamakCore/Views/Image.swift
+++ b/Sources/TokamakCore/Views/Image.swift
@@ -39,13 +39,15 @@ public struct Image: View {
     self.name = name
     self.bundle = bundle
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Image")
   }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _ImageProxy {
   public let subject: Image
 
diff --git a/Sources/TokamakCore/Views/Layout/GeometryReader.swift b/Sources/TokamakCore/Views/Layout/GeometryReader.swift
index 010bb2371..9b0b9cd07 100644
--- a/Sources/TokamakCore/Views/Layout/GeometryReader.swift
+++ b/Sources/TokamakCore/Views/Layout/GeometryReader.swift
@@ -46,6 +46,7 @@ public struct GeometryReader<Content>: View where Content: View {
     self.content = content
   }
 
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("GeometryReader")
   }
diff --git a/Sources/TokamakCore/Views/Layout/HStack.swift b/Sources/TokamakCore/Views/Layout/HStack.swift
index 720ec3420..95e13b8b5 100644
--- a/Sources/TokamakCore/Views/Layout/HStack.swift
+++ b/Sources/TokamakCore/Views/Layout/HStack.swift
@@ -42,13 +42,15 @@ public struct HStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("HStack")
   }
 }
 
 extension HStack: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (content as? GroupView)?.children ?? [AnyView(content)]
   }
diff --git a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
index a19796b6e..121e6c2c2 100644
--- a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
@@ -35,7 +35,8 @@ public struct LazyHGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("LazyVGrid")
   }
diff --git a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
index f83581abb..d90a053e0 100644
--- a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
@@ -35,12 +35,14 @@ public struct LazyVGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("LazyVGrid")
   }
 }
 
+@_spi(TokamakCore)
 public struct _LazyVGridProxy<Content> where Content: View {
   public let subject: LazyVGrid<Content>
 
diff --git a/Sources/TokamakCore/Views/Layout/ScrollView.swift b/Sources/TokamakCore/Views/Layout/ScrollView.swift
index cf14982a4..ae544f891 100644
--- a/Sources/TokamakCore/Views/Layout/ScrollView.swift
+++ b/Sources/TokamakCore/Views/Layout/ScrollView.swift
@@ -49,13 +49,15 @@ public struct ScrollView<Content>: View where Content: View {
     self.showsIndicators = showsIndicators
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("ScrollView")
   }
 }
 
 extension ScrollView: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (content as? GroupView)?.children ?? [AnyView(content)]
   }
diff --git a/Sources/TokamakCore/Views/Layout/VStack.swift b/Sources/TokamakCore/Views/Layout/VStack.swift
index 8787952ed..158433c51 100644
--- a/Sources/TokamakCore/Views/Layout/VStack.swift
+++ b/Sources/TokamakCore/Views/Layout/VStack.swift
@@ -39,13 +39,15 @@ public struct VStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("VStack")
   }
 }
 
 extension VStack: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (content as? GroupView)?.children ?? [AnyView(content)]
   }
diff --git a/Sources/TokamakCore/Views/Layout/ZStack.swift b/Sources/TokamakCore/Views/Layout/ZStack.swift
index 75d245b9a..6d74d5150 100644
--- a/Sources/TokamakCore/Views/Layout/ZStack.swift
+++ b/Sources/TokamakCore/Views/Layout/ZStack.swift
@@ -57,13 +57,15 @@ public struct ZStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("ZStack")
   }
 }
 
 extension ZStack: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (content as? GroupView)?.children ?? [AnyView(content)]
   }
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
index 67e9a954b..d048c6381 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
@@ -44,7 +44,8 @@ public struct NavigationLink<Label, Destination>: View where Label: View, Destin
   //    tag: V, selection: Binding<V?>,
   //    @ViewBuilder label: () -> Label
   //   ) where V : Hashable
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("NavigationLink")
   }
@@ -73,6 +74,7 @@ public extension NavigationLink where Label == Text {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _NavigationLinkProxy<Label, Destination> where Label: View, Destination: View {
   public let subject: NavigationLink<Label, Destination>
 
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationView.swift b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
index 9abce6128..bbb44cfcd 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationView.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
@@ -27,13 +27,15 @@ public struct NavigationView<Content>: View where Content: View {
   public init(@ViewBuilder content: () -> Content) {
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("NavigationView")
   }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _NavigationViewProxy<Content: View> {
   public let subject: NavigationView<Content>
 
diff --git a/Sources/TokamakCore/Views/Selectors/Picker.swift b/Sources/TokamakCore/Views/Selectors/Picker.swift
index 3ce52c50e..ab0768d61 100644
--- a/Sources/TokamakCore/Views/Selectors/Picker.swift
+++ b/Sources/TokamakCore/Views/Selectors/Picker.swift
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+@_spi(TokamakCore)
 public protocol _PickerContainerProtocol {
   var elements: [_AnyIDView] { get }
 }
 
+@_spi(TokamakCore)
 public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: View>: View,
   _PickerContainerProtocol
 {
@@ -36,17 +38,20 @@ public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: V
     self.elements = elements
     self.content = content()
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("_PickerLabel")
   }
 }
 
+@_spi(TokamakCore)
 public struct _PickerElement: View {
   public let valueIndex: Int?
   public let content: AnyView
   @Environment(\.pickerStyle) public var style
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("_PickerElement")
   }
@@ -105,12 +110,14 @@ public extension Picker where Label == Text {
 }
 
 extension Picker: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (content as? GroupView)?.children ?? [AnyView(content)]
   }
 }
 
 extension Picker: _PickerContainerProtocol {
+  @_spi(TokamakCore)
   public var elements: [_AnyIDView] {
     (content as? ForEachProtocol)?.children
       .compactMap {
diff --git a/Sources/TokamakCore/Views/Selectors/Slider.swift b/Sources/TokamakCore/Views/Selectors/Slider.swift
index 6ffba17ff..cc700f5b8 100644
--- a/Sources/TokamakCore/Views/Selectors/Slider.swift
+++ b/Sources/TokamakCore/Views/Selectors/Slider.swift
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+@_spi(TokamakCore)
 public enum _SliderStep {
   case any
   case discrete(Double.Stride)
@@ -36,7 +37,8 @@ public struct Slider<Label, ValueLabel>: View where Label: View, ValueLabel: Vie
   let bounds: ClosedRange<Double>
   let step: _SliderStep
   let onEditingChanged: (Bool) -> ()
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Slider")
   }
@@ -144,6 +146,7 @@ public extension Slider {
 }
 
 extension Slider: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     ((label as? GroupView)?.children ?? [AnyView(label)])
       + ((minValueLabel as? GroupView)?.children ?? [AnyView(minValueLabel)])
@@ -152,6 +155,7 @@ extension Slider: ParentView {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _SliderProxy<Label, ValueLabel> where Label: View, ValueLabel: View {
   public let subject: Slider<Label, ValueLabel>
 
diff --git a/Sources/TokamakCore/Views/Selectors/Toggle.swift b/Sources/TokamakCore/Views/Selectors/Toggle.swift
index 058631954..9089921f5 100644
--- a/Sources/TokamakCore/Views/Selectors/Toggle.swift
+++ b/Sources/TokamakCore/Views/Selectors/Toggle.swift
@@ -48,6 +48,7 @@ public extension Toggle where Label == AnyView {
 }
 
 extension Toggle: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (label as? GroupView)?.children ?? [AnyView(label)]
   }
diff --git a/Sources/TokamakCore/Views/Spacers/Divider.swift b/Sources/TokamakCore/Views/Spacers/Divider.swift
index 33e25a08f..2d7887e66 100644
--- a/Sources/TokamakCore/Views/Spacers/Divider.swift
+++ b/Sources/TokamakCore/Views/Spacers/Divider.swift
@@ -18,7 +18,10 @@
 /// A horizontal line for separating content.
 public struct Divider: View {
   @Environment(\.self) public var environment
+    
   public init() {}
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Divider")
   }
diff --git a/Sources/TokamakCore/Views/Spacers/Spacer.swift b/Sources/TokamakCore/Views/Spacers/Spacer.swift
index 21cb60dca..dcf827bda 100644
--- a/Sources/TokamakCore/Views/Spacers/Spacer.swift
+++ b/Sources/TokamakCore/Views/Spacers/Spacer.swift
@@ -28,7 +28,8 @@ public struct Spacer: View {
   public init(minLength: CGFloat? = nil) {
     self.minLength = minLength
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Spacer")
   }
diff --git a/Sources/TokamakCore/Views/Text/SecureField.swift b/Sources/TokamakCore/Views/Text/SecureField.swift
index 638495674..10a39000e 100644
--- a/Sources/TokamakCore/Views/Text/SecureField.swift
+++ b/Sources/TokamakCore/Views/Text/SecureField.swift
@@ -39,7 +39,8 @@ public struct SecureField<Label>: View where Label: View {
   let label: Label
   let textBinding: Binding<String>
   let onCommit: () -> ()
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("SecureField")
   }
@@ -57,12 +58,14 @@ public extension SecureField where Label == Text {
 }
 
 extension SecureField: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (label as? GroupView)?.children ?? [AnyView(label)]
   }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _SecureFieldProxy {
   public let subject: SecureField<Text>
 
diff --git a/Sources/TokamakCore/Views/Text/Text.swift b/Sources/TokamakCore/Views/Text/Text.swift
index 84b4801f0..3cf95619f 100644
--- a/Sources/TokamakCore/Views/Text/Text.swift
+++ b/Sources/TokamakCore/Views/Text/Text.swift
@@ -71,7 +71,8 @@ public struct Text: View {
   public init<S>(_ content: S) where S: StringProtocol {
     self.init(storage: .verbatim(String(content)))
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("Text")
   }
@@ -91,6 +92,7 @@ public extension Text._Storage {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _TextProxy {
   public let subject: Text
 
diff --git a/Sources/TokamakCore/Views/Text/TextEditor.swift b/Sources/TokamakCore/Views/Text/TextEditor.swift
index 41ed14819..1276a69a6 100644
--- a/Sources/TokamakCore/Views/Text/TextEditor.swift
+++ b/Sources/TokamakCore/Views/Text/TextEditor.swift
@@ -18,7 +18,8 @@ public struct TextEditor: View {
   public init(text: Binding<String>) {
     textBinding = text
   }
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("TextEditor")
   }
diff --git a/Sources/TokamakCore/Views/Text/TextField.swift b/Sources/TokamakCore/Views/Text/TextField.swift
index 328d2caf6..2f80db285 100644
--- a/Sources/TokamakCore/Views/Text/TextField.swift
+++ b/Sources/TokamakCore/Views/Text/TextField.swift
@@ -40,7 +40,8 @@ public struct TextField<Label>: View where Label: View {
   let onEditingChanged: (Bool) -> ()
   let onCommit: () -> ()
   @Environment(\.textFieldStyle) var style
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("TextField")
   }
@@ -68,12 +69,14 @@ public extension TextField where Label == Text {
 }
 
 extension TextField: ParentView {
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     (label as? GroupView)?.children ?? [AnyView(label)]
   }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
+@_spi(TokamakCore)
 public struct _TextFieldProxy {
   public let subject: TextField<Text>
 
diff --git a/Sources/TokamakCore/Views/ViewBuilder.swift b/Sources/TokamakCore/Views/ViewBuilder.swift
index 3560dd29a..71c45b922 100644
--- a/Sources/TokamakCore/Views/ViewBuilder.swift
+++ b/Sources/TokamakCore/Views/ViewBuilder.swift
@@ -19,13 +19,15 @@
 public struct EmptyView: View {
   @inlinable
   public init() {}
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("EmptyView")
   }
 }
 
 // swiftlint:disable:next type_name
+@_spi(TokamakCore)
 public struct _ConditionalContent<TrueContent, FalseContent>: View
   where TrueContent: View, FalseContent: View
 {
@@ -35,7 +37,8 @@ public struct _ConditionalContent<TrueContent, FalseContent>: View
   }
 
   let storage: Storage
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("_ConditionContent")
   }
diff --git a/Sources/TokamakDOM/Styles/ButtonStyle.swift b/Sources/TokamakDOM/Styles/ButtonStyle.swift
index c64ca0a31..08fd49800 100644
--- a/Sources/TokamakDOM/Styles/ButtonStyle.swift
+++ b/Sources/TokamakDOM/Styles/ButtonStyle.swift
@@ -18,6 +18,7 @@
 import TokamakCore
 
 extension ButtonStyleConfiguration.Label: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     _ButtonStyleConfigurationProxy.Label(self).content
   }
diff --git a/Sources/TokamakDOM/Views/Buttons/Button.swift b/Sources/TokamakDOM/Views/Buttons/Button.swift
index 3f18024b3..1ca88f3d8 100644
--- a/Sources/TokamakDOM/Views/Buttons/Button.swift
+++ b/Sources/TokamakDOM/Views/Buttons/Button.swift
@@ -19,6 +19,7 @@ import TokamakCore
 import TokamakStaticHTML
 
 extension _Button: ViewDeferredToRenderer where Label == Text {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let listeners: [String: Listener] = [
       "pointerdown": { _ in isPressed = true },
diff --git a/Sources/TokamakDOM/Views/Containers/DisclosureGroup.swift b/Sources/TokamakDOM/Views/Containers/DisclosureGroup.swift
index 88b2129cf..3b3b17879 100644
--- a/Sources/TokamakDOM/Views/Containers/DisclosureGroup.swift
+++ b/Sources/TokamakDOM/Views/Containers/DisclosureGroup.swift
@@ -70,6 +70,7 @@ extension DisclosureGroup: ViewDeferredToRenderer {
     }
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("div", [
       "class": "_tokamak-disclosuregroup",
diff --git a/Sources/TokamakDOM/Views/DynamicHTML.swift b/Sources/TokamakDOM/Views/DynamicHTML.swift
index 0922504fc..a892b9cdd 100644
--- a/Sources/TokamakDOM/Views/DynamicHTML.swift
+++ b/Sources/TokamakDOM/Views/DynamicHTML.swift
@@ -34,7 +34,8 @@ public struct DynamicHTML<Content>: View, AnyDynamicHTML {
   let content: Content
 
   public var innerHTML: String?
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("HTML")
   }
@@ -68,7 +69,8 @@ extension DynamicHTML: ParentView where Content: View {
     self.content = content()
     innerHTML = nil
   }
-
+    
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakDOM/Views/Layout/GeometryReader.swift b/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
index bd830bfe1..9d288a5d9 100644
--- a/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
+++ b/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
@@ -19,6 +19,7 @@ import TokamakStaticHTML
 private let ResizeObserver = JSObject.global.ResizeObserver.function!
 
 extension GeometryReader: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(_GeometryReader(content: content))
   }
diff --git a/Sources/TokamakDOM/Views/Navigation/NavigationLink.swift b/Sources/TokamakDOM/Views/Navigation/NavigationLink.swift
index 6089a946c..873e2b708 100644
--- a/Sources/TokamakDOM/Views/Navigation/NavigationLink.swift
+++ b/Sources/TokamakDOM/Views/Navigation/NavigationLink.swift
@@ -16,6 +16,7 @@ import TokamakCore
 import TokamakStaticHTML
 
 extension NavigationLink: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _NavigationLinkProxy(self)
     return AnyView(
diff --git a/Sources/TokamakDOM/Views/Selectors/Picker.swift b/Sources/TokamakDOM/Views/Selectors/Picker.swift
index 4c93ab164..cfce0f270 100644
--- a/Sources/TokamakDOM/Views/Selectors/Picker.swift
+++ b/Sources/TokamakDOM/Views/Selectors/Picker.swift
@@ -17,6 +17,7 @@ import TokamakCore
 import TokamakStaticHTML
 
 extension _PickerContainer: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("label") {
       label
@@ -35,6 +36,7 @@ extension _PickerContainer: ViewDeferredToRenderer {
 }
 
 extension _PickerElement: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let attributes: [HTMLAttribute: String]
     if let value = valueIndex {
diff --git a/Sources/TokamakDOM/Views/Selectors/Slider.swift b/Sources/TokamakDOM/Views/Selectors/Slider.swift
index 3378dfd9b..862afbbdd 100644
--- a/Sources/TokamakDOM/Views/Selectors/Slider.swift
+++ b/Sources/TokamakDOM/Views/Selectors/Slider.swift
@@ -17,6 +17,7 @@ import TokamakCore
 import TokamakStaticHTML
 
 extension Slider: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _SliderProxy(self)
     let step: String
diff --git a/Sources/TokamakDOM/Views/Text/SecureField.swift b/Sources/TokamakDOM/Views/Text/SecureField.swift
index 054839e4d..ad95a0cf6 100644
--- a/Sources/TokamakDOM/Views/Text/SecureField.swift
+++ b/Sources/TokamakDOM/Views/Text/SecureField.swift
@@ -18,6 +18,7 @@
 import TokamakCore
 
 extension SecureField: ViewDeferredToRenderer where Label == Text {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _SecureFieldProxy(self)
     return AnyView(DynamicHTML("input", [
diff --git a/Sources/TokamakDOM/Views/Text/TextEditor.swift b/Sources/TokamakDOM/Views/Text/TextEditor.swift
index 0266ef3a4..5eeaff3f1 100644
--- a/Sources/TokamakDOM/Views/Text/TextEditor.swift
+++ b/Sources/TokamakDOM/Views/Text/TextEditor.swift
@@ -15,6 +15,7 @@
 import TokamakCore
 
 extension TextEditor: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _TextEditorProxy(self)
 
diff --git a/Sources/TokamakDOM/Views/Text/TextField.swift b/Sources/TokamakDOM/Views/Text/TextField.swift
index 020ee2784..2b364e538 100644
--- a/Sources/TokamakDOM/Views/Text/TextField.swift
+++ b/Sources/TokamakDOM/Views/Text/TextField.swift
@@ -38,7 +38,8 @@ extension TextField: ViewDeferredToRenderer where Label == Text {
       return ""
     }
   }
-
+    
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _TextFieldProxy(self)
 
diff --git a/Sources/TokamakGTK/Modifiers/WidgetModifier.swift b/Sources/TokamakGTK/Modifiers/WidgetModifier.swift
index fbd51f1cb..e990d0894 100644
--- a/Sources/TokamakGTK/Modifiers/WidgetModifier.swift
+++ b/Sources/TokamakGTK/Modifiers/WidgetModifier.swift
@@ -51,6 +51,7 @@ extension WidgetAttributeModifier {
 }
 
 extension ModifiedContent: ViewDeferredToRenderer where Content: View {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     guard let widgetModifier = modifier as? WidgetModifier else {
       return AnyView(content)
diff --git a/Sources/TokamakGTK/Shapes/Shape.swift b/Sources/TokamakGTK/Shapes/Shape.swift
index 42b8cf582..36e9078a9 100644
--- a/Sources/TokamakGTK/Shapes/Shape.swift
+++ b/Sources/TokamakGTK/Shapes/Shape.swift
@@ -51,6 +51,7 @@ func createPath(from elements: [Path.Element], in cr: OpaquePointer) {
 }
 
 extension _ShapeView: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(WidgetView(build: { _ in
       let w = gtk_drawing_area_new()
diff --git a/Sources/TokamakGTK/Views/List.swift b/Sources/TokamakGTK/Views/List.swift
index 58d944af1..4d5e68e30 100644
--- a/Sources/TokamakGTK/Views/List.swift
+++ b/Sources/TokamakGTK/Views/List.swift
@@ -31,6 +31,7 @@ extension List: ViewDeferredToRenderer {
     }
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _ListProxy(self)
     return AnyView(ScrollView {
diff --git a/Sources/TokamakGTK/Views/NavigationView.swift b/Sources/TokamakGTK/Views/NavigationView.swift
index ae4f16326..119b47444 100644
--- a/Sources/TokamakGTK/Views/NavigationView.swift
+++ b/Sources/TokamakGTK/Views/NavigationView.swift
@@ -59,6 +59,7 @@ protocol GtkStackProtocol {}
 // }
 
 extension NavigationView: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _NavigationViewProxy(self)
     return AnyView(HStack {
@@ -70,6 +71,7 @@ extension NavigationView: ViewDeferredToRenderer {
 }
 
 extension NavigationLink: ViewDeferredToRenderer {
+@_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _NavigationLinkProxy(self)
     return AnyView(Button(action: { proxy.activate() }) {
diff --git a/Sources/TokamakGTK/Views/ScrollView.swift b/Sources/TokamakGTK/Views/ScrollView.swift
index 71ef78d97..e991a8d33 100644
--- a/Sources/TokamakGTK/Views/ScrollView.swift
+++ b/Sources/TokamakGTK/Views/ScrollView.swift
@@ -19,6 +19,7 @@ import CGTK
 import TokamakCore
 
 extension ScrollView: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(WidgetView(build: { _ in
       gtk_scrolled_window_new(nil, nil)
diff --git a/Sources/TokamakGTK/Views/Stack.swift b/Sources/TokamakGTK/Views/Stack.swift
index 034655856..a18f65bce 100644
--- a/Sources/TokamakGTK/Views/Stack.swift
+++ b/Sources/TokamakGTK/Views/Stack.swift
@@ -53,6 +53,7 @@ struct Box<Content: View>: View, ParentView, AnyWidget, StackProtocol {
 }
 
 extension VStack: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(
       Box(
@@ -66,6 +67,7 @@ extension VStack: ViewDeferredToRenderer {
 }
 
 extension HStack: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(
       Box(
diff --git a/Sources/TokamakGTK/Views/TextField.swift b/Sources/TokamakGTK/Views/TextField.swift
index 1638f3d27..9c273b7c6 100644
--- a/Sources/TokamakGTK/Views/TextField.swift
+++ b/Sources/TokamakGTK/Views/TextField.swift
@@ -57,6 +57,7 @@ private func bindAction(to entry: UnsafeMutablePointer<GtkWidget>, textBinding:
 }
 
 extension SecureField: ViewDeferredToRenderer where Label == Text {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _SecureFieldProxy(self)
     return AnyView(WidgetView(
@@ -72,6 +73,7 @@ extension SecureField: ViewDeferredToRenderer where Label == Text {
 }
 
 extension TextField: ViewDeferredToRenderer where Label == Text {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _TextFieldProxy(self)
     return AnyView(WidgetView(
diff --git a/Sources/TokamakStaticHTML/Modifiers/ModifiedContent.swift b/Sources/TokamakStaticHTML/Modifiers/ModifiedContent.swift
index 2bb65b5ba..a652277f6 100644
--- a/Sources/TokamakStaticHTML/Modifiers/ModifiedContent.swift
+++ b/Sources/TokamakStaticHTML/Modifiers/ModifiedContent.swift
@@ -30,6 +30,7 @@ extension ModifiedContent: AnyModifiedContent where Modifier: DOMViewModifier, C
 }
 
 extension ModifiedContent: ViewDeferredToRenderer where Content: View, Modifier: ViewModifier {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     if let domModifier = modifier as? DOMViewModifier {
       if let adjacentModifier = content as? AnyModifiedContent,
diff --git a/Sources/TokamakStaticHTML/Shapes/Path.swift b/Sources/TokamakStaticHTML/Shapes/Path.swift
index de4a635f5..4270f1b76 100644
--- a/Sources/TokamakStaticHTML/Shapes/Path.swift
+++ b/Sources/TokamakStaticHTML/Shapes/Path.swift
@@ -128,6 +128,7 @@ extension Path: ViewDeferredToRenderer {
     svgFrom(storage: storage, strokeStyle: strokeStyle)
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let sizeStyle = sizing == .flexible ?
       """
diff --git a/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift b/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift
index 46abba0cc..696e84ec9 100644
--- a/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift
+++ b/Sources/TokamakStaticHTML/Shapes/_ShapeView.swift
@@ -32,6 +32,7 @@ extension _StrokedShape: ShapeAttributes {
 }
 
 extension _ShapeView: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let path = shape.path(in: .zero).deferredBody
     if let shapeAttributes = shape as? ShapeAttributes {
diff --git a/Sources/TokamakStaticHTML/Views/Buttons/Link.swift b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
index 38e67405e..5d5ef7f45 100644
--- a/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
+++ b/Sources/TokamakStaticHTML/Views/Buttons/Link.swift
@@ -18,6 +18,7 @@
 import TokamakCore
 
 extension Link: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _LinkProxy(self)
     return AnyView(HTML("a", ["href": proxy.destination.absoluteString, "class": "_tokamak-link"]) {
diff --git a/Sources/TokamakStaticHTML/Views/HTML.swift b/Sources/TokamakStaticHTML/Views/HTML.swift
index b608006cf..ff878f360 100644
--- a/Sources/TokamakStaticHTML/Views/HTML.swift
+++ b/Sources/TokamakStaticHTML/Views/HTML.swift
@@ -69,7 +69,8 @@ public struct HTML<Content>: View, AnyHTML {
   let content: Content
 
   public let innerHTML: String?
-
+    
+  @_spi(TokamakCore)
   public var body: Never {
     neverBody("HTML")
   }
@@ -99,7 +100,8 @@ extension HTML: ParentView where Content: View {
     self.content = content()
     innerHTML = nil
   }
-
+    
+  @_spi(TokamakCore)
   public var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakStaticHTML/Views/Images/Image.swift b/Sources/TokamakStaticHTML/Views/Images/Image.swift
index b55e8e7e0..e77b1066f 100644
--- a/Sources/TokamakStaticHTML/Views/Images/Image.swift
+++ b/Sources/TokamakStaticHTML/Views/Images/Image.swift
@@ -20,6 +20,7 @@ import TokamakCore
 public typealias Image = TokamakCore.Image
 
 extension Image: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(_HTMLImage(proxy: _ImageProxy(self)))
   }
diff --git a/Sources/TokamakStaticHTML/Views/Layout/HStack.swift b/Sources/TokamakStaticHTML/Views/Layout/HStack.swift
index b302b68e9..90a3a8214 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/HStack.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/HStack.swift
@@ -30,6 +30,7 @@ extension VerticalAlignment {
 extension HStack: ViewDeferredToRenderer, SpacerContainer {
   public var axis: SpacerContainerAxis { .horizontal }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("div", [
       "style": """
diff --git a/Sources/TokamakStaticHTML/Views/Layout/LazyHGrid.swift b/Sources/TokamakStaticHTML/Views/Layout/LazyHGrid.swift
index c9548a44b..20d30a045 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/LazyHGrid.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/LazyHGrid.swift
@@ -36,6 +36,7 @@ extension LazyHGrid: ViewDeferredToRenderer {
     _LazyHGridProxy(self).rows.last
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     var styles = """
     display: grid;
diff --git a/Sources/TokamakStaticHTML/Views/Layout/LazyVGrid.swift b/Sources/TokamakStaticHTML/Views/Layout/LazyVGrid.swift
index f9e94e342..40b5a17a2 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/LazyVGrid.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/LazyVGrid.swift
@@ -36,6 +36,7 @@ extension LazyVGrid: ViewDeferredToRenderer {
     _LazyVGridProxy(self).columns.last
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     var styles = """
     display: grid;
diff --git a/Sources/TokamakStaticHTML/Views/Layout/ScrollView.swift b/Sources/TokamakStaticHTML/Views/Layout/ScrollView.swift
index 3b9368887..a9e40a771 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/ScrollView.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/ScrollView.swift
@@ -26,6 +26,7 @@ extension ScrollView: ViewDeferredToRenderer, SpacerContainer {
     }
   }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let scrollX = axes.contains(.horizontal)
     let scrollY = axes.contains(.vertical)
diff --git a/Sources/TokamakStaticHTML/Views/Layout/VStack.swift b/Sources/TokamakStaticHTML/Views/Layout/VStack.swift
index 0483f6ff8..75af304bb 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/VStack.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/VStack.swift
@@ -30,6 +30,7 @@ extension HorizontalAlignment {
 extension VStack: ViewDeferredToRenderer, SpacerContainer {
   public var axis: SpacerContainerAxis { .vertical }
 
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("div", [
       "style": """
diff --git a/Sources/TokamakStaticHTML/Views/Layout/ZStack.swift b/Sources/TokamakStaticHTML/Views/Layout/ZStack.swift
index b60f51294..003881669 100644
--- a/Sources/TokamakStaticHTML/Views/Layout/ZStack.swift
+++ b/Sources/TokamakStaticHTML/Views/Layout/ZStack.swift
@@ -23,6 +23,7 @@ struct _ZStack_ContentGridItem: ViewModifier, DOMViewModifier {
 }
 
 extension ZStack: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("div", [
       "style": """
diff --git a/Sources/TokamakStaticHTML/Views/Navigation/NavigationView.swift b/Sources/TokamakStaticHTML/Views/Navigation/NavigationView.swift
index afc329434..5c9145eab 100644
--- a/Sources/TokamakStaticHTML/Views/Navigation/NavigationView.swift
+++ b/Sources/TokamakStaticHTML/Views/Navigation/NavigationView.swift
@@ -15,6 +15,7 @@
 import TokamakCore
 
 extension NavigationView: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _NavigationViewProxy(self)
     return AnyView(HTML("div", [
diff --git a/Sources/TokamakStaticHTML/Views/Spacers/Spacer.swift b/Sources/TokamakStaticHTML/Views/Spacers/Spacer.swift
index 1be491fd2..eedc24d12 100644
--- a/Sources/TokamakStaticHTML/Views/Spacers/Spacer.swift
+++ b/Sources/TokamakStaticHTML/Views/Spacers/Spacer.swift
@@ -56,6 +56,7 @@ public extension SpacerContainer where Self: ParentView {
 }
 
 extension Spacer: ViewDeferredToRenderer {
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     AnyView(HTML("div", [
       "style": "flex-grow: 1; \(minLength != nil ? "min-width: \(minLength!)" : "")",

From 8e1a31cb871034ef5854b09e90b69eb2c1436712 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Thu, 4 Mar 2021 18:27:03 +0200
Subject: [PATCH 02/11] Remove `_spi` attribute on '_ConditionalContent'.

---
 Sources/TokamakCore/Views/ViewBuilder.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Sources/TokamakCore/Views/ViewBuilder.swift b/Sources/TokamakCore/Views/ViewBuilder.swift
index 71c45b922..382b0d23f 100644
--- a/Sources/TokamakCore/Views/ViewBuilder.swift
+++ b/Sources/TokamakCore/Views/ViewBuilder.swift
@@ -27,7 +27,6 @@ public struct EmptyView: View {
 }
 
 // swiftlint:disable:next type_name
-@_spi(TokamakCore)
 public struct _ConditionalContent<TrueContent, FalseContent>: View
   where TrueContent: View, FalseContent: View
 {

From 3dd0f1e38033af9497a137ce817ba89d33cc3b73 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Thu, 4 Mar 2021 18:40:57 +0200
Subject: [PATCH 03/11] Remove spi from 'Path._PathBox', 'Font._Font', and
 '_TupleScene.body'.

---
 Sources/TokamakCore/App/_TupleScene.swift | 1 -
 Sources/TokamakCore/Shapes/Path.swift     | 1 -
 Sources/TokamakCore/Tokens/Font.swift     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Sources/TokamakCore/App/_TupleScene.swift b/Sources/TokamakCore/App/_TupleScene.swift
index 84c3f85bc..dbd6b38ad 100644
--- a/Sources/TokamakCore/App/_TupleScene.swift
+++ b/Sources/TokamakCore/App/_TupleScene.swift
@@ -24,7 +24,6 @@ struct _TupleScene<T>: Scene, GroupScene {
     self.children = children
   }
     
-  @_spi(TokamakCore)
   var body: Never {
     neverScene("_TupleScene")
   }
diff --git a/Sources/TokamakCore/Shapes/Path.swift b/Sources/TokamakCore/Shapes/Path.swift
index 3dbb769dd..20010b6e6 100644
--- a/Sources/TokamakCore/Shapes/Path.swift
+++ b/Sources/TokamakCore/Shapes/Path.swift
@@ -25,7 +25,6 @@ import WASILibc
 
 /// The outline of a 2D shape.
 public struct Path: Equatable, LosslessStringConvertible {
-  @_spi(TokamakCore)
   public class _PathBox: Equatable {
     var elements: [Element] = []
     public static func == (lhs: Path._PathBox, rhs: Path._PathBox) -> Bool {
diff --git a/Sources/TokamakCore/Tokens/Font.swift b/Sources/TokamakCore/Tokens/Font.swift
index 73204535b..3ea487f20 100644
--- a/Sources/TokamakCore/Tokens/Font.swift
+++ b/Sources/TokamakCore/Tokens/Font.swift
@@ -33,7 +33,6 @@ public protocol AnyFontBoxDeferredToRenderer: AnyFontBox {
 }
 
 public class AnyFontBox: AnyTokenBox, Hashable, Equatable {
-  @_spi(TokamakCore)
   public struct _Font: Hashable, Equatable {
     public var _name: String
     public var _size: CGFloat

From 7ccc3a4193e707a84b5022aa393b72c92e0384be Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Thu, 4 Mar 2021 19:06:20 +0200
Subject: [PATCH 04/11] Remove spi from types.

---
 Sources/TokamakCore/Styles/ButtonStyle.swift               | 1 -
 Sources/TokamakCore/Views/Buttons/Button.swift             | 1 -
 Sources/TokamakCore/Views/Buttons/Link.swift               | 1 -
 Sources/TokamakCore/Views/Containers/DisclosureGroup.swift | 1 -
 Sources/TokamakCore/Views/Containers/ForEach.swift         | 1 -
 Sources/TokamakCore/Views/Containers/List.swift            | 2 --
 Sources/TokamakCore/Views/Image.swift                      | 1 -
 Sources/TokamakCore/Views/Layout/LazyVGrid.swift           | 1 -
 Sources/TokamakCore/Views/Navigation/NavigationLink.swift  | 1 -
 Sources/TokamakCore/Views/Navigation/NavigationView.swift  | 1 -
 Sources/TokamakCore/Views/Selectors/Picker.swift           | 5 ++---
 Sources/TokamakCore/Views/Selectors/Slider.swift           | 2 --
 Sources/TokamakCore/Views/Text/SecureField.swift           | 1 -
 Sources/TokamakCore/Views/Text/Text.swift                  | 1 -
 Sources/TokamakCore/Views/Text/TextField.swift             | 1 -
 Sources/TokamakGTK/Tokens/BuiltinColors.swift              | 2 +-
 Sources/TokamakStaticHTML/Tokens/BuiltinColors.swift       | 2 +-
 Sources/TokamakStaticHTML/Views/Containers/List.swift      | 2 +-
 Sources/TokamakStaticHTML/Views/Spacers/Divider.swift      | 2 +-
 Tests/TokamakTests/ReconcilerTests.swift                   | 2 +-
 20 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index 957b4bc89..82c49ef05 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -36,7 +36,6 @@ public struct DefaultButtonStyle: ButtonStyle {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _ButtonStyleConfigurationProxy {
   public struct Label {
     public typealias Subject = ButtonStyleConfiguration.Label
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
index 7d523954d..795b6330a 100644
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ b/Sources/TokamakCore/Views/Buttons/Button.swift
@@ -47,7 +47,6 @@ public struct Button<Label>: View where Label: View {
   }
 }
 
-@_spi(TokamakCore)
 public struct _Button<Label>: View where Label: View {
   public let label: Label
   public let action: () -> ()
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
index ab3592445..210d12f32 100644
--- a/Sources/TokamakCore/Views/Buttons/Link.swift
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -37,7 +37,6 @@ public extension Link where Label == Text {
   }
 }
 
-@_spi(TokamakCore)
 public struct _LinkProxy<Label> where Label: View {
   public let subject: Link<Label>
 
diff --git a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
index 866c95039..92c9b2fb1 100644
--- a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
+++ b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
@@ -71,7 +71,6 @@ public extension DisclosureGroup where Label == Text {
   }
 }
 
-@_spi(TokamakCore)
 public struct _DisclosureGroupProxy<Label, Content>
   where Label: View, Content: View
 {
diff --git a/Sources/TokamakCore/Views/Containers/ForEach.swift b/Sources/TokamakCore/Views/Containers/ForEach.swift
index 82ccd6c74..042143080 100644
--- a/Sources/TokamakCore/Views/Containers/ForEach.swift
+++ b/Sources/TokamakCore/Views/Containers/ForEach.swift
@@ -103,7 +103,6 @@ public extension EnvironmentValues {
   }
 }
 
-@_spi(TokamakCore)
 public protocol _AnyIDView {
   var anyId: AnyHashable { get }
   var anyContent: AnyView { get }
diff --git a/Sources/TokamakCore/Views/Containers/List.swift b/Sources/TokamakCore/Views/Containers/List.swift
index 9a2a6c3a5..e2f02e309 100644
--- a/Sources/TokamakCore/Views/Containers/List.swift
+++ b/Sources/TokamakCore/Views/Containers/List.swift
@@ -18,7 +18,6 @@
 public struct List<SelectionValue, Content>: View
   where SelectionValue: Hashable, Content: View
 {
-  @_spi(TokamakCore)
   public enum _Selection {
     case one(Binding<SelectionValue?>?)
     case many(Binding<Set<SelectionValue>>?)
@@ -121,7 +120,6 @@ public enum _ListRow {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _ListProxy<SelectionValue, Content>
   where SelectionValue: Hashable, Content: View
 {
diff --git a/Sources/TokamakCore/Views/Image.swift b/Sources/TokamakCore/Views/Image.swift
index 75e4b33f2..f6d057a90 100644
--- a/Sources/TokamakCore/Views/Image.swift
+++ b/Sources/TokamakCore/Views/Image.swift
@@ -47,7 +47,6 @@ public struct Image: View {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _ImageProxy {
   public let subject: Image
 
diff --git a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
index d90a053e0..36623fbe8 100644
--- a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
@@ -42,7 +42,6 @@ public struct LazyVGrid<Content>: View where Content: View {
   }
 }
 
-@_spi(TokamakCore)
 public struct _LazyVGridProxy<Content> where Content: View {
   public let subject: LazyVGrid<Content>
 
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
index d048c6381..68c8deca7 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
@@ -74,7 +74,6 @@ public extension NavigationLink where Label == Text {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _NavigationLinkProxy<Label, Destination> where Label: View, Destination: View {
   public let subject: NavigationLink<Label, Destination>
 
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationView.swift b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
index bbb44cfcd..f2d7f50ff 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationView.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
@@ -35,7 +35,6 @@ public struct NavigationView<Content>: View where Content: View {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _NavigationViewProxy<Content: View> {
   public let subject: NavigationView<Content>
 
diff --git a/Sources/TokamakCore/Views/Selectors/Picker.swift b/Sources/TokamakCore/Views/Selectors/Picker.swift
index ab0768d61..6bd9e4ec8 100644
--- a/Sources/TokamakCore/Views/Selectors/Picker.swift
+++ b/Sources/TokamakCore/Views/Selectors/Picker.swift
@@ -12,12 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-@_spi(TokamakCore)
 public protocol _PickerContainerProtocol {
   var elements: [_AnyIDView] { get }
 }
 
-@_spi(TokamakCore)
 public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: View>: View,
   _PickerContainerProtocol
 {
@@ -45,7 +43,6 @@ public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: V
   }
 }
 
-@_spi(TokamakCore)
 public struct _PickerElement: View {
   public let valueIndex: Int?
   public let content: AnyView
@@ -116,6 +113,7 @@ extension Picker: ParentView {
   }
 }
 
+@_spi(TokamakCore)
 extension Picker: _PickerContainerProtocol {
   @_spi(TokamakCore)
   public var elements: [_AnyIDView] {
@@ -127,3 +125,4 @@ extension Picker: _PickerContainerProtocol {
     // .map(\.children) ?? []
   }
 }
+
diff --git a/Sources/TokamakCore/Views/Selectors/Slider.swift b/Sources/TokamakCore/Views/Selectors/Slider.swift
index cc700f5b8..6d15fabfb 100644
--- a/Sources/TokamakCore/Views/Selectors/Slider.swift
+++ b/Sources/TokamakCore/Views/Selectors/Slider.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-@_spi(TokamakCore)
 public enum _SliderStep {
   case any
   case discrete(Double.Stride)
@@ -155,7 +154,6 @@ extension Slider: ParentView {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _SliderProxy<Label, ValueLabel> where Label: View, ValueLabel: View {
   public let subject: Slider<Label, ValueLabel>
 
diff --git a/Sources/TokamakCore/Views/Text/SecureField.swift b/Sources/TokamakCore/Views/Text/SecureField.swift
index 10a39000e..fafce0fde 100644
--- a/Sources/TokamakCore/Views/Text/SecureField.swift
+++ b/Sources/TokamakCore/Views/Text/SecureField.swift
@@ -65,7 +65,6 @@ extension SecureField: ParentView {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _SecureFieldProxy {
   public let subject: SecureField<Text>
 
diff --git a/Sources/TokamakCore/Views/Text/Text.swift b/Sources/TokamakCore/Views/Text/Text.swift
index 3cf95619f..32997484f 100644
--- a/Sources/TokamakCore/Views/Text/Text.swift
+++ b/Sources/TokamakCore/Views/Text/Text.swift
@@ -92,7 +92,6 @@ public extension Text._Storage {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _TextProxy {
   public let subject: Text
 
diff --git a/Sources/TokamakCore/Views/Text/TextField.swift b/Sources/TokamakCore/Views/Text/TextField.swift
index 2f80db285..49b1af1c0 100644
--- a/Sources/TokamakCore/Views/Text/TextField.swift
+++ b/Sources/TokamakCore/Views/Text/TextField.swift
@@ -76,7 +76,6 @@ extension TextField: ParentView {
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
-@_spi(TokamakCore)
 public struct _TextFieldProxy {
   public let subject: TextField<Text>
 
diff --git a/Sources/TokamakGTK/Tokens/BuiltinColors.swift b/Sources/TokamakGTK/Tokens/BuiltinColors.swift
index 1fee3e957..291616fa1 100644
--- a/Sources/TokamakGTK/Tokens/BuiltinColors.swift
+++ b/Sources/TokamakGTK/Tokens/BuiltinColors.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 8/4/20.
 //
 
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 // MARK: List Colors
 
diff --git a/Sources/TokamakStaticHTML/Tokens/BuiltinColors.swift b/Sources/TokamakStaticHTML/Tokens/BuiltinColors.swift
index 1fee3e957..291616fa1 100644
--- a/Sources/TokamakStaticHTML/Tokens/BuiltinColors.swift
+++ b/Sources/TokamakStaticHTML/Tokens/BuiltinColors.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 8/4/20.
 //
 
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 // MARK: List Colors
 
diff --git a/Sources/TokamakStaticHTML/Views/Containers/List.swift b/Sources/TokamakStaticHTML/Views/Containers/List.swift
index d4be21259..4b49f507b 100644
--- a/Sources/TokamakStaticHTML/Views/Containers/List.swift
+++ b/Sources/TokamakStaticHTML/Views/Containers/List.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 extension PlainListStyle: ListStyleDeferredToRenderer {
   public func sectionHeader<Header>(_ header: Header) -> AnyView where Header: View {
diff --git a/Sources/TokamakStaticHTML/Views/Spacers/Divider.swift b/Sources/TokamakStaticHTML/Views/Spacers/Divider.swift
index 47c2f8869..7e9a8d9b1 100644
--- a/Sources/TokamakStaticHTML/Views/Spacers/Divider.swift
+++ b/Sources/TokamakStaticHTML/Views/Spacers/Divider.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 extension Divider: AnyHTML {
   public var innerHTML: String? { nil }
diff --git a/Tests/TokamakTests/ReconcilerTests.swift b/Tests/TokamakTests/ReconcilerTests.swift
index cc9e66a78..d45160fc7 100644
--- a/Tests/TokamakTests/ReconcilerTests.swift
+++ b/Tests/TokamakTests/ReconcilerTests.swift
@@ -15,7 +15,7 @@
 //  Created by Max Desiatov on 07/12/2018.
 //
 
-import TokamakTestRenderer
+@_spi(TokamakCore) import TokamakTestRenderer
 import XCTest
 
 @testable import TokamakCore

From 89e9aaaab05876b892c985a4c9e04693eb3b0229 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Thu, 4 Mar 2021 21:14:21 +0200
Subject: [PATCH 05/11] Remove trailing whitespace.

---
 Sources/TokamakCore/App/Scenes/WindowGroup.swift       |  2 +-
 Sources/TokamakCore/App/Scenes/_SceneModifier.swift    |  1 -
 Sources/TokamakCore/App/_AnyApp.swift                  | 10 +++++-----
 Sources/TokamakCore/App/_AnyScene.swift                |  2 +-
 Sources/TokamakCore/App/_TupleScene.swift              |  2 +-
 Sources/TokamakCore/Shapes/Shape.swift                 |  2 +-
 Sources/TokamakCore/Styles/ButtonStyle.swift           |  2 +-
 Sources/TokamakCore/Views/AnyView.swift                |  2 +-
 Sources/TokamakCore/Views/Buttons/Button.swift         |  2 +-
 Sources/TokamakCore/Views/Buttons/Link.swift           |  2 +-
 .../TokamakCore/Views/Containers/DisclosureGroup.swift |  2 +-
 Sources/TokamakCore/Views/Containers/ForEach.swift     |  2 +-
 Sources/TokamakCore/Views/Image.swift                  |  2 +-
 Sources/TokamakCore/Views/Layout/HStack.swift          |  2 +-
 Sources/TokamakCore/Views/Layout/LazyHGrid.swift       |  2 +-
 Sources/TokamakCore/Views/Layout/LazyVGrid.swift       |  2 +-
 Sources/TokamakCore/Views/Layout/ScrollView.swift      |  2 +-
 Sources/TokamakCore/Views/Layout/VStack.swift          |  2 +-
 Sources/TokamakCore/Views/Layout/ZStack.swift          |  2 +-
 .../TokamakCore/Views/Navigation/NavigationLink.swift  |  2 +-
 .../TokamakCore/Views/Navigation/NavigationView.swift  |  2 +-
 Sources/TokamakCore/Views/Selectors/Picker.swift       |  5 ++---
 Sources/TokamakCore/Views/Selectors/Slider.swift       |  2 +-
 Sources/TokamakCore/Views/Spacers/Divider.swift        |  4 ++--
 Sources/TokamakCore/Views/Spacers/Spacer.swift         |  2 +-
 Sources/TokamakCore/Views/Text/SecureField.swift       |  2 +-
 Sources/TokamakCore/Views/Text/Text.swift              |  2 +-
 Sources/TokamakCore/Views/Text/TextEditor.swift        |  2 +-
 Sources/TokamakCore/Views/Text/TextField.swift         |  2 +-
 Sources/TokamakCore/Views/ViewBuilder.swift            |  4 ++--
 Sources/TokamakDOM/Views/DynamicHTML.swift             |  4 ++--
 Sources/TokamakDOM/Views/Text/TextField.swift          |  2 +-
 Sources/TokamakGTK/Views/NavigationView.swift          |  2 +-
 Sources/TokamakStaticHTML/Views/HTML.swift             |  4 ++--
 34 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/Sources/TokamakCore/App/Scenes/WindowGroup.swift b/Sources/TokamakCore/App/Scenes/WindowGroup.swift
index f84afb76e..cd2d5c12a 100644
--- a/Sources/TokamakCore/App/Scenes/WindowGroup.swift
+++ b/Sources/TokamakCore/App/Scenes/WindowGroup.swift
@@ -62,7 +62,7 @@ public struct WindowGroup<Content>: Scene, TitledScene where Content: View {
     self.title = Text(title)
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverScene("WindowGroup")
diff --git a/Sources/TokamakCore/App/Scenes/_SceneModifier.swift b/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
index 4ea669c1f..555c3598a 100644
--- a/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
+++ b/Sources/TokamakCore/App/Scenes/_SceneModifier.swift
@@ -25,7 +25,6 @@ public struct _SceneModifier_Content<Modifier>: Scene where Modifier: _SceneModi
   public let modifier: Modifier
   public let scene: _AnyScene
 
-    
   @_spi(TokamakCore)
   public var body: Never {
     neverScene("_SceneModifier_Content")
diff --git a/Sources/TokamakCore/App/_AnyApp.swift b/Sources/TokamakCore/App/_AnyApp.swift
index 21182d603..94fef4112 100644
--- a/Sources/TokamakCore/App/_AnyApp.swift
+++ b/Sources/TokamakCore/App/_AnyApp.swift
@@ -30,7 +30,7 @@ public struct _AnyApp: App {
     bodyClosure = { _AnyScene(($0 as! A).body) }
     bodyType = A.Body.self
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverScene("_AnyApp")
@@ -40,22 +40,22 @@ public struct _AnyApp: App {
   public init() {
     fatalError("`_AnyApp` cannot be initialized without an underlying `App` type.")
   }
-    
+
   @_spi(TokamakCore)
   public static func _launch(_ app: Self, _ rootEnvironment: EnvironmentValues) {
     fatalError("`_AnyApp` cannot be launched. Access underlying `app` value.")
   }
-    
+
   @_spi(TokamakCore)
   public static func _setTitle(_ title: String) {
     fatalError("`title` cannot be set for `AnyApp`. Access underlying `app` value.")
   }
-    
+
   @_spi(TokamakCore)
   public var _phasePublisher: AnyPublisher<ScenePhase, Never> {
     fatalError("`_AnyApp` cannot monitor scenePhase. Access underlying `app` value.")
   }
-    
+
   @_spi(TokamakCore)
   public var _colorSchemePublisher: AnyPublisher<ColorScheme, Never> {
     fatalError("`_AnyApp` cannot monitor colorScheme. Access underlying `app` value.")
diff --git a/Sources/TokamakCore/App/_AnyScene.swift b/Sources/TokamakCore/App/_AnyScene.swift
index 1482faf9d..0a48557ff 100644
--- a/Sources/TokamakCore/App/_AnyScene.swift
+++ b/Sources/TokamakCore/App/_AnyScene.swift
@@ -65,7 +65,7 @@ public struct _AnyScene: Scene {
       typeConstructorName = TokamakCore.typeConstructorName(type)
     }
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverScene("_AnyScene")
diff --git a/Sources/TokamakCore/App/_TupleScene.swift b/Sources/TokamakCore/App/_TupleScene.swift
index dbd6b38ad..2c2543b5c 100644
--- a/Sources/TokamakCore/App/_TupleScene.swift
+++ b/Sources/TokamakCore/App/_TupleScene.swift
@@ -23,7 +23,7 @@ struct _TupleScene<T>: Scene, GroupScene {
     self.value = value
     self.children = children
   }
-    
+
   var body: Never {
     neverScene("_TupleScene")
   }
diff --git a/Sources/TokamakCore/Shapes/Shape.swift b/Sources/TokamakCore/Shapes/Shape.swift
index cc8fcd756..ac52aebdf 100644
--- a/Sources/TokamakCore/Shapes/Shape.swift
+++ b/Sources/TokamakCore/Shapes/Shape.swift
@@ -58,7 +58,7 @@ public struct _ShapeView<Content, Style>: View where Content: Shape, Style: Shap
     self.style = style
     self.fillStyle = fillStyle
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("_ShapeView")
diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index 82c49ef05..bbfc7c459 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -17,7 +17,7 @@
 public struct ButtonStyleConfiguration {
   public struct Label: View {
     let content: AnyView
-    
+
     @_spi(TokamakCore)
     public var body: Never {
       neverBody("ButtonStyleConfiguration.Label")
diff --git a/Sources/TokamakCore/Views/AnyView.swift b/Sources/TokamakCore/Views/AnyView.swift
index d620b0d6b..9ebd4c451 100644
--- a/Sources/TokamakCore/Views/AnyView.swift
+++ b/Sources/TokamakCore/Views/AnyView.swift
@@ -67,7 +67,7 @@ public struct AnyView: View {
       }
     }
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("AnyView")
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
index 795b6330a..e979bc27c 100644
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ b/Sources/TokamakCore/Views/Buttons/Button.swift
@@ -57,7 +57,7 @@ public struct _Button<Label>: View where Label: View {
     self.label = label
     self.action = action
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("_Button")
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
index 210d12f32..93f067827 100644
--- a/Sources/TokamakCore/Views/Buttons/Link.swift
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -24,7 +24,7 @@ public struct Link<Label>: View where Label: View {
   public init(destination: URL, @ViewBuilder label: () -> Label) {
     (self.destination, self.label) = (destination, label())
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Link")
diff --git a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
index 92c9b2fb1..7933169a0 100644
--- a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
+++ b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
@@ -39,7 +39,7 @@ public struct DisclosureGroup<Label, Content>: View where Label: View, Content:
     self.label = label()
     self.content = content
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("DisclosureGroup")
diff --git a/Sources/TokamakCore/Views/Containers/ForEach.swift b/Sources/TokamakCore/Views/Containers/ForEach.swift
index 042143080..5958b1a98 100644
--- a/Sources/TokamakCore/Views/Containers/ForEach.swift
+++ b/Sources/TokamakCore/Views/Containers/ForEach.swift
@@ -47,7 +47,7 @@ public struct ForEach<Data, ID, Content>: View where Data: RandomAccessCollectio
     self.id = id
     self.content = content
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("ForEach")
diff --git a/Sources/TokamakCore/Views/Image.swift b/Sources/TokamakCore/Views/Image.swift
index f6d057a90..fdace9f6a 100644
--- a/Sources/TokamakCore/Views/Image.swift
+++ b/Sources/TokamakCore/Views/Image.swift
@@ -39,7 +39,7 @@ public struct Image: View {
     self.name = name
     self.bundle = bundle
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Image")
diff --git a/Sources/TokamakCore/Views/Layout/HStack.swift b/Sources/TokamakCore/Views/Layout/HStack.swift
index 95e13b8b5..c7fe102cc 100644
--- a/Sources/TokamakCore/Views/Layout/HStack.swift
+++ b/Sources/TokamakCore/Views/Layout/HStack.swift
@@ -42,7 +42,7 @@ public struct HStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("HStack")
diff --git a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
index 121e6c2c2..e30050dd2 100644
--- a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
@@ -35,7 +35,7 @@ public struct LazyHGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("LazyVGrid")
diff --git a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
index 36623fbe8..90e25c691 100644
--- a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
@@ -35,7 +35,7 @@ public struct LazyVGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("LazyVGrid")
diff --git a/Sources/TokamakCore/Views/Layout/ScrollView.swift b/Sources/TokamakCore/Views/Layout/ScrollView.swift
index ae544f891..1b7b94f1e 100644
--- a/Sources/TokamakCore/Views/Layout/ScrollView.swift
+++ b/Sources/TokamakCore/Views/Layout/ScrollView.swift
@@ -49,7 +49,7 @@ public struct ScrollView<Content>: View where Content: View {
     self.showsIndicators = showsIndicators
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("ScrollView")
diff --git a/Sources/TokamakCore/Views/Layout/VStack.swift b/Sources/TokamakCore/Views/Layout/VStack.swift
index 158433c51..4129c9b14 100644
--- a/Sources/TokamakCore/Views/Layout/VStack.swift
+++ b/Sources/TokamakCore/Views/Layout/VStack.swift
@@ -39,7 +39,7 @@ public struct VStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("VStack")
diff --git a/Sources/TokamakCore/Views/Layout/ZStack.swift b/Sources/TokamakCore/Views/Layout/ZStack.swift
index 6d74d5150..36026270c 100644
--- a/Sources/TokamakCore/Views/Layout/ZStack.swift
+++ b/Sources/TokamakCore/Views/Layout/ZStack.swift
@@ -57,7 +57,7 @@ public struct ZStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("ZStack")
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
index 68c8deca7..7b70f1759 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
@@ -44,7 +44,7 @@ public struct NavigationLink<Label, Destination>: View where Label: View, Destin
   //    tag: V, selection: Binding<V?>,
   //    @ViewBuilder label: () -> Label
   //   ) where V : Hashable
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("NavigationLink")
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationView.swift b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
index f2d7f50ff..72e3e69bf 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationView.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
@@ -27,7 +27,7 @@ public struct NavigationView<Content>: View where Content: View {
   public init(@ViewBuilder content: () -> Content) {
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("NavigationView")
diff --git a/Sources/TokamakCore/Views/Selectors/Picker.swift b/Sources/TokamakCore/Views/Selectors/Picker.swift
index 6bd9e4ec8..d7e83d10e 100644
--- a/Sources/TokamakCore/Views/Selectors/Picker.swift
+++ b/Sources/TokamakCore/Views/Selectors/Picker.swift
@@ -36,7 +36,7 @@ public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: V
     self.elements = elements
     self.content = content()
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("_PickerLabel")
@@ -47,7 +47,7 @@ public struct _PickerElement: View {
   public let valueIndex: Int?
   public let content: AnyView
   @Environment(\.pickerStyle) public var style
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("_PickerElement")
@@ -125,4 +125,3 @@ extension Picker: _PickerContainerProtocol {
     // .map(\.children) ?? []
   }
 }
-
diff --git a/Sources/TokamakCore/Views/Selectors/Slider.swift b/Sources/TokamakCore/Views/Selectors/Slider.swift
index 6d15fabfb..ca7e30942 100644
--- a/Sources/TokamakCore/Views/Selectors/Slider.swift
+++ b/Sources/TokamakCore/Views/Selectors/Slider.swift
@@ -36,7 +36,7 @@ public struct Slider<Label, ValueLabel>: View where Label: View, ValueLabel: Vie
   let bounds: ClosedRange<Double>
   let step: _SliderStep
   let onEditingChanged: (Bool) -> ()
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Slider")
diff --git a/Sources/TokamakCore/Views/Spacers/Divider.swift b/Sources/TokamakCore/Views/Spacers/Divider.swift
index 2d7887e66..79e2109a3 100644
--- a/Sources/TokamakCore/Views/Spacers/Divider.swift
+++ b/Sources/TokamakCore/Views/Spacers/Divider.swift
@@ -18,9 +18,9 @@
 /// A horizontal line for separating content.
 public struct Divider: View {
   @Environment(\.self) public var environment
-    
+
   public init() {}
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Divider")
diff --git a/Sources/TokamakCore/Views/Spacers/Spacer.swift b/Sources/TokamakCore/Views/Spacers/Spacer.swift
index dcf827bda..e0088e332 100644
--- a/Sources/TokamakCore/Views/Spacers/Spacer.swift
+++ b/Sources/TokamakCore/Views/Spacers/Spacer.swift
@@ -28,7 +28,7 @@ public struct Spacer: View {
   public init(minLength: CGFloat? = nil) {
     self.minLength = minLength
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Spacer")
diff --git a/Sources/TokamakCore/Views/Text/SecureField.swift b/Sources/TokamakCore/Views/Text/SecureField.swift
index fafce0fde..3c30bfc1a 100644
--- a/Sources/TokamakCore/Views/Text/SecureField.swift
+++ b/Sources/TokamakCore/Views/Text/SecureField.swift
@@ -39,7 +39,7 @@ public struct SecureField<Label>: View where Label: View {
   let label: Label
   let textBinding: Binding<String>
   let onCommit: () -> ()
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("SecureField")
diff --git a/Sources/TokamakCore/Views/Text/Text.swift b/Sources/TokamakCore/Views/Text/Text.swift
index 32997484f..5961e11f4 100644
--- a/Sources/TokamakCore/Views/Text/Text.swift
+++ b/Sources/TokamakCore/Views/Text/Text.swift
@@ -71,7 +71,7 @@ public struct Text: View {
   public init<S>(_ content: S) where S: StringProtocol {
     self.init(storage: .verbatim(String(content)))
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("Text")
diff --git a/Sources/TokamakCore/Views/Text/TextEditor.swift b/Sources/TokamakCore/Views/Text/TextEditor.swift
index 1276a69a6..48b9c6eda 100644
--- a/Sources/TokamakCore/Views/Text/TextEditor.swift
+++ b/Sources/TokamakCore/Views/Text/TextEditor.swift
@@ -18,7 +18,7 @@ public struct TextEditor: View {
   public init(text: Binding<String>) {
     textBinding = text
   }
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("TextEditor")
diff --git a/Sources/TokamakCore/Views/Text/TextField.swift b/Sources/TokamakCore/Views/Text/TextField.swift
index 49b1af1c0..7399d9b5e 100644
--- a/Sources/TokamakCore/Views/Text/TextField.swift
+++ b/Sources/TokamakCore/Views/Text/TextField.swift
@@ -40,7 +40,7 @@ public struct TextField<Label>: View where Label: View {
   let onEditingChanged: (Bool) -> ()
   let onCommit: () -> ()
   @Environment(\.textFieldStyle) var style
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("TextField")
diff --git a/Sources/TokamakCore/Views/ViewBuilder.swift b/Sources/TokamakCore/Views/ViewBuilder.swift
index 382b0d23f..1d1bf70ed 100644
--- a/Sources/TokamakCore/Views/ViewBuilder.swift
+++ b/Sources/TokamakCore/Views/ViewBuilder.swift
@@ -19,7 +19,7 @@
 public struct EmptyView: View {
   @inlinable
   public init() {}
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("EmptyView")
@@ -36,7 +36,7 @@ public struct _ConditionalContent<TrueContent, FalseContent>: View
   }
 
   let storage: Storage
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("_ConditionContent")
diff --git a/Sources/TokamakDOM/Views/DynamicHTML.swift b/Sources/TokamakDOM/Views/DynamicHTML.swift
index a892b9cdd..121845db5 100644
--- a/Sources/TokamakDOM/Views/DynamicHTML.swift
+++ b/Sources/TokamakDOM/Views/DynamicHTML.swift
@@ -34,7 +34,7 @@ public struct DynamicHTML<Content>: View, AnyDynamicHTML {
   let content: Content
 
   public var innerHTML: String?
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("HTML")
@@ -69,7 +69,7 @@ extension DynamicHTML: ParentView where Content: View {
     self.content = content()
     innerHTML = nil
   }
-    
+
   @_spi(TokamakCore)
   public var children: [AnyView] {
     [AnyView(content)]
diff --git a/Sources/TokamakDOM/Views/Text/TextField.swift b/Sources/TokamakDOM/Views/Text/TextField.swift
index 2b364e538..f770e6362 100644
--- a/Sources/TokamakDOM/Views/Text/TextField.swift
+++ b/Sources/TokamakDOM/Views/Text/TextField.swift
@@ -38,7 +38,7 @@ extension TextField: ViewDeferredToRenderer where Label == Text {
       return ""
     }
   }
-    
+
   @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _TextFieldProxy(self)
diff --git a/Sources/TokamakGTK/Views/NavigationView.swift b/Sources/TokamakGTK/Views/NavigationView.swift
index 119b47444..005ac8b23 100644
--- a/Sources/TokamakGTK/Views/NavigationView.swift
+++ b/Sources/TokamakGTK/Views/NavigationView.swift
@@ -71,7 +71,7 @@ extension NavigationView: ViewDeferredToRenderer {
 }
 
 extension NavigationLink: ViewDeferredToRenderer {
-@_spi(TokamakCore)
+  @_spi(TokamakCore)
   public var deferredBody: AnyView {
     let proxy = _NavigationLinkProxy(self)
     return AnyView(Button(action: { proxy.activate() }) {
diff --git a/Sources/TokamakStaticHTML/Views/HTML.swift b/Sources/TokamakStaticHTML/Views/HTML.swift
index ff878f360..c4343ab27 100644
--- a/Sources/TokamakStaticHTML/Views/HTML.swift
+++ b/Sources/TokamakStaticHTML/Views/HTML.swift
@@ -69,7 +69,7 @@ public struct HTML<Content>: View, AnyHTML {
   let content: Content
 
   public let innerHTML: String?
-    
+
   @_spi(TokamakCore)
   public var body: Never {
     neverBody("HTML")
@@ -100,7 +100,7 @@ extension HTML: ParentView where Content: View {
     self.content = content()
     innerHTML = nil
   }
-    
+
   @_spi(TokamakCore)
   public var children: [AnyView] {
     [AnyView(content)]

From 4a59cfd174c79725b7d119472acc7d04c9466e45 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Fri, 5 Mar 2021 07:53:49 +0200
Subject: [PATCH 06/11] Apply spi to 'View' modifiers.

---
 Sources/TokamakCore/App/AppStorage.swift              | 1 +
 Sources/TokamakCore/Modifiers/LifecycleModifier.swift | 2 ++
 Sources/TokamakCore/State/TargetRef.swift             | 1 +
 Sources/TokamakCore/Styles/NavigationLinkStyle.swift  | 1 +
 4 files changed, 5 insertions(+)

diff --git a/Sources/TokamakCore/App/AppStorage.swift b/Sources/TokamakCore/App/AppStorage.swift
index eb3b0dfa4..04ded2519 100644
--- a/Sources/TokamakCore/App/AppStorage.swift
+++ b/Sources/TokamakCore/App/AppStorage.swift
@@ -173,6 +173,7 @@ struct DefaultAppStorageEnvironmentKey: EnvironmentKey {
 }
 
 public extension EnvironmentValues {
+  @_spi(TokamakCore)
   var _defaultAppStorage: _StorageProvider? {
     get {
       self[DefaultAppStorageEnvironmentKey.self]
diff --git a/Sources/TokamakCore/Modifiers/LifecycleModifier.swift b/Sources/TokamakCore/Modifiers/LifecycleModifier.swift
index aeda09b2b..5653a550a 100644
--- a/Sources/TokamakCore/Modifiers/LifecycleModifier.swift
+++ b/Sources/TokamakCore/Modifiers/LifecycleModifier.swift
@@ -14,10 +14,12 @@
 
 // FIXME: these should have standalone implementations
 public extension View {
+  @_spi(TokamakCore)
   func _onMount(perform action: (() -> ())? = nil) -> some View {
     modifier(_AppearanceActionModifier(appear: action))
   }
 
+  @_spi(TokamakCore)
   func _onUnmount(perform action: (() -> ())? = nil) -> some View {
     modifier(_AppearanceActionModifier(disappear: action))
   }
diff --git a/Sources/TokamakCore/State/TargetRef.swift b/Sources/TokamakCore/State/TargetRef.swift
index 9b124a867..f333b1139 100644
--- a/Sources/TokamakCore/State/TargetRef.swift
+++ b/Sources/TokamakCore/State/TargetRef.swift
@@ -33,6 +33,7 @@ public struct _TargetRef<V: View, T>: View, TargetRefType {
 public extension View {
   /** Allows capturing target instance of aclosest descendant host view. The resulting instance
    is written to a given `binding`. */
+  @_spi(TokamakCore)
   func _targetRef<T: Target>(_ binding: Binding<T?>) -> _TargetRef<Self, T> {
     .init(binding: binding, view: self)
   }
diff --git a/Sources/TokamakCore/Styles/NavigationLinkStyle.swift b/Sources/TokamakCore/Styles/NavigationLinkStyle.swift
index aef322fdb..f26bac3b0 100644
--- a/Sources/TokamakCore/Styles/NavigationLinkStyle.swift
+++ b/Sources/TokamakCore/Styles/NavigationLinkStyle.swift
@@ -68,6 +68,7 @@ extension EnvironmentValues {
 }
 
 public extension View {
+  @_spi(TokamakCore)
   func _navigationLinkStyle<S: _NavigationLinkStyle>(_ style: S) -> some View {
     environment(\._navigationLinkStyle, _AnyNavigationLinkStyle(style))
   }

From 0b845fd5db08335bb3d2e5d57499ede0b4add250 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Fri, 5 Mar 2021 08:06:39 +0200
Subject: [PATCH 07/11] Add _spi imports.

---
 Sources/TokamakDOM/DOMRef.swift                      | 2 +-
 Sources/TokamakDOM/DOMRenderer.swift                 | 2 +-
 Sources/TokamakDOM/Views/Layout/GeometryReader.swift | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/TokamakDOM/DOMRef.swift b/Sources/TokamakDOM/DOMRef.swift
index c592916df..21b71c821 100644
--- a/Sources/TokamakDOM/DOMRef.swift
+++ b/Sources/TokamakDOM/DOMRef.swift
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import JavaScriptKit
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 public extension View {
   /** Allows capturing DOM references of host views. The resulting reference is written
diff --git a/Sources/TokamakDOM/DOMRenderer.swift b/Sources/TokamakDOM/DOMRenderer.swift
index 3747868db..d9f430bea 100644
--- a/Sources/TokamakDOM/DOMRenderer.swift
+++ b/Sources/TokamakDOM/DOMRenderer.swift
@@ -17,7 +17,7 @@
 
 import JavaScriptKit
 import OpenCombineJS
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 import TokamakStaticHTML
 
 extension EnvironmentValues {
diff --git a/Sources/TokamakDOM/Views/Layout/GeometryReader.swift b/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
index 9d288a5d9..082e32b17 100644
--- a/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
+++ b/Sources/TokamakDOM/Views/Layout/GeometryReader.swift
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import JavaScriptKit
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 import TokamakStaticHTML
 
 private let ResizeObserver = JSObject.global.ResizeObserver.function!

From 75f305188a14eef814cd4820c8917f7c9d23b10f Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Sat, 6 Mar 2021 21:54:02 +0200
Subject: [PATCH 08/11] Introduce 'PrimitiveView'.

---
 .../TokamakCore/Preferences/PreferenceKey.swift   |  6 ------
 Sources/TokamakCore/Shapes/Shape.swift            |  7 +------
 Sources/TokamakCore/Styles/ButtonStyle.swift      |  7 +------
 Sources/TokamakCore/Tokens/Color.swift            |  1 +
 Sources/TokamakCore/Views/AnyView.swift           |  7 +------
 Sources/TokamakCore/Views/Buttons/Button.swift    |  8 ++------
 Sources/TokamakCore/Views/Buttons/Link.swift      |  7 +------
 .../Views/Containers/DisclosureGroup.swift        |  7 +------
 .../TokamakCore/Views/Containers/ForEach.swift    |  8 ++------
 Sources/TokamakCore/Views/Containers/Group.swift  |  7 +------
 Sources/TokamakCore/Views/Containers/List.swift   |  1 +
 .../Views/Containers/OutlineGroup.swift           |  2 ++
 .../TokamakCore/Views/Containers/Section.swift    |  1 +
 .../TokamakCore/Views/Containers/TupleView.swift  |  7 +------
 Sources/TokamakCore/Views/Image.swift             |  7 +------
 .../TokamakCore/Views/Layout/GeometryReader.swift |  7 +------
 Sources/TokamakCore/Views/Layout/HStack.swift     |  7 +------
 Sources/TokamakCore/Views/Layout/LazyHGrid.swift  |  7 +------
 Sources/TokamakCore/Views/Layout/LazyVGrid.swift  |  7 +------
 Sources/TokamakCore/Views/Layout/ScrollView.swift |  7 +------
 Sources/TokamakCore/Views/Layout/VStack.swift     |  7 +------
 Sources/TokamakCore/Views/Layout/ZStack.swift     |  7 +------
 .../Views/Navigation/NavigationLink.swift         |  9 +++------
 .../Views/Navigation/NavigationView.swift         |  7 +------
 Sources/TokamakCore/Views/Selectors/Picker.swift  | 15 +++------------
 Sources/TokamakCore/Views/Selectors/Slider.swift  |  7 +------
 Sources/TokamakCore/Views/Selectors/Toggle.swift  |  1 +
 Sources/TokamakCore/Views/Spacers/Divider.swift   |  7 +------
 Sources/TokamakCore/Views/Spacers/Spacer.swift    |  7 +------
 Sources/TokamakCore/Views/Text/SecureField.swift  |  7 +------
 Sources/TokamakCore/Views/Text/Text.swift         |  7 +------
 Sources/TokamakCore/Views/Text/TextEditor.swift   |  7 +------
 Sources/TokamakCore/Views/Text/TextField.swift    |  7 +------
 Sources/TokamakCore/Views/View.swift              | 13 ++++++++++++-
 Sources/TokamakCore/Views/ViewBuilder.swift       | 14 ++------------
 Sources/TokamakDOM/Views/DynamicHTML.swift        |  7 +------
 .../TokamakGTK/Scenes/SceneContainerView.swift    |  6 +-----
 Sources/TokamakGTK/Views/Stack.swift              |  6 +-----
 Sources/TokamakGTK/Widget.swift                   |  6 +-----
 Sources/TokamakStaticHTML/Views/HTML.swift        |  7 +------
 40 files changed, 58 insertions(+), 214 deletions(-)

diff --git a/Sources/TokamakCore/Preferences/PreferenceKey.swift b/Sources/TokamakCore/Preferences/PreferenceKey.swift
index 55962a2fb..d67845218 100644
--- a/Sources/TokamakCore/Preferences/PreferenceKey.swift
+++ b/Sources/TokamakCore/Preferences/PreferenceKey.swift
@@ -96,12 +96,6 @@ public protocol _PreferenceWritingModifierProtocol: ViewModifier
   func body(_ content: Self.Content, with preferenceStore: inout _PreferenceStore) -> AnyView
 }
 
-public extension _PreferenceWritingViewProtocol where Self: View {
-  var body: Never {
-    neverBody(String(describing: Self.self))
-  }
-}
-
 public extension _PreferenceWritingModifierProtocol {
   func body(content: Content) -> AnyView {
     content.view
diff --git a/Sources/TokamakCore/Shapes/Shape.swift b/Sources/TokamakCore/Shapes/Shape.swift
index ac52aebdf..214efdf51 100644
--- a/Sources/TokamakCore/Shapes/Shape.swift
+++ b/Sources/TokamakCore/Shapes/Shape.swift
@@ -46,7 +46,7 @@ public struct FillStyle: Equatable, ShapeStyle {
   }
 }
 
-public struct _ShapeView<Content, Style>: View where Content: Shape, Style: ShapeStyle {
+public struct _ShapeView<Content, Style>: PrimitiveView where Content: Shape, Style: ShapeStyle {
   @Environment(\.self) public var environment
   @Environment(\.foregroundColor) public var foregroundColor
   public var shape: Content
@@ -58,11 +58,6 @@ public struct _ShapeView<Content, Style>: View where Content: Shape, Style: Shap
     self.style = style
     self.fillStyle = fillStyle
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("_ShapeView")
-  }
 }
 
 public extension Shape {
diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index bbfc7c459..d3826e9d8 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -15,13 +15,8 @@
 //  Created by Gene Z. Ragan on 07/22/2020.
 
 public struct ButtonStyleConfiguration {
-  public struct Label: View {
+  public struct Label: PrimitiveView {
     let content: AnyView
-
-    @_spi(TokamakCore)
-    public var body: Never {
-      neverBody("ButtonStyleConfiguration.Label")
-    }
   }
 
   public let label: Label
diff --git a/Sources/TokamakCore/Tokens/Color.swift b/Sources/TokamakCore/Tokens/Color.swift
index 9646227e0..bac305374 100644
--- a/Sources/TokamakCore/Tokens/Color.swift
+++ b/Sources/TokamakCore/Tokens/Color.swift
@@ -345,6 +345,7 @@ public extension Color {
 
 extension Color: ShapeStyle {}
 extension Color: View {
+  @_spi(BubbleCore)
   public var body: some View {
     _ShapeView(shape: Rectangle(), style: self)
   }
diff --git a/Sources/TokamakCore/Views/AnyView.swift b/Sources/TokamakCore/Views/AnyView.swift
index 9ebd4c451..3d0cb6db3 100644
--- a/Sources/TokamakCore/Views/AnyView.swift
+++ b/Sources/TokamakCore/Views/AnyView.swift
@@ -16,7 +16,7 @@
 //
 
 /// A type-erased view.
-public struct AnyView: View {
+public struct AnyView: PrimitiveView {
   /// The type of the underlying `view`.
   let type: Any.Type
 
@@ -67,11 +67,6 @@ public struct AnyView: View {
       }
     }
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("AnyView")
-  }
 }
 
 public func mapAnyView<T, V>(_ anyView: AnyView, transform: (V) -> T) -> T? {
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
index e979bc27c..f5800731a 100644
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ b/Sources/TokamakCore/Views/Buttons/Button.swift
@@ -42,12 +42,13 @@ public struct Button<Label>: View where Label: View {
     implementation = _Button(action: action, label: label())
   }
 
+  @_spi(TomkamakCore)
   public var body: some View {
     implementation
   }
 }
 
-public struct _Button<Label>: View where Label: View {
+public struct _Button<Label>: PrimitiveView where Label: View {
   public let label: Label
   public let action: () -> ()
   @State public var isPressed = false
@@ -57,11 +58,6 @@ public struct _Button<Label>: View where Label: View {
     self.label = label
     self.action = action
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("_Button")
-  }
 }
 
 public extension Button where Label == Text {
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Buttons/Link.swift
index 93f067827..e652de063 100644
--- a/Sources/TokamakCore/Views/Buttons/Link.swift
+++ b/Sources/TokamakCore/Views/Buttons/Link.swift
@@ -17,18 +17,13 @@
 
 import struct Foundation.URL
 
-public struct Link<Label>: View where Label: View {
+public struct Link<Label>: PrimitiveView where Label: View {
   let destination: URL
   let label: Label
 
   public init(destination: URL, @ViewBuilder label: () -> Label) {
     (self.destination, self.label) = (destination, label())
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Link")
-  }
 }
 
 public extension Link where Label == Text {
diff --git a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
index 7933169a0..fb8d9b9ef 100644
--- a/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
+++ b/Sources/TokamakCore/Views/Containers/DisclosureGroup.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/3/20.
 //
 
-public struct DisclosureGroup<Label, Content>: View where Label: View, Content: View {
+public struct DisclosureGroup<Label, Content>: PrimitiveView where Label: View, Content: View {
   @State var isExpanded: Bool = false
   let isExpandedBinding: Binding<Bool>?
 
@@ -39,11 +39,6 @@ public struct DisclosureGroup<Label, Content>: View where Label: View, Content:
     self.label = label()
     self.content = content
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("DisclosureGroup")
-  }
 }
 
 public extension DisclosureGroup where Label == Text {
diff --git a/Sources/TokamakCore/Views/Containers/ForEach.swift b/Sources/TokamakCore/Views/Containers/ForEach.swift
index 5958b1a98..9b8b226d9 100644
--- a/Sources/TokamakCore/Views/Containers/ForEach.swift
+++ b/Sources/TokamakCore/Views/Containers/ForEach.swift
@@ -31,7 +31,8 @@ protocol ForEachProtocol: GroupView {
 ///         Text("\($0)")
 ///       }
 ///     }
-public struct ForEach<Data, ID, Content>: View where Data: RandomAccessCollection, ID: Hashable,
+public struct ForEach<Data, ID, Content>: PrimitiveView where Data: RandomAccessCollection,
+  ID: Hashable,
   Content: View
 {
   let data: Data
@@ -47,11 +48,6 @@ public struct ForEach<Data, ID, Content>: View where Data: RandomAccessCollectio
     self.id = id
     self.content = content
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("ForEach")
-  }
 }
 
 extension ForEach: ForEachProtocol where Data.Index == Int {
diff --git a/Sources/TokamakCore/Views/Containers/Group.swift b/Sources/TokamakCore/Views/Containers/Group.swift
index 198499876..d174b075b 100644
--- a/Sources/TokamakCore/Views/Containers/Group.swift
+++ b/Sources/TokamakCore/Views/Containers/Group.swift
@@ -19,12 +19,7 @@ public struct Group<Content> {
   }
 }
 
-extension Group: View where Content: View {
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Group")
-  }
-}
+extension Group: PrimitiveView & View where Content: View {}
 
 extension Group: ParentView where Content: View {
   @_spi(TokamakCore)
diff --git a/Sources/TokamakCore/Views/Containers/List.swift b/Sources/TokamakCore/Views/Containers/List.swift
index e2f02e309..747268f06 100644
--- a/Sources/TokamakCore/Views/Containers/List.swift
+++ b/Sources/TokamakCore/Views/Containers/List.swift
@@ -78,6 +78,7 @@ public struct List<SelectionValue, Content>: View
     }
   }
 
+  @_spi(TokamakCore)
   public var body: some View {
     if let style = style as? ListStyleDeferredToRenderer {
       style.listBody(ScrollView {
diff --git a/Sources/TokamakCore/Views/Containers/OutlineGroup.swift b/Sources/TokamakCore/Views/Containers/OutlineGroup.swift
index 0c962f063..5975a13bb 100644
--- a/Sources/TokamakCore/Views/Containers/OutlineGroup.swift
+++ b/Sources/TokamakCore/Views/Containers/OutlineGroup.swift
@@ -86,6 +86,7 @@ public extension OutlineGroup where Parent: View,
 }
 
 extension OutlineGroup: View where Parent: View, Leaf: View, Subgroup: View {
+  @_spi(TokamakCore)
   public var body: some View {
     switch root {
     case let .collection(data):
@@ -124,6 +125,7 @@ extension OutlineGroup: View where Parent: View, Leaf: View, Subgroup: View {
 public struct OutlineSubgroupChildren: View {
   let children: () -> AnyView
 
+  @_spi(TokamakCore)
   public var body: some View {
     children()
   }
diff --git a/Sources/TokamakCore/Views/Containers/Section.swift b/Sources/TokamakCore/Views/Containers/Section.swift
index d07e9de41..4f5c2eba9 100644
--- a/Sources/TokamakCore/Views/Containers/Section.swift
+++ b/Sources/TokamakCore/Views/Containers/Section.swift
@@ -33,6 +33,7 @@ extension Section: View, SectionView where Parent: View, Content: View, Footer:
   }
 
   @ViewBuilder
+  @_spi(TokamakCore)
   public var body: TupleView<(Parent, Content, Footer)> {
     header
     content
diff --git a/Sources/TokamakCore/Views/Containers/TupleView.swift b/Sources/TokamakCore/Views/Containers/TupleView.swift
index 66881969f..0ff33e0ed 100644
--- a/Sources/TokamakCore/Views/Containers/TupleView.swift
+++ b/Sources/TokamakCore/Views/Containers/TupleView.swift
@@ -18,12 +18,7 @@
 /// A `View` created from a `Tuple` of `View` values.
 ///
 /// Mainly for use with `@ViewBuilder`.
-public struct TupleView<T>: View {
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("TupleView")
-  }
-
+public struct TupleView<T>: PrimitiveView {
   public let value: T
 
   let _children: [AnyView]
diff --git a/Sources/TokamakCore/Views/Image.swift b/Sources/TokamakCore/Views/Image.swift
index fdace9f6a..5b67abc45 100644
--- a/Sources/TokamakCore/Views/Image.swift
+++ b/Sources/TokamakCore/Views/Image.swift
@@ -17,7 +17,7 @@
 
 import Foundation
 
-public struct Image: View {
+public struct Image: PrimitiveView {
   let label: Text?
   let name: String
   let bundle: Bundle?
@@ -39,11 +39,6 @@ public struct Image: View {
     self.name = name
     self.bundle = bundle
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Image")
-  }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
diff --git a/Sources/TokamakCore/Views/Layout/GeometryReader.swift b/Sources/TokamakCore/Views/Layout/GeometryReader.swift
index 9b0b9cd07..49157eb09 100644
--- a/Sources/TokamakCore/Views/Layout/GeometryReader.swift
+++ b/Sources/TokamakCore/Views/Layout/GeometryReader.swift
@@ -40,14 +40,9 @@ public func makeProxy(from size: CGSize) -> GeometryProxy {
 //   public subscript<T>(anchor: Anchor<T>) -> T {}
 // }
 
-public struct GeometryReader<Content>: View where Content: View {
+public struct GeometryReader<Content>: PrimitiveView where Content: View {
   public let content: (GeometryProxy) -> Content
   public init(@ViewBuilder content: @escaping (GeometryProxy) -> Content) {
     self.content = content
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("GeometryReader")
-  }
 }
diff --git a/Sources/TokamakCore/Views/Layout/HStack.swift b/Sources/TokamakCore/Views/Layout/HStack.swift
index c7fe102cc..70d1089e3 100644
--- a/Sources/TokamakCore/Views/Layout/HStack.swift
+++ b/Sources/TokamakCore/Views/Layout/HStack.swift
@@ -28,7 +28,7 @@ public enum VerticalAlignment: Equatable {
 ///       Text("Hello")
 ///       Text("World")
 ///     }
-public struct HStack<Content>: View where Content: View {
+public struct HStack<Content>: PrimitiveView where Content: View {
   public let alignment: VerticalAlignment
   public let spacing: CGFloat?
   public let content: Content
@@ -42,11 +42,6 @@ public struct HStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("HStack")
-  }
 }
 
 extension HStack: ParentView {
diff --git a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
index e30050dd2..eff7f4fe1 100644
--- a/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyHGrid.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/13/20.
 //
 
-public struct LazyHGrid<Content>: View where Content: View {
+public struct LazyHGrid<Content>: PrimitiveView where Content: View {
   let rows: [GridItem]
   let alignment: VerticalAlignment
   let spacing: CGFloat
@@ -35,11 +35,6 @@ public struct LazyHGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("LazyVGrid")
-  }
 }
 
 public struct _LazyHGridProxy<Content> where Content: View {
diff --git a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
index 90e25c691..a2f3c937b 100644
--- a/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
+++ b/Sources/TokamakCore/Views/Layout/LazyVGrid.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/13/20.
 //
 
-public struct LazyVGrid<Content>: View where Content: View {
+public struct LazyVGrid<Content>: PrimitiveView where Content: View {
   let columns: [GridItem]
   let alignment: HorizontalAlignment
   let spacing: CGFloat
@@ -35,11 +35,6 @@ public struct LazyVGrid<Content>: View where Content: View {
     self.pinnedViews = pinnedViews
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("LazyVGrid")
-  }
 }
 
 public struct _LazyVGridProxy<Content> where Content: View {
diff --git a/Sources/TokamakCore/Views/Layout/ScrollView.swift b/Sources/TokamakCore/Views/Layout/ScrollView.swift
index 1b7b94f1e..42d190620 100644
--- a/Sources/TokamakCore/Views/Layout/ScrollView.swift
+++ b/Sources/TokamakCore/Views/Layout/ScrollView.swift
@@ -35,7 +35,7 @@
 ///         Text("\($0)")
 ///       }
 ///     }
-public struct ScrollView<Content>: View where Content: View {
+public struct ScrollView<Content>: PrimitiveView where Content: View {
   public let content: Content
   public let axes: Axis.Set
   public let showsIndicators: Bool
@@ -49,11 +49,6 @@ public struct ScrollView<Content>: View where Content: View {
     self.showsIndicators = showsIndicators
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("ScrollView")
-  }
 }
 
 extension ScrollView: ParentView {
diff --git a/Sources/TokamakCore/Views/Layout/VStack.swift b/Sources/TokamakCore/Views/Layout/VStack.swift
index 4129c9b14..f4f921bdc 100644
--- a/Sources/TokamakCore/Views/Layout/VStack.swift
+++ b/Sources/TokamakCore/Views/Layout/VStack.swift
@@ -25,7 +25,7 @@ public enum HorizontalAlignment: Equatable {
 ///       Text("Hello")
 ///       Text("World")
 ///     }
-public struct VStack<Content>: View where Content: View {
+public struct VStack<Content>: PrimitiveView where Content: View {
   public let alignment: HorizontalAlignment
   public let spacing: CGFloat?
   public let content: Content
@@ -39,11 +39,6 @@ public struct VStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("VStack")
-  }
 }
 
 extension VStack: ParentView {
diff --git a/Sources/TokamakCore/Views/Layout/ZStack.swift b/Sources/TokamakCore/Views/Layout/ZStack.swift
index 36026270c..352b7b814 100644
--- a/Sources/TokamakCore/Views/Layout/ZStack.swift
+++ b/Sources/TokamakCore/Views/Layout/ZStack.swift
@@ -43,7 +43,7 @@ public struct Alignment: Equatable {
 ///       Text("Top")
 ///     }
 ///
-public struct ZStack<Content>: View where Content: View {
+public struct ZStack<Content>: PrimitiveView where Content: View {
   public let alignment: Alignment
   public let spacing: CGFloat?
   public let content: Content
@@ -57,11 +57,6 @@ public struct ZStack<Content>: View where Content: View {
     self.spacing = spacing
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("ZStack")
-  }
 }
 
 extension ZStack: ParentView {
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
index 7b70f1759..9071115d0 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationLink.swift
@@ -22,7 +22,9 @@ final class NavigationLinkDestination {
   }
 }
 
-public struct NavigationLink<Label, Destination>: View where Label: View, Destination: View {
+public struct NavigationLink<Label, Destination>: PrimitiveView where Label: View,
+  Destination: View
+{
   @State var destination: NavigationLinkDestination
   let label: Label
 
@@ -44,11 +46,6 @@ public struct NavigationLink<Label, Destination>: View where Label: View, Destin
   //    tag: V, selection: Binding<V?>,
   //    @ViewBuilder label: () -> Label
   //   ) where V : Hashable
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("NavigationLink")
-  }
 }
 
 public extension NavigationLink where Label == Text {
diff --git a/Sources/TokamakCore/Views/Navigation/NavigationView.swift b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
index 72e3e69bf..4c7f74667 100644
--- a/Sources/TokamakCore/Views/Navigation/NavigationView.swift
+++ b/Sources/TokamakCore/Views/Navigation/NavigationView.swift
@@ -19,7 +19,7 @@ public final class NavigationContext: ObservableObject {
   @Published var destination = NavigationLinkDestination(EmptyView())
 }
 
-public struct NavigationView<Content>: View where Content: View {
+public struct NavigationView<Content>: PrimitiveView where Content: View {
   let content: Content
 
   @StateObject var context = NavigationContext()
@@ -27,11 +27,6 @@ public struct NavigationView<Content>: View where Content: View {
   public init(@ViewBuilder content: () -> Content) {
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("NavigationView")
-  }
 }
 
 /// This is a helper type that works around absence of "package private" access control in Swift
diff --git a/Sources/TokamakCore/Views/Selectors/Picker.swift b/Sources/TokamakCore/Views/Selectors/Picker.swift
index d7e83d10e..3c3bfae2a 100644
--- a/Sources/TokamakCore/Views/Selectors/Picker.swift
+++ b/Sources/TokamakCore/Views/Selectors/Picker.swift
@@ -16,7 +16,7 @@ public protocol _PickerContainerProtocol {
   var elements: [_AnyIDView] { get }
 }
 
-public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: View>: View,
+public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: View>: PrimitiveView,
   _PickerContainerProtocol
 {
   @Binding public var selection: SelectionValue
@@ -36,22 +36,12 @@ public struct _PickerContainer<Label: View, SelectionValue: Hashable, Content: V
     self.elements = elements
     self.content = content()
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("_PickerLabel")
-  }
 }
 
-public struct _PickerElement: View {
+public struct _PickerElement: PrimitiveView {
   public let valueIndex: Int?
   public let content: AnyView
   @Environment(\.pickerStyle) public var style
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("_PickerElement")
-  }
 }
 
 public struct Picker<Label: View, SelectionValue: Hashable, Content: View>: View {
@@ -69,6 +59,7 @@ public struct Picker<Label: View, SelectionValue: Hashable, Content: View>: View
     self.content = content()
   }
 
+  @_spi(TokamakCore)
   public var body: some View {
     let children = self.children
 
diff --git a/Sources/TokamakCore/Views/Selectors/Slider.swift b/Sources/TokamakCore/Views/Selectors/Slider.swift
index ca7e30942..09232cbf4 100644
--- a/Sources/TokamakCore/Views/Selectors/Slider.swift
+++ b/Sources/TokamakCore/Views/Selectors/Slider.swift
@@ -28,7 +28,7 @@ private func convert<T: BinaryFloatingPoint>(_ range: ClosedRange<T>) -> ClosedR
 /// A control for selecting a value from a bounded linear range of values.
 ///
 /// Available when `Label` and `ValueLabel` conform to `View`.
-public struct Slider<Label, ValueLabel>: View where Label: View, ValueLabel: View {
+public struct Slider<Label, ValueLabel>: PrimitiveView where Label: View, ValueLabel: View {
   let label: Label
   let minValueLabel: ValueLabel
   let maxValueLabel: ValueLabel
@@ -36,11 +36,6 @@ public struct Slider<Label, ValueLabel>: View where Label: View, ValueLabel: Vie
   let bounds: ClosedRange<Double>
   let step: _SliderStep
   let onEditingChanged: (Bool) -> ()
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Slider")
-  }
 }
 
 public extension Slider where Label == EmptyView, ValueLabel == EmptyView {
diff --git a/Sources/TokamakCore/Views/Selectors/Toggle.swift b/Sources/TokamakCore/Views/Selectors/Toggle.swift
index 9089921f5..b44d80eab 100644
--- a/Sources/TokamakCore/Views/Selectors/Toggle.swift
+++ b/Sources/TokamakCore/Views/Selectors/Toggle.swift
@@ -25,6 +25,7 @@ public struct Toggle<Label>: View where Label: View {
     self.label = label()
   }
 
+  @_spi(BubbleCore)
   public var body: AnyView {
     toggleStyle.makeBody(
       configuration: ToggleStyleConfiguration(label: AnyView(label), isOn: $isOn)
diff --git a/Sources/TokamakCore/Views/Spacers/Divider.swift b/Sources/TokamakCore/Views/Spacers/Divider.swift
index 79e2109a3..32ab3e382 100644
--- a/Sources/TokamakCore/Views/Spacers/Divider.swift
+++ b/Sources/TokamakCore/Views/Spacers/Divider.swift
@@ -16,13 +16,8 @@
 //
 
 /// A horizontal line for separating content.
-public struct Divider: View {
+public struct Divider: PrimitiveView {
   @Environment(\.self) public var environment
 
   public init() {}
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Divider")
-  }
 }
diff --git a/Sources/TokamakCore/Views/Spacers/Spacer.swift b/Sources/TokamakCore/Views/Spacers/Spacer.swift
index e0088e332..0d316e870 100644
--- a/Sources/TokamakCore/Views/Spacers/Spacer.swift
+++ b/Sources/TokamakCore/Views/Spacers/Spacer.swift
@@ -22,15 +22,10 @@
 ///       Spacer()
 ///       Text("World")
 ///     }
-public struct Spacer: View {
+public struct Spacer: PrimitiveView {
   public var minLength: CGFloat?
 
   public init(minLength: CGFloat? = nil) {
     self.minLength = minLength
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Spacer")
-  }
 }
diff --git a/Sources/TokamakCore/Views/Text/SecureField.swift b/Sources/TokamakCore/Views/Text/SecureField.swift
index 3c30bfc1a..72a2c7554 100644
--- a/Sources/TokamakCore/Views/Text/SecureField.swift
+++ b/Sources/TokamakCore/Views/Text/SecureField.swift
@@ -35,15 +35,10 @@
 ///         print("Set password")
 ///       })
 ///     }
-public struct SecureField<Label>: View where Label: View {
+public struct SecureField<Label>: PrimitiveView where Label: View {
   let label: Label
   let textBinding: Binding<String>
   let onCommit: () -> ()
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("SecureField")
-  }
 }
 
 public extension SecureField where Label == Text {
diff --git a/Sources/TokamakCore/Views/Text/Text.swift b/Sources/TokamakCore/Views/Text/Text.swift
index 5961e11f4..a4fa79ceb 100644
--- a/Sources/TokamakCore/Views/Text/Text.swift
+++ b/Sources/TokamakCore/Views/Text/Text.swift
@@ -29,7 +29,7 @@
 ///       .bold()
 ///       .italic()
 ///       .underline(true, color: .red)
-public struct Text: View {
+public struct Text: PrimitiveView {
   let storage: _Storage
   let modifiers: [_Modifier]
 
@@ -71,11 +71,6 @@ public struct Text: View {
   public init<S>(_ content: S) where S: StringProtocol {
     self.init(storage: .verbatim(String(content)))
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("Text")
-  }
 }
 
 public extension Text._Storage {
diff --git a/Sources/TokamakCore/Views/Text/TextEditor.swift b/Sources/TokamakCore/Views/Text/TextEditor.swift
index 48b9c6eda..a3b0a68a8 100644
--- a/Sources/TokamakCore/Views/Text/TextEditor.swift
+++ b/Sources/TokamakCore/Views/Text/TextEditor.swift
@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-public struct TextEditor: View {
+public struct TextEditor: PrimitiveView {
   let textBinding: Binding<String>
 
   public init(text: Binding<String>) {
     textBinding = text
   }
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("TextEditor")
-  }
 }
 
 public struct _TextEditorProxy {
diff --git a/Sources/TokamakCore/Views/Text/TextField.swift b/Sources/TokamakCore/Views/Text/TextField.swift
index 7399d9b5e..fdd060fef 100644
--- a/Sources/TokamakCore/Views/Text/TextField.swift
+++ b/Sources/TokamakCore/Views/Text/TextField.swift
@@ -34,17 +34,12 @@
 ///         print("Set username")
 ///       })
 ///     }
-public struct TextField<Label>: View where Label: View {
+public struct TextField<Label>: PrimitiveView where Label: View {
   let label: Label
   let textBinding: Binding<String>
   let onEditingChanged: (Bool) -> ()
   let onCommit: () -> ()
   @Environment(\.textFieldStyle) var style
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("TextField")
-  }
 }
 
 public extension TextField where Label == Text {
diff --git a/Sources/TokamakCore/Views/View.swift b/Sources/TokamakCore/Views/View.swift
index b3e598caa..d49b2c45b 100644
--- a/Sources/TokamakCore/Views/View.swift
+++ b/Sources/TokamakCore/Views/View.swift
@@ -22,12 +22,23 @@ public protocol View {
 }
 
 public extension Never {
+  @_spi(TokamakCore)
   var body: Never {
     neverBody("Never")
   }
 }
 
-extension Never: View {}
+extension Never: PrimitiveView {}
+
+/// A `View` that offers primitive functionality, which renders its `body` inaccessible.
+public protocol PrimitiveView: View where Body == Never {}
+
+public extension PrimitiveView {
+  @_spi(BubbleCore)
+  var body: Never {
+    neverBody(String(describing: Self.self))
+  }
+}
 
 /// A `View` type that renders with subviews, usually specified in the `Content` type argument
 public protocol ParentView {
diff --git a/Sources/TokamakCore/Views/ViewBuilder.swift b/Sources/TokamakCore/Views/ViewBuilder.swift
index 1d1bf70ed..16943c071 100644
--- a/Sources/TokamakCore/Views/ViewBuilder.swift
+++ b/Sources/TokamakCore/Views/ViewBuilder.swift
@@ -16,18 +16,13 @@
 //
 
 /// A `View` with no effect on rendering.
-public struct EmptyView: View {
+public struct EmptyView: PrimitiveView {
   @inlinable
   public init() {}
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("EmptyView")
-  }
 }
 
 // swiftlint:disable:next type_name
-public struct _ConditionalContent<TrueContent, FalseContent>: View
+public struct _ConditionalContent<TrueContent, FalseContent>: PrimitiveView
   where TrueContent: View, FalseContent: View
 {
   enum Storage {
@@ -36,11 +31,6 @@ public struct _ConditionalContent<TrueContent, FalseContent>: View
   }
 
   let storage: Storage
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("_ConditionContent")
-  }
 }
 
 extension _ConditionalContent: GroupView {
diff --git a/Sources/TokamakDOM/Views/DynamicHTML.swift b/Sources/TokamakDOM/Views/DynamicHTML.swift
index 121845db5..466d848a1 100644
--- a/Sources/TokamakDOM/Views/DynamicHTML.swift
+++ b/Sources/TokamakDOM/Views/DynamicHTML.swift
@@ -27,18 +27,13 @@ protocol AnyDynamicHTML: AnyHTML {
   var listeners: [String: Listener] { get }
 }
 
-public struct DynamicHTML<Content>: View, AnyDynamicHTML {
+public struct DynamicHTML<Content>: PrimitiveView, AnyDynamicHTML {
   public let tag: String
   public let attributes: [HTMLAttribute: String]
   public let listeners: [String: Listener]
   let content: Content
 
   public var innerHTML: String?
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("HTML")
-  }
 }
 
 public extension DynamicHTML where Content: StringProtocol {
diff --git a/Sources/TokamakGTK/Scenes/SceneContainerView.swift b/Sources/TokamakGTK/Scenes/SceneContainerView.swift
index 03fe7eca4..7fdc73418 100644
--- a/Sources/TokamakGTK/Scenes/SceneContainerView.swift
+++ b/Sources/TokamakGTK/Scenes/SceneContainerView.swift
@@ -18,13 +18,9 @@
 import CGTK
 import TokamakCore
 
-struct SceneContainerView<Content: View>: View, AnyWidget {
+struct SceneContainerView<Content: View>: PrimitiveView, AnyWidget {
   let content: Content
 
-  var body: Never {
-    neverBody("SceneContainerView")
-  }
-
   func new(_ application: UnsafeMutablePointer<GtkApplication>) -> UnsafeMutablePointer<GtkWidget> {
     print("Making window")
     let window: UnsafeMutablePointer<GtkWidget>
diff --git a/Sources/TokamakGTK/Views/Stack.swift b/Sources/TokamakGTK/Views/Stack.swift
index a18f65bce..cf547bb7f 100644
--- a/Sources/TokamakGTK/Views/Stack.swift
+++ b/Sources/TokamakGTK/Views/Stack.swift
@@ -23,7 +23,7 @@ protocol StackProtocol {
   var alignment: Alignment { get }
 }
 
-struct Box<Content: View>: View, ParentView, AnyWidget, StackProtocol {
+struct Box<Content: View>: PrimitiveView, ParentView, AnyWidget, StackProtocol {
   let content: Content
   let orientation: GtkOrientation
   let spacing: TokamakCore.CGFloat
@@ -43,10 +43,6 @@ struct Box<Content: View>: View, ParentView, AnyWidget, StackProtocol {
 
   func update(widget: Widget) {}
 
-  var body: Never {
-    neverBody("Box")
-  }
-
   public var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakGTK/Widget.swift b/Sources/TokamakGTK/Widget.swift
index c8cb5a894..04121883e 100644
--- a/Sources/TokamakGTK/Widget.swift
+++ b/Sources/TokamakGTK/Widget.swift
@@ -25,7 +25,7 @@ extension AnyWidget {
   var expand: Bool { false }
 }
 
-struct WidgetView<Content: View>: View, AnyWidget, ParentView {
+struct WidgetView<Content: View>: PrimitiveView, AnyWidget, ParentView {
   let build: (UnsafeMutablePointer<GtkApplication>) -> UnsafeMutablePointer<GtkWidget>
   let update: (Widget) -> ()
   let content: Content
@@ -52,10 +52,6 @@ struct WidgetView<Content: View>: View, AnyWidget, ParentView {
     }
   }
 
-  var body: Never {
-    neverBody("WidgetView")
-  }
-
   var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakStaticHTML/Views/HTML.swift b/Sources/TokamakStaticHTML/Views/HTML.swift
index c4343ab27..bc08cb52c 100644
--- a/Sources/TokamakStaticHTML/Views/HTML.swift
+++ b/Sources/TokamakStaticHTML/Views/HTML.swift
@@ -63,17 +63,12 @@ public extension AnyHTML {
   }
 }
 
-public struct HTML<Content>: View, AnyHTML {
+public struct HTML<Content>: PrimitiveView, AnyHTML {
   public let tag: String
   public let attributes: [HTMLAttribute: String]
   let content: Content
 
   public let innerHTML: String?
-
-  @_spi(TokamakCore)
-  public var body: Never {
-    neverBody("HTML")
-  }
 }
 
 public extension HTML where Content: StringProtocol {

From b408a4e1587e7bb8dd555b1f5caa8c9caa93e40f Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Sat, 6 Mar 2021 22:10:37 +0200
Subject: [PATCH 09/11] Remove 'PrimitiveView' conformances outside of
 TokamakCore.

---
 Sources/TokamakCore/Views/View.swift               | 2 +-
 Sources/TokamakDOM/Views/DynamicHTML.swift         | 7 ++++++-
 Sources/TokamakGTK/Scenes/SceneContainerView.swift | 6 +++++-
 Sources/TokamakGTK/Views/Stack.swift               | 6 +++++-
 Sources/TokamakGTK/Widget.swift                    | 6 +++++-
 Sources/TokamakStaticHTML/Views/HTML.swift         | 7 ++++++-
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Sources/TokamakCore/Views/View.swift b/Sources/TokamakCore/Views/View.swift
index d49b2c45b..f0715b1f3 100644
--- a/Sources/TokamakCore/Views/View.swift
+++ b/Sources/TokamakCore/Views/View.swift
@@ -36,7 +36,7 @@ public protocol PrimitiveView: View where Body == Never {}
 public extension PrimitiveView {
   @_spi(BubbleCore)
   var body: Never {
-    neverBody(String(describing: Self.self))
+    fatalError()
   }
 }
 
diff --git a/Sources/TokamakDOM/Views/DynamicHTML.swift b/Sources/TokamakDOM/Views/DynamicHTML.swift
index 466d848a1..121845db5 100644
--- a/Sources/TokamakDOM/Views/DynamicHTML.swift
+++ b/Sources/TokamakDOM/Views/DynamicHTML.swift
@@ -27,13 +27,18 @@ protocol AnyDynamicHTML: AnyHTML {
   var listeners: [String: Listener] { get }
 }
 
-public struct DynamicHTML<Content>: PrimitiveView, AnyDynamicHTML {
+public struct DynamicHTML<Content>: View, AnyDynamicHTML {
   public let tag: String
   public let attributes: [HTMLAttribute: String]
   public let listeners: [String: Listener]
   let content: Content
 
   public var innerHTML: String?
+
+  @_spi(TokamakCore)
+  public var body: Never {
+    neverBody("HTML")
+  }
 }
 
 public extension DynamicHTML where Content: StringProtocol {
diff --git a/Sources/TokamakGTK/Scenes/SceneContainerView.swift b/Sources/TokamakGTK/Scenes/SceneContainerView.swift
index 7fdc73418..03fe7eca4 100644
--- a/Sources/TokamakGTK/Scenes/SceneContainerView.swift
+++ b/Sources/TokamakGTK/Scenes/SceneContainerView.swift
@@ -18,9 +18,13 @@
 import CGTK
 import TokamakCore
 
-struct SceneContainerView<Content: View>: PrimitiveView, AnyWidget {
+struct SceneContainerView<Content: View>: View, AnyWidget {
   let content: Content
 
+  var body: Never {
+    neverBody("SceneContainerView")
+  }
+
   func new(_ application: UnsafeMutablePointer<GtkApplication>) -> UnsafeMutablePointer<GtkWidget> {
     print("Making window")
     let window: UnsafeMutablePointer<GtkWidget>
diff --git a/Sources/TokamakGTK/Views/Stack.swift b/Sources/TokamakGTK/Views/Stack.swift
index cf547bb7f..a18f65bce 100644
--- a/Sources/TokamakGTK/Views/Stack.swift
+++ b/Sources/TokamakGTK/Views/Stack.swift
@@ -23,7 +23,7 @@ protocol StackProtocol {
   var alignment: Alignment { get }
 }
 
-struct Box<Content: View>: PrimitiveView, ParentView, AnyWidget, StackProtocol {
+struct Box<Content: View>: View, ParentView, AnyWidget, StackProtocol {
   let content: Content
   let orientation: GtkOrientation
   let spacing: TokamakCore.CGFloat
@@ -43,6 +43,10 @@ struct Box<Content: View>: PrimitiveView, ParentView, AnyWidget, StackProtocol {
 
   func update(widget: Widget) {}
 
+  var body: Never {
+    neverBody("Box")
+  }
+
   public var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakGTK/Widget.swift b/Sources/TokamakGTK/Widget.swift
index 04121883e..c8cb5a894 100644
--- a/Sources/TokamakGTK/Widget.swift
+++ b/Sources/TokamakGTK/Widget.swift
@@ -25,7 +25,7 @@ extension AnyWidget {
   var expand: Bool { false }
 }
 
-struct WidgetView<Content: View>: PrimitiveView, AnyWidget, ParentView {
+struct WidgetView<Content: View>: View, AnyWidget, ParentView {
   let build: (UnsafeMutablePointer<GtkApplication>) -> UnsafeMutablePointer<GtkWidget>
   let update: (Widget) -> ()
   let content: Content
@@ -52,6 +52,10 @@ struct WidgetView<Content: View>: PrimitiveView, AnyWidget, ParentView {
     }
   }
 
+  var body: Never {
+    neverBody("WidgetView")
+  }
+
   var children: [AnyView] {
     [AnyView(content)]
   }
diff --git a/Sources/TokamakStaticHTML/Views/HTML.swift b/Sources/TokamakStaticHTML/Views/HTML.swift
index bc08cb52c..c4343ab27 100644
--- a/Sources/TokamakStaticHTML/Views/HTML.swift
+++ b/Sources/TokamakStaticHTML/Views/HTML.swift
@@ -63,12 +63,17 @@ public extension AnyHTML {
   }
 }
 
-public struct HTML<Content>: PrimitiveView, AnyHTML {
+public struct HTML<Content>: View, AnyHTML {
   public let tag: String
   public let attributes: [HTMLAttribute: String]
   let content: Content
 
   public let innerHTML: String?
+
+  @_spi(TokamakCore)
+  public var body: Never {
+    neverBody("HTML")
+  }
 }
 
 public extension HTML where Content: StringProtocol {

From 13117ec4fee55f0a325cd41f8b713f83f7bb6794 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Sat, 6 Mar 2021 22:15:45 +0200
Subject: [PATCH 10/11] Fix `PrimitiveView` default implementation.

---
 Sources/TokamakCore/Views/View.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/TokamakCore/Views/View.swift b/Sources/TokamakCore/Views/View.swift
index f0715b1f3..9676f9351 100644
--- a/Sources/TokamakCore/Views/View.swift
+++ b/Sources/TokamakCore/Views/View.swift
@@ -24,7 +24,7 @@ public protocol View {
 public extension Never {
   @_spi(TokamakCore)
   var body: Never {
-    neverBody("Never")
+    fatalError()
   }
 }
 
@@ -36,7 +36,7 @@ public protocol PrimitiveView: View where Body == Never {}
 public extension PrimitiveView {
   @_spi(BubbleCore)
   var body: Never {
-    fatalError()
+    neverBody(String(describing: Self.self))
   }
 }
 

From 71b27b8d37dc9ff0972382b48ae8569a69334d44 Mon Sep 17 00:00:00 2001
From: Filippos Sakellariou <filip.sakel@icloud.com>
Date: Sun, 7 Mar 2021 00:50:51 +0200
Subject: [PATCH 11/11] Remove "BubbleCore" references.

---
 Sources/TokamakCore/Tokens/Color.swift           | 2 +-
 Sources/TokamakCore/Views/Selectors/Toggle.swift | 2 +-
 Sources/TokamakCore/Views/View.swift             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/TokamakCore/Tokens/Color.swift b/Sources/TokamakCore/Tokens/Color.swift
index bac305374..f36dd689c 100644
--- a/Sources/TokamakCore/Tokens/Color.swift
+++ b/Sources/TokamakCore/Tokens/Color.swift
@@ -345,7 +345,7 @@ public extension Color {
 
 extension Color: ShapeStyle {}
 extension Color: View {
-  @_spi(BubbleCore)
+  @_spi(TokamakCore)
   public var body: some View {
     _ShapeView(shape: Rectangle(), style: self)
   }
diff --git a/Sources/TokamakCore/Views/Selectors/Toggle.swift b/Sources/TokamakCore/Views/Selectors/Toggle.swift
index b44d80eab..92685cc1e 100644
--- a/Sources/TokamakCore/Views/Selectors/Toggle.swift
+++ b/Sources/TokamakCore/Views/Selectors/Toggle.swift
@@ -25,7 +25,7 @@ public struct Toggle<Label>: View where Label: View {
     self.label = label()
   }
 
-  @_spi(BubbleCore)
+  @_spi(TokamakCore)
   public var body: AnyView {
     toggleStyle.makeBody(
       configuration: ToggleStyleConfiguration(label: AnyView(label), isOn: $isOn)
diff --git a/Sources/TokamakCore/Views/View.swift b/Sources/TokamakCore/Views/View.swift
index 9676f9351..32b144b18 100644
--- a/Sources/TokamakCore/Views/View.swift
+++ b/Sources/TokamakCore/Views/View.swift
@@ -34,7 +34,7 @@ extension Never: PrimitiveView {}
 public protocol PrimitiveView: View where Body == Never {}
 
 public extension PrimitiveView {
-  @_spi(BubbleCore)
+  @_spi(TokamakCore)
   var body: Never {
     neverBody(String(describing: Self.self))
   }