Split global stylesheet memory phases

Author: chubes4

packages/runtime-cloudflare/src/request-routing.ts

@@ -8,7 +8,7 @@ export type WorkerRequestRoute =
   | { kind: "editor-memory-probe"; phase: EditorMemoryProbePhase }
   | { kind: "probe"; phase: string }
 
-export type EditorMemoryProbePhase = "admin" | "before-insert" | "after-insert" | "after-get-post" | "before-hooks" | "after-hooks" | "before-preload-paths" | "before-rest-preload" | "before-rest-preload-skip-global-styles" | "after-rest-preload" | "after-block-definitions" | "before-editor-settings" | "settings-before-styles" | "settings-before-global" | "settings-before-assets" | "settings-after-assets" | "after-editor-settings" | "block-editor"
+export type EditorMemoryProbePhase = "admin" | "before-insert" | "after-insert" | "after-get-post" | "before-hooks" | "after-hooks" | "before-preload-paths" | "before-rest-preload" | "before-rest-preload-skip-global-styles" | "after-rest-preload" | "after-block-definitions" | "before-editor-settings" | "settings-before-styles" | "settings-after-presets" | "settings-after-block-classes" | "settings-before-global" | "settings-before-assets" | "settings-after-assets" | "after-editor-settings" | "block-editor"
 
 export function routeWorkerRequest(request: Request): WorkerRequestRoute {
   const phase = new URL(request.url).searchParams.get("phase")
@@ -20,7 +20,7 @@ export function routeWorkerRequest(request: Request): WorkerRequestRoute {
   if (phase === "operator-reset") return { kind: "operator-reset" }
   if (phase?.startsWith("editor-memory-")) {
     const editorPhase = phase.slice("editor-memory-".length)
-    if (["admin", "before-insert", "after-insert", "after-get-post", "before-hooks", "after-hooks", "before-preload-paths", "before-rest-preload", "before-rest-preload-skip-global-styles", "after-rest-preload", "after-block-definitions", "before-editor-settings", "settings-before-styles", "settings-before-global", "settings-before-assets", "settings-after-assets", "after-editor-settings", "block-editor"].includes(editorPhase)) {
+    if (["admin", "before-insert", "after-insert", "after-get-post", "before-hooks", "after-hooks", "before-preload-paths", "before-rest-preload", "before-rest-preload-skip-global-styles", "after-rest-preload", "after-block-definitions", "before-editor-settings", "settings-before-styles", "settings-after-presets", "settings-after-block-classes", "settings-before-global", "settings-before-assets", "settings-after-assets", "after-editor-settings", "block-editor"].includes(editorPhase)) {
       return { kind: "editor-memory-probe", phase: editorPhase as EditorMemoryProbePhase }
     }
   }

packages/runtime-cloudflare/src/worker.ts

@@ -142,6 +142,8 @@ function patchEditorMemoryStop(php: PHP, phase: EditorMemoryProbePhase): void {
     "after-block-definitions": { path: "/wordpress/wp-admin/edit-form-blocks.php", marker: "// Preload server-registered block bindings sources.", before: true },
     "before-editor-settings": { path: "/wordpress/wp-admin/edit-form-blocks.php", marker: "$editor_settings = get_block_editor_settings( $editor_settings, $block_editor_context );", before: true },
     "settings-before-styles": { path: "/wordpress/wp-includes/block-editor.php", marker: "$global_styles = array();", before: true },
+    "settings-after-presets": { path: "/wordpress/wp-includes/block-editor.php", marker: "$block_classes = array(", before: true },
+    "settings-after-block-classes": { path: "/wordpress/wp-includes/block-editor.php", marker: "// Get any additional css from the customizer", before: true },
     "settings-before-global": { path: "/wordpress/wp-includes/block-editor.php", marker: "$editor_settings['__experimentalFeatures'] = wp_get_global_settings();", before: true },
     "settings-before-assets": { path: "/wordpress/wp-includes/block-editor.php", marker: "$editor_settings['__unstableResolvedAssets']", before: true },
     "settings-after-assets": { path: "/wordpress/wp-includes/block-editor.php", marker: "$editor_settings['__unstableIsBlockBasedTheme']", before: true },

tests/cloudflare-runtime.test.ts

@@ -118,7 +118,7 @@ test("Cloudflare lease contention honors Retry-After without exceeding the acqui
 test("Cloudflare editor memory probes stop at bounded lifecycle markers and discard their runtime", async () => {
   const worker = await readFile(new URL("../packages/runtime-cloudflare/src/worker.ts", import.meta.url), "utf8")
   const probe = worker.slice(worker.indexOf("async function runEditorMemoryProbe"), worker.indexOf("async function resetCanonicalWordPress"))
-  for (const phase of ["admin", "before-insert", "after-insert", "after-get-post", "before-hooks", "after-hooks", "before-preload-paths", "before-rest-preload", "before-rest-preload-skip-global-styles", "after-rest-preload", "after-block-definitions", "before-editor-settings", "settings-before-styles", "settings-before-global", "settings-before-assets", "settings-after-assets", "after-editor-settings", "block-editor"]) assert.match(probe, new RegExp(`"?${phase}"?`))
+  for (const phase of ["admin", "before-insert", "after-insert", "after-get-post", "before-hooks", "after-hooks", "before-preload-paths", "before-rest-preload", "before-rest-preload-skip-global-styles", "after-rest-preload", "after-block-definitions", "before-editor-settings", "settings-before-styles", "settings-after-presets", "settings-after-block-classes", "settings-before-global", "settings-before-assets", "settings-after-assets", "after-editor-settings", "block-editor"]) assert.match(probe, new RegExp(`"?${phase}"?`))
   assert.match(probe, /source\.replaceAll\(lookup, "0"\)/)
   assert.equal((probe.match(/await discardCachedRuntime\(\)/g) ?? []).length, 2)
   assert.match(probe, /memory_get_peak_usage/)