⬆️ Update Ignite and apply migration to fix layout issues (#71)

AkkeyLab · web-flow · commit 3083d58dddf8 · 2025-03-23T21:45:09.000+09:00
diff --git a/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Natasha.imageset/Natasha.jpg b/MyLibrary/Sources/trySwiftFeature/Media.xcassets/Natasha.imageset/Natasha.jpg
diff --git a/Website/Package.swift b/Website/Package.swift
@@ -8,7 +8,7 @@ let package = Package(
   defaultLocalization: "en",
   platforms: [.macOS(.v14)],
   dependencies: [
-    .package(url: "https://github.com/twostraws/Ignite", revision: "3080060aca91fe431b31d4a9b2bba2a99d81b25a"),
+    .package(url: "https://github.com/twostraws/Ignite", revision: "df775025a896a7adb26c46563201cc0c6d36d91d"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.2.0"),
     .package(path: "../MyLibrary")
   ],
diff --git a/Website/Sources/Components/AccessComponent.swift b/Website/Sources/Components/AccessComponent.swift
@@ -1,6 +1,6 @@
 import Ignite
 
-struct AccessComponent: RootHTML {
+struct AccessComponent: DocumentElement {
   let language: SupportedLanguage
   private let venueMapUrl = "https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d12959.484415464616!2d139.4122493!3d35.7047894!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x6018e16a387013a3%3A0xcd9c50e33a16ff6b!2sTachikawa%20Stage%20Garden!5e0!3m2!1sen!2sjp!4v1720059016768!5m2!1sen!2sjp"
   private let accommodationMapUrl = "https://www.google.com/maps/d/u/0/embed?mid=1mBsqxzE2L_guJrg7nE96dJBlJUrZVoA&ehbc=2E312F&noprof=1"
diff --git a/Website/Sources/Components/Border.swift b/Website/Sources/Components/Border.swift
diff --git a/Website/Sources/Components/HeaderComponent.swift b/Website/Sources/Components/HeaderComponent.swift
@@ -1,6 +1,6 @@
 import Ignite
 
-struct HeaderComponent: RootHTML {
+struct HeaderComponent: DocumentElement {
   let language: SupportedLanguage
 
   var body: some HTML {
@@ -11,28 +11,28 @@ struct HeaderComponent: RootHTML {
         .frame(width: .percent(100%), height: .percent(100%))
         .ignorePageGutters(false)
       Section {
-        Section {
-          Image("/images/title.png", description: "title image")
-            .resizable()
-            .aspectRatio(260 / 100, contentMode: .fit)
-            .frame(width: .percent(50%))
-            .margin(.top, .px(100))
-        }
-        .frame(width: .percent(100%))
-        .ignorePageGutters(false)
+        Image("/images/title.png", description: "title image")
+          .resizable()
+          .aspectRatio(260 / 100, contentMode: .fit)
+          .frame(width: .percent(50%))
+          .margin(.top, .px(100))
+          .margin(.horizontal, .percent(25%))
+          .ignorePageGutters(false)
+
         ZStack(alignment: .bottom) {
           Section {
             Spacer()
             Image("/images/intersect.svg", description: "decoration image of header")
               .resizable()
+              .margin(.bottom, .px(-1))
           }
           Text(String("About", language: language))
             .font(.title1)
             .fontWeight(.bold)
             .foregroundStyle(.bootstrapPurple)
             .margin(.bottom, .percent(2%))
         }
-        .horizontalAlignment(.center)
+        .frame(alignment: .init(horizontal: .center))
         .ignorePageGutters(false)
       }
     }.background(.darkBlue)
diff --git a/Website/Sources/Components/LanguageSelector.swift b/Website/Sources/Components/LanguageSelector.swift
@@ -1,6 +1,6 @@
 import Ignite
 
-struct LanguageSelector: HTML, InlineHTML {
+struct LanguageSelector: HTML, InlineElement {
   let path: (SupportedLanguage) -> String
   let currentLanguage: SupportedLanguage
 
diff --git a/Website/Sources/Components/MainFooter.swift b/Website/Sources/Components/MainFooter.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Ignite
 
-struct MainFooter: RootHTML {
+struct MainFooter: DocumentElement {
   let language: SupportedLanguage
 
   var body: some HTML {
diff --git a/Website/Sources/Components/OrganizerComponent.swift b/Website/Sources/Components/OrganizerComponent.swift
@@ -45,7 +45,7 @@ struct OrganizerModel: HTML {
             .fontWeight(.regular)
             .foregroundStyle(.dimGray)
           if let links = organizer.links {
-            Row {
+            Section {
               ForEach(links) { link in
                 Link(link.name, target: link.url)
                   .target(.newWindow)
diff --git a/Website/Sources/Components/SectionHeader.swift b/Website/Sources/Components/SectionHeader.swift
@@ -6,15 +6,16 @@ struct SectionHeader: HTML {
 
   var body: some HTML {
     ZStack(alignment: .center) {
-      Border(hex: "#6f42c1")
       Text(String(type.rawValue, language: language))
         .horizontalAlignment(.center)
         .font(.title1)
         .fontWeight(.bold)
         .foregroundStyle(.bootstrapPurple)
     }
     .padding(.top, .px(80))
-    .padding(.bottom, .px(16))
+    .padding(.bottom, .px(32))
+    .margin(.bottom, .px(32))
+    .border(.bootstrapPurple, width: 2, edges: .bottom)
     .id(type.htmlId)
   }
 }
diff --git a/Website/Sources/Components/SpeakerDetailComponent.swift b/Website/Sources/Components/SpeakerDetailComponent.swift
@@ -27,7 +27,7 @@ struct SpeakerDetailComponent: HTML {
             .foregroundStyle(.dimGray)
         }
         if let links = speaker.links {
-          Row {
+          Section {
             ForEach(links) { link in
               Link(link.name, target: link.url)
                 .target(.newWindow)
diff --git a/Website/Sources/Components/SponsorComponent.swift b/Website/Sources/Components/SponsorComponent.swift
@@ -8,7 +8,7 @@ struct SponsorComponent: HTML {
   let language: SupportedLanguage
 
   var body: some HTML {
-    var image: any InlineHTML {
+    var image: any InlineElement {
       Image(sponsor.imageFilename, description: sponsor.name ?? "sponsor logo")
         .resizable()
         .frame(maxWidth: Int(size.width), maxHeight: Int(size.height))
diff --git a/Website/Sources/Components/TicketsComponent.swift b/Website/Sources/Components/TicketsComponent.swift
@@ -16,7 +16,8 @@ struct TicketsComponent: HTML {
         title: String("Tickets", language: language),
         url: "https://lu.ma/embed/event/evt-iaERdyhafeQdV5f/simple"
       )
-      .aspectRatio(.square)
+      .aspectRatio(0.75)
+      .frame(height: .px(1_800))
       .margin(.bottom, .px(120))
       Text(String("The latest information is announced on X", language: language))
         .font(.title3)
diff --git a/Website/Sources/Components/TimetableComponent.swift b/Website/Sources/Components/TimetableComponent.swift
@@ -2,7 +2,7 @@ import Foundation
 import Ignite
 import SharedModels
 
-struct TimetableComponent: RootHTML {
+struct TimetableComponent: DocumentElement {
   let conference: Conference
   let language: SupportedLanguage
   private let imageSize = 50
diff --git a/Website/Sources/ConferenceWebsite.swift b/Website/Sources/ConferenceWebsite.swift
@@ -5,7 +5,7 @@ import Ignite
 @main
 struct ConferenceWebsite {
   static func main() async {
-    let site = ConferenceSite2025()
+    var site = ConferenceSite2025()
 
     do {
       try copyAssets()
@@ -77,7 +77,7 @@ struct ConferenceSite2025: Site {
   var darkTheme: (any Theme)? = nil
   var favicon = URL(string: "/images/favicon.png")
 
-  var staticLayouts: [any StaticLayout] {
+  var staticPages: [any StaticPage] {
     for language in SupportedLanguage.allCases {
       Home(language: language)
       FAQ(language: language)
@@ -88,7 +88,7 @@ struct ConferenceSite2025: Site {
   }
 }
 
-private struct LegacyHome: StaticLayout {
+private struct LegacyHome: StaticPage {
   let title = ""
   var path = "/_en"
 
diff --git a/Website/Sources/Layouts/MainLayout.swift b/Website/Sources/Layouts/MainLayout.swift
@@ -1,25 +1,25 @@
 import Ignite
 
 struct MainLayout: Layout {
-  @Environment(\.siteConfiguration) private var siteConfiguration
+  @Environment(\.page) private var currentPage
   let title: String
   let ogpLink: String
 
   var body: some HTML {
-    HTMLDocument {
-      HTMLHead(for: page, with: siteConfiguration) {
-        MetaTag(property: "og:image", content: ogpLink)
-        MetaTag(name: "twitter:title", content: title)
-        MetaTag(name: "twitter:image", content: ogpLink)
+    Head {
+      MetaTag(.openGraphTitle, content: title)
+      MetaTag(.openGraphImage, content: ogpLink)
+      MetaTag(.twitterTitle, content: title)
+      MetaTag(.twitterImage, content: ogpLink)
 
-        if page.url.pathComponents.last == "_en" {
-          RedirectMetaTag(to: URL(string: page.url.absoluteString.replacingOccurrences(of: "_", with: ""))!)
-        }
+      if currentPage.url.pathComponents.last == "_en" {
+        let redirectUrl = URL(string: currentPage.url.absoluteString.replacingOccurrences(of: "_", with: ""))!
+        RedirectMetaTag(to: redirectUrl)
       }
+    }
 
-      HTMLBody {
-        Section(page.body)
-      }.class("container")
+    Body {
+      content
     }
   }
 }
diff --git a/Website/Sources/Layouts/RedirectMetaTag.swift b/Website/Sources/Layouts/RedirectMetaTag.swift
@@ -4,7 +4,7 @@ struct RedirectMetaTag: HeadElement, Sendable {
   let to: URL
   var body: some HTML { self }
 
-  func render(context: PublishingContext) -> String {
+  func render() -> String {
     """
     <meta http-equiv="refresh" content="0;url=\(to.absoluteString)">
     """
diff --git a/Website/Sources/Pages/CodeOfConduct.swift b/Website/Sources/Pages/CodeOfConduct.swift
@@ -22,7 +22,7 @@ extension CodeOfConductSectionType {
   }
 }
 
-struct CodeOfConduct: StaticLayout {
+struct CodeOfConduct: StaticPage {
   let language: SupportedLanguage
   let title: String
 
diff --git a/Website/Sources/Pages/FAQ.swift b/Website/Sources/Pages/FAQ.swift
@@ -26,7 +26,7 @@ extension FAQSectionType {
   }
 }
 
-struct FAQ: StaticLayout {
+struct FAQ: StaticPage {
   let language: SupportedLanguage
   let title: String
 
diff --git a/Website/Sources/Pages/Home.swift b/Website/Sources/Pages/Home.swift
@@ -4,7 +4,7 @@ import Foundation
 import Ignite
 import SharedModels
 
-struct Home: StaticLayout {
+struct Home: StaticPage {
   let language: SupportedLanguage
   var title = ""
 
diff --git a/Website/Sources/Pages/HomeSections.swift b/Website/Sources/Pages/HomeSections.swift
@@ -66,7 +66,7 @@ extension HomeSectionType {
       }
 
       Alert {
-        speakers.map { speaker in
+        ForEach(speakers) { speaker in
           SpeakerModal(speaker: speaker, language: language)
         }
       }
@@ -123,7 +123,7 @@ extension HomeSectionType {
       }
 
       Alert {
-        organizers.map { organizer in
+        ForEach(organizers) { organizer in
           OrganizerModel(organizer: organizer, language: language)
         }
       }
diff --git a/Website/Sources/Pages/PrivacyPolicy.swift b/Website/Sources/Pages/PrivacyPolicy.swift
@@ -26,7 +26,7 @@ extension PrivacyPolicySectionType {
   }
 }
 
-struct PrivacyPolicy: StaticLayout {
+struct PrivacyPolicy: StaticPage {
   let language: SupportedLanguage
   let title: String
 
diff --git a/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,7 +15,7 @@
       "location" : "https://github.com/twostraws/Ignite",
       "state" : {
         "branch" : "main",
-        "revision" : "3080060aca91fe431b31d4a9b2bba2a99d81b25a"
+        "revision" : "df775025a896a7adb26c46563201cc0c6d36d91d"
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,16 @@ struct SectionHeader: HTML {`
`6`	`6`
`7`	`7`	`var body: some HTML {`
`8`	`8`	`ZStack(alignment: .center) {`
`9`		`- Border(hex: "#6f42c1")`
`10`	`9`	`Text(String(type.rawValue, language: language))`
`11`	`10`	`.horizontalAlignment(.center)`
`12`	`11`	`.font(.title1)`
`13`	`12`	`.fontWeight(.bold)`
`14`	`13`	`.foregroundStyle(.bootstrapPurple)`
`15`	`14`	`}`
`16`	`15`	`.padding(.top, .px(80))`
`17`		`- .padding(.bottom, .px(16))`
	`16`	`+ .padding(.bottom, .px(32))`
	`17`	`+ .margin(.bottom, .px(32))`
	`18`	`+ .border(.bootstrapPurple, width: 2, edges: .bottom)`
`18`	`19`	`.id(type.htmlId)`
`19`	`20`	`}`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ struct SpeakerDetailComponent: HTML {`
`27`	`27`	`.foregroundStyle(.dimGray)`
`28`	`28`	`}`
`29`	`29`	`if let links = speaker.links {`
`30`		`- Row {`
	`30`	`+ Section {`
`31`	`31`	`ForEach(links) { link in`
`32`	`32`	`Link(link.name, target: link.url)`
`33`	`33`	`.target(.newWindow)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extension CodeOfConductSectionType {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-struct CodeOfConduct: StaticLayout {`
	`25`	`+struct CodeOfConduct: StaticPage {`
`26`	`26`	`let language: SupportedLanguage`
`27`	`27`	`let title: String`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ extension FAQSectionType {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-struct FAQ: StaticLayout {`
	`29`	`+struct FAQ: StaticPage {`
`30`	`30`	`let language: SupportedLanguage`
`31`	`31`	`let title: String`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ extension HomeSectionType {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`Alert {`
`69`		`- speakers.map { speaker in`
	`69`	`+ ForEach(speakers) { speaker in`
`70`	`70`	`SpeakerModal(speaker: speaker, language: language)`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -123,7 +123,7 @@ extension HomeSectionType {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`Alert {`
`126`		`- organizers.map { organizer in`
	`126`	`+ ForEach(organizers) { organizer in`
`127`	`127`	`OrganizerModel(organizer: organizer, language: language)`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ extension PrivacyPolicySectionType {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-struct PrivacyPolicy: StaticLayout {`
	`29`	`+struct PrivacyPolicy: StaticPage {`
`30`	`30`	`let language: SupportedLanguage`
`31`	`31`	`let title: String`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"location" : "https://github.com/twostraws/Ignite",`
`16`	`16`	`"state" : {`
`17`	`17`	`"branch" : "main",`
`18`		`- "revision" : "3080060aca91fe431b31d4a9b2bba2a99d81b25a"`
	`18`	`+ "revision" : "df775025a896a7adb26c46563201cc0c6d36d91d"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`{`