| @@ -73,9 +73,9 @@ | ||
| 73 | 73 | do_action( 'openstation_chromeless_styles' ); |
| 74 | 74 | return; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if ( ! openstation_is_enabled() || openstation_is_classic_request() ) { | |
| 77 | + if ( ! openstation_is_shell_request() ) { | |
| 78 | 78 | return; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // CSS. Only the sheets that paint surfaces present at boot — the |
| @@ -87,14 +87,18 @@ | ||
| 87 | 87 | wp_enqueue_style( 'openstation' ); |
| 88 | 88 | wp_enqueue_style( 'os-windows' ); |
| 89 | 89 | wp_enqueue_style( 'os-window-overview' ); |
| 90 | 90 | wp_enqueue_style( 'os-dock' ); |
| 91 | + wp_enqueue_style( 'os-dock-taskbar' ); | |
| 91 | 92 | wp_enqueue_style( 'os-dock-peek' ); |
| 92 | - wp_enqueue_style( 'os-notch' ); | |
| 93 | + wp_enqueue_style( 'os-workspaces' ); | |
| 93 | 94 | wp_enqueue_style( 'os-shortcuts' ); |
| 94 | 95 | wp_enqueue_style( 'os-openstation-layout' ); |
| 95 | 96 | wp_enqueue_style( 'os-files' ); |
| 96 | 97 | wp_enqueue_style( 'os-notes' ); |
| 98 | + // Unconditional like the layout sheet: a live crossing into the | |
| 99 | + // phone band must not find the phone layer unstyled. | |
| 100 | + wp_enqueue_style( 'os-mobile' ); | |
| 97 | 101 | |
| 98 | 102 | // Solo mode — a single window freed into a native OS window by the |
| 99 | 103 | // desktop host. Same shell, everything but that one window hidden. |
| 100 | 104 | $solo_window = openstation_solo_window_id(); |
| @@ -199,9 +203,9 @@ | ||
| 199 | 203 | ); |
| 200 | 204 | } |
| 201 | 205 | |
| 202 | 206 | // Pass configuration to JavaScript. |
| 203 | - global $title, $pagenow, $parent_file, $menu; | |
| 207 | + global $title, $parent_file, $menu; | |
| 204 | 208 | |
| 205 | 209 | $menu_icon = 'dashicons-admin-generic'; |
| 206 | 210 | if ( ! empty( $parent_file ) && ! empty( $menu ) ) { |
| 207 | 211 | foreach ( $menu as $item ) { |
| @@ -217,11 +221,11 @@ | ||
| 217 | 221 | // plugin-contributed top-level routes. `openstation_dock_placement` |
| 218 | 222 | // is the per-item filter escape hatch for hiding. Shared with the |
| 219 | 223 | // REST menu endpoint so live refreshes (post plugin-activation) |
| 220 | 224 | // produce the same ordering as the boot payload. |
| 221 | - $menu_payload = openstation_build_menu_payload(); | |
| 222 | - $dock_items = $menu_payload['dockItems']; | |
| 223 | - $native_windows = isset( $menu_payload['nativeWindows'] ) | |
| 225 | + $menu_payload = openstation_build_menu_payload(); | |
| 226 | + $dock_items = $menu_payload['dockItems']; | |
| 227 | + $native_windows = isset( $menu_payload['nativeWindows'] ) | |
| 224 | 228 | ? $menu_payload['nativeWindows'] |
| 225 | 229 | : array(); |
| 226 | 230 | |
| 227 | 231 | // The BOOT page prints every registry window's template as a real |
| @@ -329,9 +333,9 @@ | ||
| 329 | 333 | $desktop_theme_row['cssDeferred'] = true; |
| 330 | 334 | } |
| 331 | 335 | } |
| 332 | 336 | unset( $desktop_theme_row ); |
| 333 | - $desktop_icons = isset( $menu_payload['desktopIcons'] ) | |
| 337 | + $desktop_icons = isset( $menu_payload['desktopIcons'] ) | |
| 334 | 338 | ? $menu_payload['desktopIcons'] |
| 335 | 339 | : array(); |
| 336 | 340 | |
| 337 | 341 | // Files-on-the-Desktop payload (Phase 0+1). Plugin-registered |
| @@ -342,8 +346,16 @@ | ||
| 342 | 346 | : array(); |
| 343 | 347 | $server_file_openers = function_exists( 'openstation_build_file_openers_payload' ) |
| 344 | 348 | ? openstation_build_file_openers_payload() |
| 345 | 349 | : array(); |
| 350 | + // Entries in the menu payload carry dependency handles; their | |
| 351 | + // payloads ride once in `scriptDepPayloads` (GH#892). The file | |
| 352 | + // lists stay whole: no sync module reads them on the client, and | |
| 353 | + // compacting them here was the only write to the map after the | |
| 354 | + // menu payload froze its own, so a refresh could not match it. | |
| 355 | + $script_dep_payloads = isset( $menu_payload['scriptDepPayloads'] ) | |
| 356 | + ? (array) $menu_payload['scriptDepPayloads'] | |
| 357 | + : array(); | |
| 346 | 358 | $user_file_associations = function_exists( 'openstation_get_user_file_associations' ) |
| 347 | 359 | ? openstation_get_user_file_associations( get_current_user_id() ) |
| 348 | 360 | : array(); |
| 349 | 361 | $server_wallpaper_menu_items = function_exists( 'openstation_build_wallpaper_menu_items' ) |
| @@ -432,18 +444,33 @@ | ||
| 432 | 444 | OPENSTATION_URL . 'assets/js/' . $base . $suffix . '.js?ver=' . $ver |
| 433 | 445 | ); |
| 434 | 446 | }; |
| 435 | 447 | |
| 436 | - // Build the current page URL from $pagenow + $_GET. Strip the portal | |
| 437 | - // markers so the derived window ID matches what the dock would produce | |
| 438 | - // for the same page — otherwise auto-opening the entry window and | |
| 439 | - // clicking the same dock icon would create a duplicate. | |
| 440 | - $current_query = $_GET; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 441 | - unset( $current_query[ OPENSTATION_PORTAL_FLAG ], $current_query[ OPENSTATION_PORTAL_INTENT_FLAG ] ); | |
| 442 | - $current_page = admin_url( $pagenow ) . ( ! empty( $current_query ) ? '?' . http_build_query( $current_query ) : '' ); | |
| 448 | + // The page the shell opens first. On the shell screen it is the | |
| 449 | + // validated `target` query arg (else the session's focused window, | |
| 450 | + // the default window, the Dashboard); on a solo boot it is the | |
| 451 | + // request's own URL. Either way the frozen portal flags are gone | |
| 452 | + // from it, so the derived window id matches what the dock would | |
| 453 | + // produce for the same page — otherwise auto-opening the entry | |
| 454 | + // window and clicking the same dock icon would create a duplicate. | |
| 455 | + $boot_target = openstation_shell_boot_target(); | |
| 456 | + $current_page = $boot_target['url']; | |
| 457 | + $from_portal = $boot_target['fromPortal']; | |
| 458 | + $from_portal_intent = $boot_target['fromPortalIntent']; | |
| 443 | 459 | |
| 444 | - $from_portal = ! empty( $_GET[ OPENSTATION_PORTAL_FLAG ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 445 | - $from_portal_intent = ! empty( $_GET[ OPENSTATION_PORTAL_INTENT_FLAG ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 460 | + // On the shell screen `$title` and `$parent_file` describe the | |
| 461 | + // screen ("OpenStation", no menu), not the page about to open. The | |
| 462 | + // dock entry for that page is the identity the entry window folds | |
| 463 | + // into, so its title and icon are the right first paint; the iframe | |
| 464 | + // reports its own title once it lands either way. | |
| 465 | + $current_title = wp_strip_all_tags( (string) $title ); | |
| 466 | + if ( openstation_is_shell_screen_request() ) { | |
| 467 | + $boot_meta = openstation_shell_boot_target_meta( $current_page, $dock_items ); | |
| 468 | + $current_title = wp_strip_all_tags( $boot_meta['title'] ); | |
| 469 | + if ( '' !== $boot_meta['icon'] ) { | |
| 470 | + $menu_icon = $boot_meta['icon']; | |
| 471 | + } | |
| 472 | + } | |
| 446 | 473 | |
| 447 | 474 | /** |
| 448 | 475 | * Filters the desktop shell configuration passed to JavaScript. |
| 449 | 476 | * |
| @@ -483,9 +510,14 @@ | ||
| 483 | 510 | * @type bool $fromPortal Whether the shell was reached via the portal. |
| 484 | 511 | * @type bool $fromPortalIntent Whether the portal redirect resolved from an explicit `?target=…` (user navigation intent) rather than the session's focused window or the default-window fallback. Distinguishes a bare `/openstation/` visit from a portal-redirected admin-bar click so the shell can honour the URL the user actually asked for. |
| 485 | 512 | * @type array $seenIntros Slugs of one-time announcements the user has dismissed (e.g. `['openstation-rebrand']`). |
| 486 | 513 | * @type string $seenIntrosUrl REST endpoint for the seen-intros surface — POST `/seen` to mark, DELETE the base to reset. |
| 514 | + * @type bool $shellTour Whether this site offers the first-boot shell tour (`openstation_show_shell_tour`). Whether this user already had it is `seenIntros` containing `shell-tour`. | |
| 515 | + * @type string $shellTourBundleUrl URL of the lazy shell-tour bundle, injected on first use. | |
| 516 | + * @type array $firstRun `{ installedAt, firstEnabledAt, enabledAt }`, epoch seconds, 0 when unknown — the first-run stamps, read-only. | |
| 487 | 517 | * @type bool $rebrandNotice Whether to offer this user the one-off announcement explaining the rename from Desktop Mode to OpenStation. True only when migration 5 flagged this user as a Desktop Mode user from before the rename AND they haven't dismissed the `openstation-rebrand` intro. Only ever present in the shell config, so the announcement never reaches the classic admin. |
| 518 | + * @type array|null $usageFeedback What the one-time usage feedback prompt needs (`restUrl`), or `null` when this user is not owed it: the feature is off, they have had OpenStation on for fewer than seven days by the `openstation_enabled_at` stamp, or they already answered or dismissed the `usage-feedback` intro. Carries no user data. | |
| 519 | + * @type string $usageFeedbackBundleUrl URL of the lazy `usage-feedback` bundle, the form the prompt opens. | |
| 488 | 520 | * } |
| 489 | 521 | */ |
| 490 | 522 | $config = apply_filters( |
| 491 | 523 | 'openstation_shell_config', |
| @@ -490,11 +522,15 @@ | ||
| 490 | 522 | $config = apply_filters( |
| 491 | 523 | 'openstation_shell_config', |
| 492 | 524 | array( |
| 493 | 525 | 'currentPage' => esc_url( $current_page ), |
| 494 | - 'currentTitle' => wp_strip_all_tags( $title ), | |
| 526 | + 'currentTitle' => $current_title, | |
| 495 | 527 | 'currentIcon' => sanitize_html_class( $menu_icon ), |
| 496 | - 'adminUrl' => esc_url( admin_url() ), | |
| 528 | + // `self_admin_url()`: the base a window id is derived from, | |
| 529 | + // and the URL the shell leaves for on exit. Both want the | |
| 530 | + // admin the screen is in, which is the network one when the | |
| 531 | + // network shell screen is what rendered. | |
| 532 | + 'adminUrl' => esc_url( self_admin_url() ), | |
| 497 | 533 | 'homeUrl' => esc_url( home_url( '/' ) ), |
| 498 | 534 | // Decoded: the shell assigns this to `window.location`, |
| 499 | 535 | // where `&` would make `_wpnonce` arrive as |
| 500 | 536 | // `amp;_wpnonce` and fail the nonce check. |
| @@ -538,8 +574,11 @@ | ||
| 538 | 574 | 'serverDesktopThemes' => $server_desktop_themes, |
| 539 | 575 | 'desktopIcons' => $desktop_icons, |
| 540 | 576 | 'serverFileTypes' => $server_file_types, |
| 541 | 577 | 'serverFileOpeners' => $server_file_openers, |
| 578 | + // Handle => dependency payload for every `scriptDeps` list in | |
| 579 | + // this config; see `openstation_compact_script_deps()`. | |
| 580 | + 'scriptDepPayloads' => (object) $script_dep_payloads, | |
| 542 | 581 | 'userFileAssociations' => $user_file_associations, |
| 543 | 582 | 'filesUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/files' ) ), |
| 544 | 583 | // Pinned-notes REST base (`includes/notes/rest.php`). The |
| 545 | 584 | // notes layer boots only when this is present. |
| @@ -555,9 +594,17 @@ | ||
| 555 | 594 | 'coreNotices' => openstation_get_core_notices(), |
| 556 | 595 | 'pluginNotices' => openstation_get_plugin_notices(), |
| 557 | 596 | 'defaultWallpaper' => openstation_get_default_wallpaper(), |
| 558 | 597 | 'session' => openstation_get_session( get_current_user_id() ), |
| 559 | - 'sessionUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/session' ) ), | |
| 598 | + // The session route runs in the main site's blog context | |
| 599 | + // whichever desktop posts to it, so the network screen's | |
| 600 | + // URL says which session it is addressing — see | |
| 601 | + // `openstation_rest_session_network()`. | |
| 602 | + 'sessionUrl' => esc_url_raw( | |
| 603 | + is_network_admin() | |
| 604 | + ? add_query_arg( 'network', '1', rest_url( 'desktop-mode/v1/session' ) ) | |
| 605 | + : rest_url( 'desktop-mode/v1/session' ) | |
| 606 | + ), | |
| 560 | 607 | 'restUrl' => esc_url_raw( rest_url() ), |
| 561 | 608 | 'mediaUrl' => esc_url_raw( rest_url( 'wp/v2/media' ) ), |
| 562 | 609 | 'dropConfig' => $drop_config, |
| 563 | 610 | 'defaultWindowUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/default-window' ) ), |
| @@ -580,15 +627,8 @@ | ||
| 580 | 627 | // stub `<script>`-injects this URL the first time the user |
| 581 | 628 | // opens the assistant. Picking `.js` vs `.min.js` here keeps |
| 582 | 629 | // the SCRIPT_DEBUG gate server-side, matching iframeBridgeUrl. |
| 583 | 630 | 'aiAssistantBundleUrl' => $lazy_bundle_url( 'ai-assistant' ), |
| 584 | - // URL of the OS Settings panel lazy bundle. Injected by | |
| 585 | - // the main bundle's `OsSettings.renderPanel()` stub on | |
| 586 | - // the user's first Settings open. Holds every section | |
| 587 | - // renderer + the `<os-*>` components only the panel | |
| 588 | - // uses, so nothing about Settings ships in | |
| 589 | - // `desktop.min.js` for users who never open it. | |
| 590 | - 'osSettingsPanelBundleUrl' => $lazy_bundle_url( 'os-settings-panel' ), | |
| 591 | 631 | // URL of the shell-overlays lazy bundle. Pre-loaded by |
| 592 | 632 | // the main bundle after first paint so action-triggered |
| 593 | 633 | // overlays (toast, confirm dialog, context menus) feel |
| 594 | 634 | // instant the first time they fire. |
| @@ -643,12 +683,29 @@ | ||
| 643 | 683 | // / `openNew()` call (both async); pre-loaded |
| 644 | 684 | // by the shell after first paint when no session is being |
| 645 | 685 | // restored and no `openCurrentPage` will fire. |
| 646 | 686 | 'windowSystemBundleUrl' => $lazy_bundle_url( 'window-system' ), |
| 687 | + // URL of the lazy phone-layer bundle. Injected by the main | |
| 688 | + // bundle only when the mode resolves to `mobile`, so a | |
| 689 | + // desktop never fetches it. `mode` carries the preference | |
| 690 | + // and breakpoints the first-paint head stamp already used, | |
| 691 | + // plus the server's default tab-bar pins — see | |
| 692 | + // `includes/mobile.php`. | |
| 693 | + 'mobileBundleUrl' => $lazy_bundle_url( 'mobile' ), | |
| 694 | + 'mode' => openstation_mode_config( get_current_user_id() ), | |
| 647 | 695 | // URL of the item-visibility-menu lazy bundle — the |
| 648 | 696 | // right-click "hide from dock / desktop" menu. Injected by |
| 649 | 697 | // the main bundle's loader shim on the first right-click. |
| 650 | 698 | 'itemVisibilityMenuBundleUrl' => $lazy_bundle_url( 'item-visibility-menu' ), |
| 699 | + // URL of the workspace-wizard lazy bundle — the modal | |
| 700 | + // behind "Edit this workspace…". Injected by the main | |
| 701 | + // bundle's loader shim on first open. | |
| 702 | + 'workspaceWizardBundleUrl' => $lazy_bundle_url( 'workspace-wizard' ), | |
| 703 | + // Server-side view of the workspace templates, so a plugin | |
| 704 | + // can add or drop one from PHP. The client merges these | |
| 705 | + // with its own built-ins by id — see | |
| 706 | + // `src/workspaces/server-sync.ts`. | |
| 707 | + 'workspacePresets' => openstation_workspace_presets(), | |
| 651 | 708 | // URL of the release-card lazy bundle — the vinyl core- |
| 652 | 709 | // update announcement. Injected by `maybeShowUpdate()` only |
| 653 | 710 | // when a core update is actually pending. |
| 654 | 711 | 'releaseCardBundleUrl' => $lazy_bundle_url( 'release-card' ), |
| @@ -665,8 +722,26 @@ | ||
| 665 | 722 | // announcement yet. Same value that gated `os-announce` |
| 666 | 723 | // above; the dialog cannot paint without that stylesheet, so |
| 667 | 724 | // the two must not diverge. |
| 668 | 725 | 'rebrandNotice' => $show_rebrand_notice, |
| 726 | + // The first-boot shell tour: whether this site offers it | |
| 727 | + // (the `openstation_show_shell_tour` filter), and the lazy | |
| 728 | + // bundle that runs it. Whether THIS user already had it is | |
| 729 | + // `seenIntros` containing `shell-tour`; the shell reads that | |
| 730 | + // itself so a reset can replay the tour without a new boot. | |
| 731 | + 'shellTour' => openstation_should_offer_shell_tour( get_current_user_id() ), | |
| 732 | + 'shellTourBundleUrl' => $lazy_bundle_url( 'shell-tour' ), | |
| 733 | + // The first-run stamps, read-only, epoch seconds (0 when | |
| 734 | + // unknown): when the plugin was installed, when anyone first | |
| 735 | + // enabled it, and when this user did. See | |
| 736 | + // `includes/first-run/stamps.php`. | |
| 737 | + 'firstRun' => openstation_first_run_config( get_current_user_id() ), | |
| 738 | + // Null for everyone but a user who has had OpenStation on | |
| 739 | + // long enough and has not answered yet; the gate lives in | |
| 740 | + // `includes/feedback/usage.php`. The form is a lazy bundle | |
| 741 | + // fetched only when the user says yes to the prompt. | |
| 742 | + 'usageFeedback' => function_exists( 'openstation_usage_feedback_config' ) ? openstation_usage_feedback_config() : null, | |
| 743 | + 'usageFeedbackBundleUrl' => $lazy_bundle_url( 'usage-feedback' ), | |
| 669 | 744 | 'aiSearchUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/ai/search' ) ), |
| 670 | 745 | // AI assistant availability + per-user toggle. Drives whether the |
| 671 | 746 | // Cmd+K palette and admin-bar icon appear, and the setup placeholder. |
| 672 | 747 | 'aiAssistant' => function_exists( 'openstation_ai_assistant_config' ) |
| @@ -675,43 +750,29 @@ | ||
| 675 | 750 | // Lets the Features tab re-check provider availability without a |
| 676 | 751 | // reload after a connector is configured in Settings → Connectors. |
| 677 | 752 | 'aiStatusUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/ai/status' ) ), |
| 678 | 753 | 'extendedOptions' => current_user_can( 'manage_options' ) ? openstation_get_extended_options() : null, |
| 754 | + // Agents offered as "Send to <agent>" on desktop and folder | |
| 755 | + // tiles. See `src/desktop-files/agent-menu-items.ts`. | |
| 756 | + 'agentsSendTo' => function_exists( 'openstation_agents_send_to_targets' ) ? openstation_agents_send_to_targets() : array(), | |
| 679 | 757 | 'extendedOptionsUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/extended-options' ) ), |
| 680 | 758 | // Site-wide games kill switch (Extended options). Exposed to |
| 681 | 759 | // every user — the shell skips the challenges Heartbeat |
| 682 | 760 | // channel when the framework is off. |
| 683 | 761 | 'gamesEnabled' => openstation_games_enabled(), |
| 684 | - // Comments-window AI moderation toggle — surfaced at the | |
| 685 | - // shell level so the OS Settings → Features tab can render | |
| 686 | - // the toggle without depending on the Comments window | |
| 687 | - // being registered for this user. URL is the same | |
| 688 | - // endpoint the comments-window config exposes; state is | |
| 689 | - // `null` for non-admins (the UI hides the row entirely). | |
| 690 | - 'commentsAiUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/comments/ai-settings' ) ), | |
| 691 | - // Non-null only for admins on a site where the Core AI stack is | |
| 692 | - // present. Comment scoring routes through the AI Client (WP 7.0+), | |
| 693 | - // so on older WordPress the whole row is hidden — same as the | |
| 694 | - // assistant toggle — rather than shown disabled pointing at a | |
| 695 | - // Settings → Connectors screen that doesn't exist there. | |
| 696 | - 'commentsAi' => ( | |
| 697 | - current_user_can( 'manage_options' ) | |
| 698 | - && function_exists( 'openstation_ai_is_available' ) | |
| 699 | - && openstation_ai_is_available() | |
| 700 | - ) | |
| 701 | - ? array( | |
| 702 | - 'enabled' => function_exists( 'openstation_comments_ai_is_enabled' ) | |
| 703 | - ? openstation_comments_ai_is_enabled() | |
| 704 | - : false, | |
| 705 | - 'providerConfigured' => function_exists( 'openstation_comments_ai_provider_configured' ) | |
| 706 | - ? openstation_comments_ai_provider_configured() | |
| 707 | - : false, | |
| 708 | - ) | |
| 709 | - : null, | |
| 710 | 762 | 'currentUserIsAdmin' => current_user_can( 'manage_options' ), |
| 763 | + // Null on single-site installs; its `networkAdmin` null | |
| 764 | + // without `manage_network`, which is what keeps the dock | |
| 765 | + // tile from registering. | |
| 766 | + 'multisite' => openstation_multisite_payload(), | |
| 711 | 767 | 'portalUrl' => esc_url( openstation_portal_url() ), |
| 712 | 768 | 'fromPortal' => $from_portal, |
| 713 | 769 | 'fromPortalIntent' => $from_portal_intent, |
| 770 | + // One-shot like the boot target: a switch from another | |
| 771 | + // site's overview lands in this one's. | |
| 772 | + 'landInOverview' => openstation_shell_lands_in_overview(), | |
| 773 | + 'arrivalDirection' => openstation_shell_arrival_direction(), | |
| 774 | + 'hopLinkOffer' => function_exists( 'openstation_network_link_offer' ) ? openstation_network_link_offer() : null, | |
| 714 | 775 | 'pwa' => array( |
| 715 | 776 | 'manifestUrl' => esc_url_raw( openstation_pwa_manifest_url() ), |
| 716 | 777 | 'swUrl' => esc_url_raw( openstation_pwa_sw_url() ), |
| 717 | 778 | // Extensionless retry target for hosts whose nginx 404s |
| @@ -716,8 +777,12 @@ | ||
| 716 | 777 | 'swUrl' => esc_url_raw( openstation_pwa_sw_url() ), |
| 717 | 778 | // Extensionless retry target for hosts whose nginx 404s |
| 718 | 779 | // virtual .js paths before WordPress runs (WordPress.com). |
| 719 | 780 | 'swFallbackUrl' => esc_url_raw( openstation_pwa_sw_fallback_url() ), |
| 781 | + // The site's home path — the scope the registration | |
| 782 | + // asks for, so a subdirectory network's sites each get | |
| 783 | + // their own worker instead of fighting over the root. | |
| 784 | + 'swScope' => openstation_pwa_sw_scope(), | |
| 720 | 785 | // The worker's per-user flags, computed HERE rather than |
| 721 | 786 | // baked into the served `sw.js`. |
| 722 | 787 | // |
| 723 | 788 | // A service worker is origin-wide but these are per-user |
| @@ -723,12 +788,11 @@ | ||
| 723 | 788 | // A service worker is origin-wide but these are per-user |
| 724 | 789 | // preferences, so putting them in the script bytes made |
| 725 | 790 | // the body differ between an anonymous and a logged-in |
| 726 | 791 | // request — and any in-scope logged-out navigation then |
| 727 | - // installed a "new" worker and tripped the shell's | |
| 728 | - // `controllerchange` reload. The bytes are identical for | |
| 729 | - // everyone now; the shell posts these to the worker at | |
| 730 | - // boot. | |
| 792 | + // installed a "new" worker, which at the time reloaded | |
| 793 | + // the shell. The bytes are identical for everyone now; | |
| 794 | + // the shell posts these to the worker at boot. | |
| 731 | 795 | // |
| 732 | 796 | // Computed server-side, not read from the settings |
| 733 | 797 | // snapshot client-side, because |
| 734 | 798 | // `openstation_pwa_admin_asset_cache_enabled()` applies |
| @@ -737,8 +801,14 @@ | ||
| 737 | 801 | 'swConfig' => array( |
| 738 | 802 | 'adminAssetCache' => (bool) openstation_pwa_admin_asset_cache_enabled(), |
| 739 | 803 | 'windowPrewarm' => ! empty( openstation_get_os_settings( get_current_user_id() )['windowPrewarmEnabled'] ), |
| 740 | 804 | ), |
| 805 | + // The build this shell document belongs to. When a new | |
| 806 | + // worker takes over mid-session the shell asks it for | |
| 807 | + // the stamp it was served with and compares; only a | |
| 808 | + // difference — the shell's own files changed on the | |
| 809 | + // server — offers the user a reload. Never automatic. | |
| 810 | + 'shellBuild' => openstation_shell_build_stamp(), | |
| 741 | 811 | 'stateUrl' => esc_url_raw( rest_url( 'desktop-mode/v1/pwa-state' ) ), |
| 742 | 812 | 'state' => openstation_pwa_get_user_state( get_current_user_id() ), |
| 743 | 813 | // Mirrors the manifest's `name` field — used by the |
| 744 | 814 | // install pill so the button reads "Install <site>" |
| @@ -775,19 +845,19 @@ | ||
| 775 | 845 | : array(), |
| 776 | 846 | 'deferredStyles' => openstation_build_deferred_styles( |
| 777 | 847 | array_merge( |
| 778 | 848 | array( |
| 779 | - 'os-settings', | |
| 780 | 849 | 'desktop-mode-ai-assistant', |
| 781 | 850 | 'desktop-mode-bug-report', |
| 782 | - // WP Explorer's sheet. It rides that window as a | |
| 783 | - // companion style, but the desktop FOLDER window | |
| 784 | - // paints its preview pane with the same | |
| 785 | - // `os-my-wordpress__*` classes and — being a | |
| 786 | - // native window opened straight from JS — carries | |
| 787 | - // no companion styles of its own. Without this, | |
| 788 | - // the pane rendered unstyled until WP Explorer | |
| 789 | - // had been opened once in the session. | |
| 851 | + // The explorer's shared sheet. It rides the WP | |
| 852 | + // Explorer APP as a companion style, but the | |
| 853 | + // desktop FOLDER window paints its preview pane | |
| 854 | + // with the same `os-my-wordpress__*` classes and | |
| 855 | + // — being a native window opened straight from | |
| 856 | + // JS — carries no companion styles of its own. | |
| 857 | + // Without this, the pane rendered unstyled until | |
| 858 | + // the explorer had been opened once in the | |
| 859 | + // session. | |
| 790 | 860 | 'desktop-mode-my-wordpress', |
| 791 | 861 | ), |
| 792 | 862 | // The Games sheets. They also ride the hub window as |
| 793 | 863 | // companion styles, but a game is reachable without |
| @@ -843,9 +913,9 @@ | ||
| 843 | 913 | * before the callback fires. On WP 6.9 (function exists, no default |
| 844 | 914 | * hook) the `remove_action()` is a harmless no-op. |
| 845 | 915 | */ |
| 846 | 916 | function openstation_defer_core_command_palette() { |
| 847 | - if ( ! openstation_is_enabled() || openstation_is_chromeless_request() || openstation_is_classic_request() ) { | |
| 917 | + if ( ! openstation_is_shell_request() ) { | |
| 848 | 918 | return; |
| 849 | 919 | } |
| 850 | 920 | remove_action( 'admin_enqueue_scripts', 'wp_enqueue_command_palette_assets' ); |
| 851 | 921 | } |
| @@ -895,14 +965,9 @@ | ||
| 895 | 965 | * supply absolute URLs through the filter; in that case the consumer |
| 896 | 966 | * is responsible for the `crossorigin` semantics. |
| 897 | 967 | */ |
| 898 | 968 | function openstation_print_preload_hints() { |
| 899 | - if ( | |
| 900 | - ! is_admin() | |
| 901 | - || ! openstation_is_enabled() | |
| 902 | - || openstation_is_chromeless_request() | |
| 903 | - || openstation_is_classic_request() | |
| 904 | - ) { | |
| 969 | + if ( ! openstation_is_shell_request() ) { | |
| 905 | 970 | return; |
| 906 | 971 | } |
| 907 | 972 | |
| 908 | 973 | $suffix = openstation_asset_suffix(); |
| @@ -945,8 +1010,21 @@ | ||
| 945 | 1010 | 'rel' => 'prefetch', |
| 946 | 1011 | ), |
| 947 | 1012 | ); |
| 948 | 1013 | |
| 1014 | + // The phone layer is needed at boot on a phone and never on a | |
| 1015 | + // desktop; the server cannot see the viewport, so the user agent | |
| 1016 | + // decides whether the hint is worth its bytes. A wrong guess costs | |
| 1017 | + // one low-priority fetch, never a wrong layout — the stamp and the | |
| 1018 | + // bundle loader read the real viewport. | |
| 1019 | + if ( openstation_mode_hint_is_mobile( get_current_user_id() ) ) { | |
| 1020 | + $hints[] = array( | |
| 1021 | + 'href' => $build_url( 'assets/js/mobile' . $suffix . '.js' ), | |
| 1022 | + 'as' => 'script', | |
| 1023 | + 'rel' => 'prefetch', | |
| 1024 | + ); | |
| 1025 | + } | |
| 1026 | + | |
| 949 | 1027 | /** |
| 950 | 1028 | * Filters the list of resource preload hints emitted in `<head>`. |
| 951 | 1029 | * |
| 952 | 1030 | * Each entry is a `{ 'href' => string, 'as' => string, |
| @@ -1063,9 +1141,8 @@ | ||
| 1063 | 1141 | 'os-openstation-layout', |
| 1064 | 1142 | 'desktop-mode-ai-assistant', |
| 1065 | 1143 | 'desktop-mode-bug-report', |
| 1066 | 1144 | 'os-window-overview', |
| 1067 | - 'os-settings', | |
| 1068 | 1145 | ) |
| 1069 | 1146 | ); |
| 1070 | 1147 | |
| 1071 | 1148 | if ( ! in_array( $handle, (array) $deferred, true ) ) { |
