From 446f4dbf87c65a59b198f6bc32aefca505fbe265 Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 12:36:08 +0200
Subject: [PATCH 1/8] Podcast: simplify wp-build wiring and fix menu reorder
 slug

---
 pnpm-lock.yaml                                |   3 -
 .../arcangelini-podcast-make-it-better        |   5 +
 .../wpcom-admin-menu/wpcom-admin-menu.php     |   3 +-
 .../arcangelini-podcast-make-it-better        |   4 +
 projects/packages/podcast/package.json        |   1 -
 .../packages/podcast/src/class-admin-page.php | 202 ++++++------------
 6 files changed, 77 insertions(+), 141 deletions(-)
 create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
 create mode 100644 projects/packages/podcast/changelog/arcangelini-podcast-make-it-better

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd08d9459f7..091306f776d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3629,9 +3629,6 @@ importers:
         specifier: 0.11.0
         version: 0.11.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
-      '@automattic/jetpack-wp-build-polyfills':
-        specifier: workspace:*
-        version: link:../wp-build-polyfills
       '@babel/core':
         specifier: 7.29.0
         version: 7.29.0
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better b/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
new file mode 100644
index 00000000000..5c64c6e6687
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Internal: collapse the Podcast slug to a single 'podcast' entry in the Jetpack submenu reorder list.
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
index 38aad8eab7d..911a8239f87 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
@@ -466,8 +466,7 @@ function () {
 			'search',
 			'subscribers',
 			'newsletter',
-			'jetpack-podcast',
-			'podcasting',
+			'podcast',
 			'traffic',
 			'jetpack#/settings',
 		)
diff --git a/projects/packages/podcast/changelog/arcangelini-podcast-make-it-better b/projects/packages/podcast/changelog/arcangelini-podcast-make-it-better
new file mode 100644
index 00000000000..d23e3f2f3e5
--- /dev/null
+++ b/projects/packages/podcast/changelog/arcangelini-podcast-make-it-better
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Slim down wp-build wiring to the Backup pattern: drop bridge_wp_build_enqueue and fix_boot_import_map_ordering, alias $screen->id via current_screen instead.
diff --git a/projects/packages/podcast/package.json b/projects/packages/podcast/package.json
index f3eeedc12ad..5287c89b130 100644
--- a/projects/packages/podcast/package.json
+++ b/projects/packages/podcast/package.json
@@ -33,7 +33,6 @@
 		"@wordpress/ui": "0.11.0"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-wp-build-polyfills": "workspace:*",
 		"@babel/core": "7.29.0",
 		"@babel/runtime": "7.29.2",
 		"@types/react": "18.3.28",
diff --git a/projects/packages/podcast/src/class-admin-page.php b/projects/packages/podcast/src/class-admin-page.php
index 4aa92d26859..1f8da6a33bf 100644
--- a/projects/packages/podcast/src/class-admin-page.php
+++ b/projects/packages/podcast/src/class-admin-page.php
@@ -22,9 +22,9 @@
  * registration path covers both. Standalone Jetpack is excluded by the host
  * gate in `Podcast::init()`.
  *
