Update GBK

Modules/Package.swift

@@ -54,7 +54,7 @@ let package = Package(
         .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.9.0"),
         .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
-        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.10.1"),
+        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "4fe41400aeb43350e7116954694c0a6072a8f26b"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
         .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251101"),
         .package(

WordPress/Classes/Utility/AccountHelper.swift

@@ -111,9 +111,6 @@ import WordPressData
         // This is best-effort for now – eventually all of this should be async
         Task {
             do {
-                // Delete all cached block editor settings
-                try await BlockEditorCache.shared.deleteAll()
-
                 // Delete everything in the disk cache
                 try await DiskCache().removeAll()
             } catch {

WordPress/Classes/Utility/Editor/EditorConfiguration+Blog.swift

@@ -54,6 +54,16 @@ extension EditorConfiguration {
         if let siteApiRoot {
             builder = builder.setSiteApiRoot(siteApiRoot)
 
+            if var editorSettingsEndpoint = URL(string: siteApiRoot) {
+                editorSettingsEndpoint.appendPathComponent("wp-block-editor/v1")
+                if let namespace = siteApiNamespace.first {
+                    editorSettingsEndpoint.appendPathComponent(namespace)
+                }
+
+                editorSettingsEndpoint.appendPathComponent("settings")
+                builder = builder.setEditorSettingsEndpoint(editorSettingsEndpoint)
+            }
+
             if var editorAssetsEndpoint = URL(string: siteApiRoot) {
                 editorAssetsEndpoint.appendPathComponent("wpcom/v2/")
                 if let namespace = siteApiNamespace.first {

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -357,8 +357,6 @@
 
         let configuration = EditorConfiguration(blog: blog)
         GutenbergKit.EditorViewController.warmup(configuration: configuration)
-
-        RawBlockEditorSettingsService(blog: blog).prefetchSettings()
     }
 
     // MARK: - Main Blog
@@ -673,7 +671,7 @@
     }
 
     private func makeBlogDetailsViewController(for blog: Blog) -> BlogDetailsViewController {
         let blogDetailsViewController = BlogDetailsViewController()
         blogDetailsViewController.blog = blog
 
         return blogDetailsViewController

WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift

@@ -89,7 +89,7 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle
         // Do nothing
     }
 
-    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) {
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) {
         // Do nothing
     }
 
@@ -108,4 +108,8 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle
     func editor(_ viewController: GutenbergKit.EditorViewController, didCloseModalDialog dialogType: String) {
         // Do nothing
     }
+
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogNetworkRequest request: GutenbergKit.RecordedNetworkRequest) {
+        // Do nothing
+    }
 }

WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift

@@ -53,7 +53,6 @@
     }
 
     struct EditorDependencies {
-        let settings: String?
         let didLoadCookies: Bool
     }
 
@@ -100,14 +99,6 @@
 
     let navigationBarManager: PostEditorNavigationBarManager
 
-    // MARK: - Private variables
-
-    // TODO: reimplemet
-//    internal private(set) var contentInfo: ContentInfo?
-    lazy var editorSettingsService: BlockEditorSettingsService? = {
-        BlockEditorSettingsService(blog: post.blog, coreDataStack: ContextManager.shared)
-    }()
-
     // MARK: - GutenbergKit
 
     private var editorViewController: GutenbergKit.EditorViewController
@@ -147,8 +138,6 @@
     func setHTML(_ html: String) {}
     func getHTML() -> String { post.content ?? "" }
 
-    private let blockEditorSettingsService: RawBlockEditorSettingsService
-
     // MARK: - Initializers
     required convenience init(
         post: AbstractPost,
@@ -190,8 +179,6 @@
             mediaPicker: MediaPickerController(blog: post.blog)
         )
 
-        self.blockEditorSettingsService = RawBlockEditorSettingsService(blog: post.blog)
-
         super.init(nibName: nil, bundle: nil)
 
         self.editorViewController.delegate = self
@@ -269,7 +256,7 @@
                     case .loadingDependencies: preconditionFailure("Dependencies should not still be loading")
                     case .loadingCancelled: preconditionFailure("Dependency loading should not be cancelled")
                     case .dependencyError(let error): self.showEditorError(error)
-                    case .dependenciesReady(let dependencies): try await self.startEditor(settings: dependencies.settings)
+                    case .dependenciesReady: try await self.startEditor()
                     case .started: preconditionFailure("The editor should not already be started")
                 }
             } catch {
@@ -385,23 +372,18 @@
         }
 
         self.editorState = .loadingDependencies(Task {
-            do {
-                let dependencies = try await fetchEditorDependencies()
-                self.editorState = .dependenciesReady(dependencies)
-            } catch {
-                self.editorState = .dependencyError(error)
-            }
+            let dependencies = await fetchEditorDependencies()
+            self.editorState = .dependenciesReady(dependencies)
         })
     }
 
     @MainActor
-    func startEditor(settings: String?) async throws {
+    func startEditor() async throws {
         guard case .dependenciesReady = self.editorState else {
             preconditionFailure("`startEditor` should only be called when the editor is in the `.dependenciesReady` state.")
         }
 
         let updatedConfiguration = self.editorViewController.configuration.toBuilder()
-            .apply(settings) { $0.setEditorSettings($1) }
             .setTitle(post.postTitle ?? "")
             .setContent(post.content ?? "")
             .setNativeInserterEnabled(FeatureFlag.nativeBlockInserter.enabled)
@@ -481,18 +463,11 @@
     }
 
     // MARK: - Editor Setup
-    private func fetchEditorDependencies() async throws -> EditorDependencies {
-        let settings: String?
-        do {
-            settings = try await blockEditorSettingsService.getSettingsString(allowingCachedResponse: true)
-        } catch {
-            DDLogError("Failed to fetch editor settings: \(error)")
-            settings = nil
-        }
 
+    // TODO: refactor
+    private func fetchEditorDependencies() async -> EditorDependencies {
         let loaded = await loadAuthenticationCookiesAsync()
-
-        return EditorDependencies(settings: settings, didLoadCookies: loaded)
+        return EditorDependencies(didLoadCookies: loaded)
     }
 
     private func loadAuthenticationCookiesAsync() async -> Bool {
@@ -573,7 +548,11 @@
         }
     }
 
-    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) {
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) {
+        // Do nothing
+    }
+
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogNetworkRequest request: GutenbergKit.RecordedNetworkRequest) {
         // Do nothing
     }