Merge remote-tracking branch 'origin/main' into antoine/swift6_prep

Package.swift

@@ -55,5 +55,5 @@ let package = Package(
       ]
     ),
   ],
-  swiftLanguageVersions: [.v5]
+  swiftLanguageModes: [.v6, .v5]
 )

Sources/StorybookKit/Internals/TargetViewControllerKey.swift

@@ -1,22 +1,5 @@
 import SwiftUI
 
-public enum _ViewControllerKey: EnvironmentKey {
-  public static var defaultValue: UIViewController?
-}
-
-enum TestKey: EnvironmentKey {
-  static var defaultValue: String { "default" }
-}
-
-
 extension EnvironmentValues {
-  var _targetViewController: UIViewController? {
-    get { self[_ViewControllerKey.self] }
-    set { self[_ViewControllerKey.self] = newValue }
-  }
-
-  var test: String {
-    get { self[TestKey.self] }
-    set { self[TestKey.self] = newValue }
-  }
+  @Entry var _targetViewController: UIViewController?
 }

Sources/StorybookKit/Primitives/BookPage.swift

@@ -23,7 +23,7 @@ import Foundation
 import SwiftUI
 import ResultBuilderKit
 
-public struct DeclarationIdentifier: Hashable, Codable {
+public struct DeclarationIdentifier: Hashable, Codable, Sendable {
 
   public let index: Int
 
@@ -37,7 +37,7 @@ public struct DeclarationIdentifier: Hashable, Codable {
 }
 
 private let _lock = NSLock()
-private var _counter: Int = 0
+private nonisolated(unsafe) var _counter: Int = 0
 private func issueUniqueNumber() -> Int {
   _lock.lock()
   defer {
@@ -52,13 +52,13 @@ public struct BookPage: BookView, Identifiable {
 
   @Environment(\.bookContext) var context
 
-  public var id: DeclarationIdentifier {
+  public nonisolated var id: DeclarationIdentifier {
     declarationIdentifier
   }
 
   public let title: String
   public let destination: AnyView
-  public let declarationIdentifier: DeclarationIdentifier
+  public nonisolated let declarationIdentifier: DeclarationIdentifier
   private let file: StaticString
   private let line: UInt
 

Sources/StorybookKit/Primitives/BookPresent.swift

@@ -25,7 +25,6 @@ import SwiftUI
 public struct BookPresent: BookView {
 
   @Environment(\._targetViewController) private var targetViewController
-  @Environment(\.test) var test
 
   public let declarationIdentifier: DeclarationIdentifier
   public let presentedViewControllerBlock: @MainActor () -> UIViewController
@@ -44,8 +43,6 @@ public struct BookPresent: BookView {
   public var body: some View {
     Button(title) {
       let viewController = presentedViewControllerBlock()
-      print(test)
-      print(targetViewController)
       targetViewController?.present(viewController, animated: true)
     }
   }

Sources/StorybookKit/Primitives/BookProvider.swift

@@ -28,19 +28,8 @@ public protocol BookProvider {
   static var bookBody: BookPage { get }
 }
 
-private enum BookContextKey: EnvironmentKey {
-  static var defaultValue: BookStore?
-}
-
 extension EnvironmentValues {
-
-  public var bookContext: BookStore? {
-    get {
-      self[BookContextKey.self]
-    }
-    set {
-      self[BookContextKey.self] = newValue
-    }
-  }
+
+  @Entry public var bookContext: BookStore?
 
 }