- * The wp-build chassis is loaded inline from `init()` and routed onto our
- * user-facing slug via `bridge_wp_build_enqueue()` — mirroring
- * `Automattic\Jetpack\Scan_Page\Jetpack_Scan`.
+ * Mirrors `Automattic\Jetpack\Backup\V0005\Jetpack_Backup` — wp-build's
+ * polyfills + auto-generated render/enqueue functions do the heavy lifting;
+ * we just alias `$screen->id` so the auto-enqueue check passes for our slug.
  */
 class Admin_Page {
 
@@ -36,13 +36,14 @@ class Admin_Page {
 	const ADMIN_PAGE_SLUG = 'jetpack-podcast';
 
 	/**
-	 * Internal slug emitted by `@wordpress/build` (`wpPlugin.pages[0]`
-	 * plus the `-wp-admin` suffix the build template appends). Used to
-	 * find the auto-generated render / enqueue functions.
+	 * wp-build page slug emitted by `@wordpress/build` (`wpPlugin.pages[0]`).
+	 * The auto-generated enqueue callback only fires when `$screen->id`
+	 * matches this value, so we alias the screen id via `current_screen`
+	 * on our admin page without changing the user-facing slug.
 	 *
 	 * @var string
 	 */
-	const WP_BUILD_SLUG = 'jetpack-podcast-dashboard-wp-admin';
+	const WP_BUILD_SLUG = 'jetpack-podcast-dashboard';
 
 	/**
 	 * Whether the class has already wired its admin hooks.
@@ -54,13 +55,6 @@ class Admin_Page {
 	/**
 	 * Wire the admin hooks. Called from `Podcast::init()` once the
 	 * `jetpack_podcast_untangle` filter and host gates have been satisfied.
-	 *
-	 * Menu registration itself is handled by `wpcom-admin-menu.php` calling
-	 * `add_wp_admin_submenu()` at `admin_menu` priority 999999. Here we set
-	 * up the wp-build chassis at plugins_loaded time so:
-	 *   - `WP_Build_Polyfills::register()` registers BEFORE `wp_default_scripts`
-	 *     fires (otherwise `@wordpress/boot` never lands in the import map).
-	 *   - The wp-build render function is defined before the menu callback runs.
 	 */
 	public static function init() {
 		if ( self::$initialized ) {
@@ -68,9 +62,7 @@ public static function init() {
 		}
 		self::$initialized = true;
 
-		self::load_wp_build();
-		self::bridge_wp_build_enqueue();
-		self::fix_boot_import_map_ordering();
+		add_action( 'admin_menu', array( __CLASS__, 'maybe_load_wp_build' ), 1 );
 	}
 
 	/**
@@ -85,6 +77,11 @@ public static function add_wp_admin_submenu() {
 			return;
 		}
 
+		$wp_build_render = 'jetpack_podcast_jetpack_podcast_dashboard_wp_admin_render_page';
+		$callback        = function_exists( $wp_build_render )
+			? $wp_build_render
+			: array( __CLASS__, 'render' );
+
 		$page_suffix = add_submenu_page(
 			'jetpack',
 			/** "Podcast" is a product name, do not translate. */
@@ -92,7 +89,7 @@ public static function add_wp_admin_submenu() {
 			'Podcast',
 			'manage_options',
 			self::ADMIN_PAGE_SLUG,
-			self::get_render_callback()
+			$callback
 		);
 
 		if ( $page_suffix ) {
@@ -104,127 +101,67 @@ public static function add_wp_admin_submenu() {
 	 * Wire admin-init actions once we know the Podcast page is loading.
 	 *
 	 * Subsequent PRs in the untangle train layer script-data + Tracks here.
-	 * The wp-build dashboard manages its own enqueue pipeline (bridged via
-	 * `bridge_wp_build_enqueue()`).
+	 * The wp-build dashboard manages its own enqueue pipeline.
 	 */
 	public static function admin_init() {
 		// Intentionally empty for now.
 	}
 
 	/**
-	 * Bridge wp-build's auto-generated enqueue function — which checks for
-	 * `?page=jetpack-podcast-dashboard-wp-admin` — to our user-facing slug
-	 * `?page=jetpack-podcast`. Hooked at priority 9 so the wp-build copy
-	 * (registered at priority 10) sees the original `$_GET['page']` and skips
-	 * its own enqueue.
+	 * Load wp-build only on the Podcast admin page, then alias `$screen->id`
+	 * so wp-build's auto-generated enqueue callback fires for our slug.
+	 *
+	 * Hooked at admin_menu priority 1 so polyfills register before
+	 * `wp_default_scripts` fires and the wp-build render function is defined
+	 * before `add_wp_admin_submenu()` runs at priority 999999.
 	 *
-	 * Mirrors `Automattic\Jetpack\Scan_Page\Jetpack_Scan::bridge_wp_build_enqueue`.
+	 * Mirrors `Automattic\Jetpack\Backup\V0005\Jetpack_Backup::maybe_load_wp_build`.
 	 */
-	private static function bridge_wp_build_enqueue() {
-		add_action(
-			'admin_enqueue_scripts',
-			static function ( $hook_suffix ) {
-				// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				if ( ! isset( $_GET['page'] ) || self::ADMIN_PAGE_SLUG !== $_GET['page'] ) {
-					return;
-				}
-
-				$enqueue_fn = 'jetpack_podcast_jetpack_podcast_dashboard_wp_admin_enqueue_scripts';
-				if ( ! function_exists( $enqueue_fn ) ) {
-					return;
-				}
+	public static function maybe_load_wp_build() {
+		if ( ! self::is_enabled() || ! self::is_podcast_admin_request() ) {
+			return;
+		}
 
-				// phpcs:disable WordPress.Security.NonceVerification.Recommended,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-				$original     = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : null;
-				$_GET['page'] = self::WP_BUILD_SLUG;
-				// @phan-suppress-next-line PhanUndeclaredFunctionInCallable -- Function is generated by @wordpress/build into build/pages/jetpack-podcast-dashboard/page-wp-admin.php, which is outside Phan's analysis scope. The function_exists() guard above protects the call at runtime.
-				call_user_func( $enqueue_fn, $hook_suffix );
-				if ( null === $original ) {
-					unset( $_GET['page'] );
-				} else {
-					$_GET['page'] = $original;
-				}
-				// phpcs:enable WordPress.Security.NonceVerification.Recommended,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			},
-			9
-		);
+		self::load_wp_build();
+		add_action( 'current_screen', array( __CLASS__, 'alias_screen_id_for_wp_build' ) );
 	}
 
 	/**
-	 * Fix import map ordering for the wp-build boot script.
-	 *
-	 * In wp-admin, `_wp_footer_scripts` (classic scripts) and
-	 * `print_import_map` both hook into `admin_print_footer_scripts` at
-	 * priority 10, but `_wp_footer_scripts` is registered first. This causes
-	 * the inline `import("@wordpress/boot")` to execute before the import
-	 * map exists.
-	 *
-	 * This fix moves the `import()` call from the classic inline script to a
-	 * `<script type="module">` printed at priority 20 (after the import map).
+	 * Require the wp-build entry file and register its polyfills.
 	 *
-	 * Mirrors `Automattic\Jetpack\Scan_Page\Jetpack_Scan::fix_boot_import_map_ordering`.
-	 *
-	 * @todo Remove once @wordpress/build ships the loader.js fix upstream
-	 *       (WordPress/gutenberg#76870) and Jetpack updates the dependency.
+	 * The build artifact may be absent on a fresh checkout before
+	 * `pnpm build` has run; in that case `add_wp_admin_submenu()` falls back
+	 * to `render()` so the page still loads (just without the React app).
 	 */
-	private static function fix_boot_import_map_ordering() {
-		$handle = self::WP_BUILD_SLUG . '-prerequisites';
-
-		add_action(
-			'admin_enqueue_scripts',
-			static function () use ( $handle ) {
-				// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				if ( ! isset( $_GET['page'] ) || self::ADMIN_PAGE_SLUG !== $_GET['page'] ) {
-					return;
-				}
-
-				$data = wp_scripts()->get_data( $handle, 'after' );
-				if ( empty( $data ) ) {
-					return;
-				}
-
-				$boot_script = null;
-				$remaining   = array();
-				foreach ( $data as $line ) {
-					if ( strpos( $line, '@wordpress/boot' ) !== false ) {
-						$boot_script = $line;
-					} else {
-						$remaining[] = $line;
-					}
-				}
+	private static function load_wp_build() {
+		$build_index = dirname( __DIR__ ) . '/build/build.php';
 
-				if ( null === $boot_script ) {
-					return;
-				}
+		if ( ! file_exists( $build_index ) ) {
+			return;
+		}
 
-				wp_scripts()->add_data( $handle, 'after', $remaining );
+		require_once $build_index;
 
-				add_action(
-					'admin_print_footer_scripts',
-					static function () use ( $boot_script ) {
-						wp_print_inline_script_tag( $boot_script, array( 'type' => 'module' ) );
-					},
-					20
-				);
-			},
-			PHP_INT_MAX
+		WP_Build_Polyfills::register(
+			'jetpack-podcast',
+			array_merge( WP_Build_Polyfills::SCRIPT_HANDLES, WP_Build_Polyfills::MODULE_IDS )
 		);
 	}
 
 	/**
-	 * Resolve the menu render callback, preferring the wp-build–generated
-	 * function when the build artifact is in place.
+	 * Alias `$screen->id` to wp-build's expected page slug so its
+	 * auto-generated `<page>-wp-admin` enqueue callback fires on our
+	 * `?page=jetpack-podcast` URL. Only hooked when we're already on the
+	 * Podcast admin page, so this never affects any other request.
 	 *
-	 * @return callable
+	 * @param \WP_Screen|null $screen The current screen object (passed by WP).
 	 */
-	private static function get_render_callback() {
-		$wp_build_render = 'jetpack_podcast_jetpack_podcast_dashboard_wp_admin_render_page';
-
-		if ( function_exists( $wp_build_render ) ) {
-			return $wp_build_render;
+	public static function alias_screen_id_for_wp_build( $screen ) {
+		if ( ! is_object( $screen ) ) {
+			return;
 		}
 
-		return array( __CLASS__, 'render' );
+		$screen->id = self::WP_BUILD_SLUG;
 	}
 
 	/**
@@ -239,27 +176,6 @@ public static function render() {
 		<?php
 	}
 
-	/**
-	 * Register wp-build polyfills and require the wp-build entry file.
-	 *
-	 * Called from `init()` at plugins_loaded time so polyfill registration
-	 * happens before `wp_default_scripts` fires (otherwise `@wordpress/boot`
-	 * never lands in the import map). The build entry only defines functions —
-	 * the actual enqueue is gated by `bridge_wp_build_enqueue()` to our page.
-	 */
-	private static function load_wp_build() {
-		WP_Build_Polyfills::register(
-			'jetpack-podcast',
-			array_merge( WP_Build_Polyfills::SCRIPT_HANDLES, WP_Build_Polyfills::MODULE_IDS )
-		);
-
-		$build_index = dirname( __DIR__ ) . '/build/build.php';
-
-		if ( file_exists( $build_index ) ) {
-			require_once $build_index;
-		}
-	}
-
 	/**
 	 * Whether the Podcast untangle is enabled. Mirrors the gate in
 	 * `Podcast::init()` so callbacks invoked outside that flow (e.g.
@@ -269,4 +185,20 @@ private static function is_enabled() {
 		/** This filter is documented in src/class-podcast.php. */
 		return (bool) apply_filters( 'jetpack_podcast_untangle', false );
 	}
+
+	/**
+	 * Whether the current request targets the Podcast admin page.
+	 *
+	 * `$_GET['page']` is populated by `wp-admin/admin.php` before any of our
+	 * hooks fire, so this check is reliable from `admin_menu` onwards.
+	 */
+	private static function is_podcast_admin_request() {
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! is_admin() || ! isset( $_GET['page'] ) ) {
+			return false;
+		}
+
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		return self::ADMIN_PAGE_SLUG === sanitize_text_field( wp_unslash( $_GET['page'] ) );
+	}
 }

From 7377a0278709193496684867143a1b464e762957 Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 12:54:31 +0200
Subject: [PATCH 2/8] Podcast: render dashboard inside admin-ui Page chrome

---
 pnpm-lock.yaml                                |  3 ++
 projects/packages/podcast/package.json        |  1 +
 .../podcast/routes/dashboard/package.json     |  1 +
 .../podcast/routes/dashboard/stage.tsx        | 28 +++++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 091306f776d..ed1ab493b2b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3616,6 +3616,9 @@ importers:
 
   projects/packages/podcast:
     dependencies:
+      '@wordpress/admin-ui':
+        specifier: 1.12.0
+        version: 1.12.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@wordpress/components':
         specifier: 32.6.0
         version: 32.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
diff --git a/projects/packages/podcast/package.json b/projects/packages/podcast/package.json
index 5287c89b130..5eeac9df167 100644
--- a/projects/packages/podcast/package.json
+++ b/projects/packages/podcast/package.json
@@ -27,6 +27,7 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
+		"@wordpress/admin-ui": "1.12.0",
 		"@wordpress/components": "32.6.0",
 		"@wordpress/element": "6.44.0",
 		"@wordpress/i18n": "6.17.0",
diff --git a/projects/packages/podcast/routes/dashboard/package.json b/projects/packages/podcast/routes/dashboard/package.json
index f130ca6154a..6d90b09ab9d 100644
--- a/projects/packages/podcast/routes/dashboard/package.json
+++ b/projects/packages/podcast/routes/dashboard/package.json
@@ -4,6 +4,7 @@
 	"private": true,
 	"dependencies": {
 		"@types/react": "18.3.28",
+		"@wordpress/admin-ui": "1.12.0",
 		"@wordpress/components": "32.6.0",
 		"@wordpress/element": "6.44.0",
 		"@wordpress/i18n": "6.17.0",
diff --git a/projects/packages/podcast/routes/dashboard/stage.tsx b/projects/packages/podcast/routes/dashboard/stage.tsx
index 92f5ceebfb9..91a129b34de 100644
--- a/projects/packages/podcast/routes/dashboard/stage.tsx
+++ b/projects/packages/podcast/routes/dashboard/stage.tsx
@@ -2,10 +2,10 @@
  * Podcast dashboard stage: page chrome + tab navigation.
  *
  * Placeholder scaffolding only — each tab panel renders a stub. PR 4 in the
- * untangle train wires the full AdminPage + jetpack-components integration
- * along with the real tab contents.
+ * untangle train fills in the real tab contents.
  */
 
+import { Page } from '@wordpress/admin-ui';
 import { useState, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Tabs } from '@wordpress/ui';
@@ -26,17 +26,21 @@ const Stage = () => {
 	}, [] );
 
 	return (
-		<div className="wrap">
-			<h1>Podcast</h1>
-			<p>
-				{ __( 'Publish a podcast and reach your fans, anywhere they listen.', 'jetpack-podcast' ) }
-			</p>
-
-			<Tabs.Root value={ activeTab } onValueChange={ handleTabChange }>
+		<Tabs.Root value={ activeTab } onValueChange={ handleTabChange }>
+			<Page
+				/* "Podcast" is a product name, do not translate. */
+				title="Podcast"
+				subTitle={ __(
+					'Publish a podcast and reach your fans, anywhere they listen.',
+					'jetpack-podcast'
+				) }
+			>
 				<Tabs.List>
 					<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
 					<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
-					<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
+					<Tabs.Tab value="distribution">
+						{ __( 'Distribution', 'jetpack-podcast' ) }
+					</Tabs.Tab>
 					<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
 				</Tabs.List>
 				<Tabs.Panel value="settings">
@@ -51,8 +55,8 @@ const Stage = () => {
 				<Tabs.Panel value="stats">
 					<p>{ __( 'Stats — placeholder.', 'jetpack-podcast' ) }</p>
 				</Tabs.Panel>
-			</Tabs.Root>
-		</div>
+			</Page>
+		</Tabs.Root>
 	);
 };
 

From b444a61110de8acf053328da26547ed465e3cd9b Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 13:32:25 +0200
Subject: [PATCH 3/8] =?UTF-8?q?Podcast:=20fix=20CI=20=E2=80=94=20restore?=
 =?UTF-8?q?=20wp-build-polyfills=20devDep,=20lint=20nits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml                                       | 3 +++
 projects/packages/podcast/package.json               | 1 +
 projects/packages/podcast/routes/dashboard/stage.tsx | 4 +---
 projects/packages/podcast/src/class-admin-page.php   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ed1ab493b2b..57b117eb8f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3632,6 +3632,9 @@ importers:
         specifier: 0.11.0
         version: 0.11.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
+      '@automattic/jetpack-wp-build-polyfills':
+        specifier: workspace:*
+        version: link:../wp-build-polyfills
       '@babel/core':
         specifier: 7.29.0
         version: 7.29.0
diff --git a/projects/packages/podcast/package.json b/projects/packages/podcast/package.json
index 5eeac9df167..a351bf1f039 100644
--- a/projects/packages/podcast/package.json
+++ b/projects/packages/podcast/package.json
@@ -34,6 +34,7 @@
 		"@wordpress/ui": "0.11.0"
 	},
 	"devDependencies": {
+		"@automattic/jetpack-wp-build-polyfills": "workspace:*",
 		"@babel/core": "7.29.0",
 		"@babel/runtime": "7.29.2",
 		"@types/react": "18.3.28",
diff --git a/projects/packages/podcast/routes/dashboard/stage.tsx b/projects/packages/podcast/routes/dashboard/stage.tsx
index 91a129b34de..8566d39da94 100644
--- a/projects/packages/podcast/routes/dashboard/stage.tsx
+++ b/projects/packages/podcast/routes/dashboard/stage.tsx
@@ -38,9 +38,7 @@ const Stage = () => {
 				<Tabs.List>
 					<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
 					<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
-					<Tabs.Tab value="distribution">
-						{ __( 'Distribution', 'jetpack-podcast' ) }
-					</Tabs.Tab>
+					<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
 					<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
 				</Tabs.List>
 				<Tabs.Panel value="settings">
diff --git a/projects/packages/podcast/src/class-admin-page.php b/projects/packages/podcast/src/class-admin-page.php
index 1f8da6a33bf..417ac7c5623 100644
--- a/projects/packages/podcast/src/class-admin-page.php
+++ b/projects/packages/podcast/src/class-admin-page.php
@@ -36,7 +36,7 @@ class Admin_Page {
 	const ADMIN_PAGE_SLUG = 'jetpack-podcast';
 
 	/**
-	 * wp-build page slug emitted by `@wordpress/build` (`wpPlugin.pages[0]`).
+	 * The wp-build page slug emitted by `@wordpress/build` (`wpPlugin.pages[0]`).
 	 * The auto-generated enqueue callback only fires when `$screen->id`
 	 * matches this value, so we alias the screen id via `current_screen`
 	 * on our admin page without changing the user-facing slug.

From 5911bec11d48c026b110d3975e858c3e24f059df Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 13:46:09 +0200
Subject: [PATCH 4/8] Podcast: revert menu reorder collapse + use AdminPage
 chrome

---
 pnpm-lock.yaml                                | 44 ++++++++++++++++---
 .../arcangelini-podcast-make-it-better        |  5 ---
 .../wpcom-admin-menu/wpcom-admin-menu.php     |  3 +-
 projects/packages/podcast/package.json        |  6 ++-
 .../podcast/routes/dashboard/package.json     |  3 +-
 .../podcast/routes/dashboard/stage.tsx        | 20 +++++----
 6 files changed, 55 insertions(+), 26 deletions(-)
 delete mode 100644 projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 57b117eb8f1..041a666d724 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3616,12 +3616,9 @@ importers:
 
   projects/packages/podcast:
     dependencies:
-      '@wordpress/admin-ui':
-        specifier: 1.12.0
-        version: 1.12.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@wordpress/components':
-        specifier: 32.6.0
-        version: 32.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@automattic/jetpack-components':
+        specifier: workspace:*
+        version: link:../../js-packages/components
       '@wordpress/element':
         specifier: 6.44.0
         version: 6.44.0
@@ -3632,6 +3629,9 @@ importers:
         specifier: 0.11.0
         version: 0.11.0(@types/react@18.3.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
+      '@automattic/jetpack-base-styles':
+        specifier: workspace:*
+        version: link:../../js-packages/base-styles
       '@automattic/jetpack-wp-build-polyfills':
         specifier: workspace:*
         version: link:../wp-build-polyfills
@@ -3644,12 +3644,18 @@ importers:
       '@types/react':
         specifier: 18.3.28
         version: 18.3.28
+      '@wordpress/base-styles':
+        specifier: 6.20.0
+        version: 6.20.0
       '@wordpress/browserslist-config':
         specifier: 6.44.0
         version: 6.44.0
       '@wordpress/build':
         specifier: 0.13.0
-        version: 0.13.0(@babel/core@7.29.0)(browserslist@4.28.2)
+        version: 0.13.0(@babel/core@7.29.0)(@wordpress/theme@0.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(browserslist@4.28.2)
+      '@wordpress/theme':
+        specifier: 0.11.0
+        version: 0.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       browserslist:
         specifier: ^4.24.0
         version: 4.28.2
@@ -24146,6 +24152,30 @@ snapshots:
       - browserslist
       - supports-color
 
+  '@wordpress/build@0.13.0(@babel/core@7.29.0)(@wordpress/theme@0.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(browserslist@4.28.2)':
+    dependencies:
+      '@emotion/babel-plugin': 11.13.5
+      autoprefixer: 10.4.27(postcss@8.5.10)
+      browserslist-to-esbuild: 2.1.1(browserslist@4.28.2)
+      change-case: 4.1.2
+      chokidar: 4.0.3
+      cssnano: 7.1.4(postcss@8.5.10)
+      esbuild: 0.27.4
+      esbuild-plugin-babel: 0.2.3(@babel/core@7.29.0)
+      esbuild-sass-plugin: 3.3.1(esbuild@0.27.4)(sass-embedded@1.97.3)
+      fast-glob: 3.3.3
+      moment-timezone: 0.5.48
+      postcss: 8.5.10
+      postcss-modules: 6.0.1(postcss@8.5.10)
+      rtlcss: 4.3.0
+      sass-embedded: 1.97.3
+    optionalDependencies:
+      '@wordpress/theme': 0.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - browserslist
+      - supports-color
+
   '@wordpress/build@0.13.0(@babel/core@7.29.0)(browserslist@4.28.2)':
     dependencies:
       '@emotion/babel-plugin': 11.13.5
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better b/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
deleted file mode 100644
index 5c64c6e6687..00000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Internal: collapse the Podcast slug to a single 'podcast' entry in the Jetpack submenu reorder list.
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
index 911a8239f87..38aad8eab7d 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
@@ -466,7 +466,8 @@ function () {
 			'search',
 			'subscribers',
 			'newsletter',
-			'podcast',
+			'jetpack-podcast',
+			'podcasting',
 			'traffic',
 			'jetpack#/settings',
 		)
diff --git a/projects/packages/podcast/package.json b/projects/packages/podcast/package.json
index a351bf1f039..1beb9bfdac8 100644
--- a/projects/packages/podcast/package.json
+++ b/projects/packages/podcast/package.json
@@ -27,19 +27,21 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
-		"@wordpress/admin-ui": "1.12.0",
-		"@wordpress/components": "32.6.0",
+		"@automattic/jetpack-components": "workspace:*",
 		"@wordpress/element": "6.44.0",
 		"@wordpress/i18n": "6.17.0",
 		"@wordpress/ui": "0.11.0"
 	},
 	"devDependencies": {
+		"@automattic/jetpack-base-styles": "workspace:*",
 		"@automattic/jetpack-wp-build-polyfills": "workspace:*",
 		"@babel/core": "7.29.0",
 		"@babel/runtime": "7.29.2",
 		"@types/react": "18.3.28",
+		"@wordpress/base-styles": "6.20.0",
 		"@wordpress/browserslist-config": "6.44.0",
 		"@wordpress/build": "0.13.0",
+		"@wordpress/theme": "0.11.0",
 		"browserslist": "^4.24.0"
 	},
 	"optionalDependencies": {
diff --git a/projects/packages/podcast/routes/dashboard/package.json b/projects/packages/podcast/routes/dashboard/package.json
index 6d90b09ab9d..54f202cc4e7 100644
--- a/projects/packages/podcast/routes/dashboard/package.json
+++ b/projects/packages/podcast/routes/dashboard/package.json
@@ -3,9 +3,8 @@
 	"version": "1.0.0",
 	"private": true,
 	"dependencies": {
+		"@automattic/jetpack-components": "workspace:*",
 		"@types/react": "18.3.28",
-		"@wordpress/admin-ui": "1.12.0",
-		"@wordpress/components": "32.6.0",
 		"@wordpress/element": "6.44.0",
 		"@wordpress/i18n": "6.17.0",
 		"@wordpress/ui": "0.11.0"
diff --git a/projects/packages/podcast/routes/dashboard/stage.tsx b/projects/packages/podcast/routes/dashboard/stage.tsx
index 8566d39da94..8e19b15fa25 100644
--- a/projects/packages/podcast/routes/dashboard/stage.tsx
+++ b/projects/packages/podcast/routes/dashboard/stage.tsx
@@ -5,7 +5,7 @@
  * untangle train fills in the real tab contents.
  */
 
-import { Page } from '@wordpress/admin-ui';
+import AdminPage from '@automattic/jetpack-components/admin-page';
 import { useState, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Tabs } from '@wordpress/ui';
@@ -27,20 +27,22 @@ const Stage = () => {
 
 	return (
 		<Tabs.Root value={ activeTab } onValueChange={ handleTabChange }>
-			<Page
+			<AdminPage
 				/* "Podcast" is a product name, do not translate. */
 				title="Podcast"
 				subTitle={ __(
 					'Publish a podcast and reach your fans, anywhere they listen.',
 					'jetpack-podcast'
 				) }
+				tabs={
+					<Tabs.List>
+						<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
+						<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
+						<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
+						<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
+					</Tabs.List>
+				}
 			>
-				<Tabs.List>
-					<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
-					<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
-					<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
-					<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
-				</Tabs.List>
 				<Tabs.Panel value="settings">
 					<p>{ __( 'Settings — placeholder.', 'jetpack-podcast' ) }</p>
 				</Tabs.Panel>
@@ -53,7 +55,7 @@ const Stage = () => {
 				<Tabs.Panel value="stats">
 					<p>{ __( 'Stats — placeholder.', 'jetpack-podcast' ) }</p>
 				</Tabs.Panel>
-			</Page>
+			</AdminPage>
 		</Tabs.Root>
 	);
 };

From 7abba51910183e4ab06c0c81faffee5d06897584 Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 13:49:00 +0200
Subject: [PATCH 5/8] Podcast: keep both 'podcast' (new) and 'podcasting'
 (legacy) in submenu reorder

---
 .../changelog/arcangelini-podcast-make-it-better             | 5 +++++
 .../src/features/wpcom-admin-menu/wpcom-admin-menu.php       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better b/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
new file mode 100644
index 00000000000..c8022d7ce2c
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/arcangelini-podcast-make-it-better
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Internal: rename the new Podcast slug to 'podcast' in the Jetpack submenu reorder list; legacy 'podcasting' entry untouched.
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
index 38aad8eab7d..3d710a04c0f 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php
@@ -466,7 +466,7 @@ function () {
 			'search',
 			'subscribers',
 			'newsletter',
-			'jetpack-podcast',
+			'podcast',
 			'podcasting',
 			'traffic',
 			'jetpack#/settings',

From c589684e4e19dad865b57010432c629907490d8c Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 14:03:57 +0200
Subject: [PATCH 6/8] Podcast: trim verbose comments

---
 .../podcast/routes/dashboard/stage.tsx        |  7 ---
 .../packages/podcast/src/class-admin-page.php | 58 +++----------------
 2 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/projects/packages/podcast/routes/dashboard/stage.tsx b/projects/packages/podcast/routes/dashboard/stage.tsx
index 8e19b15fa25..2b0138a1036 100644
--- a/projects/packages/podcast/routes/dashboard/stage.tsx
+++ b/projects/packages/podcast/routes/dashboard/stage.tsx
@@ -1,10 +1,3 @@
-/**
- * Podcast dashboard stage: page chrome + tab navigation.
- *
- * Placeholder scaffolding only — each tab panel renders a stub. PR 4 in the
- * untangle train fills in the real tab contents.
- */
-
 import AdminPage from '@automattic/jetpack-components/admin-page';
 import { useState, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
diff --git a/projects/packages/podcast/src/class-admin-page.php b/projects/packages/podcast/src/class-admin-page.php
index 417ac7c5623..d924b2f8f19 100644
--- a/projects/packages/podcast/src/class-admin-page.php
+++ b/projects/packages/podcast/src/class-admin-page.php
@@ -14,47 +14,27 @@
  * `jetpack_podcast_untangle` filter is enabled. Until that filter flips, every
  * entry point here is a no-op so the legacy podcasting experience keeps
  * running unchanged.
- *
- * Menu registration is owned by `wpcom-admin-menu.php` (in the
- * `jetpack-mu-wpcom` package), which calls `add_wp_admin_submenu()` at
- * `admin_menu` priority 999999 — late enough that the Jetpack parent menu
- * already exists. wpcom-admin-menu runs on both Simple and Atomic, so a single
- * registration path covers both. Standalone Jetpack is excluded by the host
- * gate in `Podcast::init()`.
- *
- * Mirrors `Automattic\Jetpack\Backup\V0005\Jetpack_Backup` — wp-build's
- * polyfills + auto-generated render/enqueue functions do the heavy lifting;
- * we just alias `$screen->id` so the auto-enqueue check passes for our slug.
  */
 class Admin_Page {
 
-	/**
-	 * URL-facing menu slug.
-	 *
-	 * @var string
-	 */
 	const ADMIN_PAGE_SLUG = 'jetpack-podcast';
 
 	/**
-	 * The wp-build page slug emitted by `@wordpress/build` (`wpPlugin.pages[0]`).
-	 * The auto-generated enqueue callback only fires when `$screen->id`
-	 * matches this value, so we alias the screen id via `current_screen`
-	 * on our admin page without changing the user-facing slug.
-	 *
-	 * @var string
+	 * Slug emitted by `@wordpress/build`. wp-build's auto-generated enqueue
+	 * callback only fires when `$screen->id` matches this value, so we alias
+	 * the screen id via `current_screen` without changing the user-facing URL.
 	 */
 	const WP_BUILD_SLUG = 'jetpack-podcast-dashboard';
 
 	/**
-	 * Whether the class has already wired its admin hooks.
+	 * Whether `init()` has already wired its hooks.
 	 *
 	 * @var bool
 	 */
 	private static $initialized = false;
 
 	/**
-	 * Wire the admin hooks. Called from `Podcast::init()` once the
-	 * `jetpack_podcast_untangle` filter and host gates have been satisfied.
+	 * Wire admin hooks. Idempotent.
 	 */
 	public static function init() {
 		if ( self::$initialized ) {
@@ -69,8 +49,7 @@ public static function init() {
 	 * Register the Podcast submenu under Jetpack on Simple and Atomic.
 	 *
 	 * Called from `wpcom-admin-menu.php` at priority 999999 once the Jetpack
-	 * parent menu exists. Bails when the untangle filter is off so the legacy
-	 * "Podcasting" Calypso link in `wpcom-admin-menu.php` keeps rendering.
+	 * parent menu exists.
 	 */
 	public static function add_wp_admin_submenu() {
 		if ( ! self::is_enabled() ) {
@@ -99,23 +78,15 @@ public static function add_wp_admin_submenu() {
 
 	/**
 	 * Wire admin-init actions once we know the Podcast page is loading.
-	 *
-	 * Subsequent PRs in the untangle train layer script-data + Tracks here.
-	 * The wp-build dashboard manages its own enqueue pipeline.
 	 */
 	public static function admin_init() {
 		// Intentionally empty for now.
 	}
 
 	/**
-	 * Load wp-build only on the Podcast admin page, then alias `$screen->id`
-	 * so wp-build's auto-generated enqueue callback fires for our slug.
-	 *
 	 * Hooked at admin_menu priority 1 so polyfills register before
 	 * `wp_default_scripts` fires and the wp-build render function is defined
 	 * before `add_wp_admin_submenu()` runs at priority 999999.
-	 *
-	 * Mirrors `Automattic\Jetpack\Backup\V0005\Jetpack_Backup::maybe_load_wp_build`.
 	 */
 	public static function maybe_load_wp_build() {
 		if ( ! self::is_enabled() || ! self::is_podcast_admin_request() ) {
@@ -127,8 +98,6 @@ public static function maybe_load_wp_build() {
 	}
 
 	/**
-	 * Require the wp-build entry file and register its polyfills.
-	 *
 	 * The build artifact may be absent on a fresh checkout before
 	 * `pnpm build` has run; in that case `add_wp_admin_submenu()` falls back
 	 * to `render()` so the page still loads (just without the React app).
@@ -149,10 +118,7 @@ private static function load_wp_build() {
 	}
 
 	/**
-	 * Alias `$screen->id` to wp-build's expected page slug so its
-	 * auto-generated `<page>-wp-admin` enqueue callback fires on our
-	 * `?page=jetpack-podcast` URL. Only hooked when we're already on the
-	 * Podcast admin page, so this never affects any other request.
+	 * Alias the current screen id to wp-build's expected slug.
 	 *
 	 * @param \WP_Screen|null $screen The current screen object (passed by WP).
 	 */
@@ -165,8 +131,7 @@ public static function alias_screen_id_for_wp_build( $screen ) {
 	}
 
 	/**
-	 * Default render callback. Used as a fallback when the wp-build artifact is
-	 * missing — for example, on a fresh checkout before `pnpm build` has run.
+	 * Fallback render used when the wp-build artifact is missing.
 	 */
 	public static function render() {
 		?>
@@ -177,9 +142,7 @@ public static function render() {
 	}
 
 	/**
-	 * Whether the Podcast untangle is enabled. Mirrors the gate in
-	 * `Podcast::init()` so callbacks invoked outside that flow (e.g.
-	 * `add_wp_admin_submenu()` from wpcom-admin-menu.php) still bail.
+	 * Whether the Podcast untangle is enabled.
 	 */
 	private static function is_enabled() {
 		/** This filter is documented in src/class-podcast.php. */
@@ -188,9 +151,6 @@ private static function is_enabled() {
 
 	/**
 	 * Whether the current request targets the Podcast admin page.
-	 *
-	 * `$_GET['page']` is populated by `wp-admin/admin.php` before any of our
-	 * hooks fire, so this check is reliable from `admin_menu` onwards.
 	 */
 	private static function is_podcast_admin_request() {
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended

From 3fc144666692ea7577a70801946b06429eb1e8f9 Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 16:35:21 +0200
Subject: [PATCH 7/8] Podcast: apply jetpack-admin-page-layout mixin (matches
 Scan)

---
 .../packages/podcast/routes/dashboard/route.scss  |  5 +++++
 .../packages/podcast/routes/dashboard/stage.tsx   | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 projects/packages/podcast/routes/dashboard/route.scss

diff --git a/projects/packages/podcast/routes/dashboard/route.scss b/projects/packages/podcast/routes/dashboard/route.scss
new file mode 100644
index 00000000000..a5c0ca327e7
--- /dev/null
+++ b/projects/packages/podcast/routes/dashboard/route.scss
@@ -0,0 +1,5 @@
+@use "@automattic/jetpack-base-styles/admin-page-layout" as *;
+
+body.jetpack_page_jetpack-podcast {
+	@include jetpack-admin-page-layout;
+}
diff --git a/projects/packages/podcast/routes/dashboard/stage.tsx b/projects/packages/podcast/routes/dashboard/stage.tsx
index 2b0138a1036..f87f7df247a 100644
--- a/projects/packages/podcast/routes/dashboard/stage.tsx
+++ b/projects/packages/podcast/routes/dashboard/stage.tsx
@@ -2,6 +2,7 @@ import AdminPage from '@automattic/jetpack-components/admin-page';
 import { useState, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Tabs } from '@wordpress/ui';
+import './route.scss';
 
 const TAB_VALUES = [ 'settings', 'episodes', 'distribution', 'stats' ] as const;
 type TabName = ( typeof TAB_VALUES )[ number ];
@@ -28,12 +29,14 @@ const Stage = () => {
 					'jetpack-podcast'
 				) }
 				tabs={
-					<Tabs.List>
-						<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
-						<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
-						<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
-						<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
-					</Tabs.List>
+					<div className="jp-admin-page-tabs">
+						<Tabs.List>
+							<Tabs.Tab value="settings">{ __( 'Settings', 'jetpack-podcast' ) }</Tabs.Tab>
+							<Tabs.Tab value="episodes">{ __( 'Episodes', 'jetpack-podcast' ) }</Tabs.Tab>
+							<Tabs.Tab value="distribution">{ __( 'Distribution', 'jetpack-podcast' ) }</Tabs.Tab>
+							<Tabs.Tab value="stats">{ __( 'Stats', 'jetpack-podcast' ) }</Tabs.Tab>
+						</Tabs.List>
+					</div>
 				}
 			>
 				<Tabs.Panel value="settings">

From 09739bdd1c9deed3a150ffbdee90b6841deba1ce Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <tony@arcangelini.com>
Date: Thu, 7 May 2026 22:49:38 +0200
Subject: [PATCH 8/8] Podcast: stylelint blank line before @include

---
 projects/packages/podcast/routes/dashboard/route.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/packages/podcast/routes/dashboard/route.scss b/projects/packages/podcast/routes/dashboard/route.scss
index a5c0ca327e7..668d953f4d6 100644
--- a/projects/packages/podcast/routes/dashboard/route.scss
+++ b/projects/packages/podcast/routes/dashboard/route.scss
@@ -1,5 +1,6 @@
 @use "@automattic/jetpack-base-styles/admin-page-layout" as *;
 
 body.jetpack_page_jetpack-podcast {
+
 	@include jetpack-admin-page-layout;
 }