| @@ -1,27 +1,63 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Desktop Mode asset registration. | |
| 3 | + * OpenStation asset registration. | |
| 4 | 4 | * |
| 5 | - * Registers all desktop-mode CSS and JS handles with WordPress so they can | |
| 5 | + * Registers all openstation CSS and JS handles with WordPress so they can | |
| 6 | 6 | * be enqueued from anywhere in the plugin (or by third parties). |
| 7 | 7 | * |
| 8 | - * @package WPDesktopMode | |
| 8 | + * @package OpenStation | |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | defined( 'ABSPATH' ) || exit; |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | - * Registers the desktop mode CSS and JS handles. | |
| 14 | + * Cache-buster for a stylesheet that `@import`s sub-sheets: the max | |
| 15 | + * `filemtime` across the file AND everything it (transitively) imports. | |
| 16 | + * Sub-sheet URLs carry no `?ver=` of their own, so the parent's stamp is | |
| 17 | + * the only cache key the browser ever sees for the subtree — it must | |
| 18 | + * move when any member changes. | |
| 15 | 19 | * |
| 16 | - * @since 0.1.0 | |
| 20 | + * @param string $relative Stylesheet path relative to the plugin dir. | |
| 21 | + * @param string $fallback Version to use when the file is missing. | |
| 22 | + * @return string Version string. | |
| 17 | 23 | */ |
| 18 | -function desktop_mode_register_assets() { | |
| 19 | - $version = DESKTOP_MODE_VERSION; | |
| 20 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 24 | +function openstation_css_subtree_version( $relative, $fallback ) { | |
| 25 | + $root = OPENSTATION_DIR . $relative; | |
| 26 | + if ( ! file_exists( $root ) ) { | |
| 27 | + return (string) $fallback; | |
| 28 | + } | |
| 29 | + $max = (int) filemtime( $root ); | |
| 30 | + $queue = array( $root ); | |
| 31 | + $seen = array( $root => true ); | |
| 32 | + while ( ! empty( $queue ) ) { | |
| 33 | + $file = array_pop( $queue ); | |
| 34 | + $css = (string) file_get_contents( $file ); | |
| 35 | + if ( ! preg_match_all( '/@import\s+url\(\s*["\']?([^"\')\s]+)["\']?\s*\)/i', $css, $matches ) ) { | |
| 36 | + continue; | |
| 37 | + } | |
| 38 | + foreach ( $matches[1] as $import ) { | |
| 39 | + $path = dirname( $file ) . '/' . $import; | |
| 40 | + if ( ! file_exists( $path ) || isset( $seen[ $path ] ) ) { | |
| 41 | + continue; | |
| 42 | + } | |
| 43 | + $seen[ $path ] = true; | |
| 44 | + $max = max( $max, (int) filemtime( $path ) ); | |
| 45 | + $queue[] = $path; | |
| 46 | + } | |
| 47 | + } | |
| 48 | + return (string) $max; | |
| 49 | +} | |
| 21 | 50 | |
| 51 | +/** | |
| 52 | + * Registers the OpenStation CSS and JS handles. | |
| 53 | + */ | |
| 54 | +function openstation_register_assets() { | |
| 55 | + $version = OPENSTATION_VERSION; | |
| 56 | + $suffix = openstation_asset_suffix(); | |
| 57 | + | |
| 22 | 58 | // `filemtime`-stamped version for built bundles. The plugin-wide |
| 23 | - // `DESKTOP_MODE_VERSION` is bumped per release, but the bundles | |
| 59 | + // `OPENSTATION_VERSION` is bumped per release, but the bundles | |
| 24 | 60 | // iterate faster — without a per-file mtime stamp, two clients |
| 25 | 61 | // loading the same `?ver=…` URL can be served different bytes |
| 26 | 62 | // (whichever build was on disk at upload time). Stamping with the |
| 27 | 63 | // file's modification time guarantees the URL changes whenever the |
| @@ -28,52 +64,176 @@ | ||
| 28 | 64 | // file does, so "is my fix deployed?" is answerable from the |
| 29 | 65 | // network tab. Falls back to `$version` when the file is missing |
| 30 | 66 | // (test envs that import this file before the build runs). |
| 31 | 67 | $built_version = static function ( $relative ) use ( $version ) { |
| 32 | - $path = DESKTOP_MODE_DIR . $relative; | |
| 68 | + $path = OPENSTATION_DIR . $relative; | |
| 33 | 69 | return file_exists( $path ) ? (string) filemtime( $path ) : $version; |
| 34 | 70 | }; |
| 35 | 71 | |
| 36 | 72 | // Styles. |
| 73 | + // `filemtime`-stamped, NOT the plugin-wide `$version`. This file | |
| 74 | + // is the token catalogue every other sheet resolves `var()`s | |
| 75 | + // against, and it changes whenever the palette does — which is a | |
| 76 | + // lot more often than the plugin version is bumped. With a static | |
| 77 | + // stamp the browser holds the old palette until a hard reload, | |
| 78 | + // and the symptom is maddening: a themed shell where some | |
| 79 | + // surfaces update and others don't. | |
| 37 | 80 | wp_register_style( |
| 38 | - 'desktop-mode-variables', | |
| 39 | - DESKTOP_MODE_URL . 'assets/css/variables.css', | |
| 81 | + 'os-variables', | |
| 82 | + OPENSTATION_URL . 'assets/css/variables.css', | |
| 40 | 83 | array(), |
| 41 | - $version | |
| 84 | + $built_version( 'assets/css/variables.css' ) | |
| 42 | 85 | ); |
| 86 | + // `filemtime`-stamped so the `<link rel="stylesheet">` URL matches the | |
| 87 | + // `<link rel="preload" as="style">` hint emitted by | |
| 88 | + // `openstation_print_preload_hints()` (which stamps with filemtime). | |
| 89 | + // Registering this with the plain `$version` instead produced two | |
| 90 | + // different `?ver=` query strings for the same file, so the browser | |
| 91 | + // never matched the preload to the stylesheet and logged "preloaded | |
| 92 | + // but not used within a few seconds from the window's load event". | |
| 43 | 93 | wp_register_style( |
| 44 | - 'desktop-mode', | |
| 45 | - DESKTOP_MODE_URL . 'assets/css/desktop.css', | |
| 46 | - array( 'desktop-mode-variables' ), | |
| 47 | - $version | |
| 94 | + 'openstation', | |
| 95 | + OPENSTATION_URL . 'assets/css/desktop.css', | |
| 96 | + array( 'os-variables' ), | |
| 97 | + $built_version( 'assets/css/desktop.css' ) | |
| 48 | 98 | ); |
| 49 | - // `filemtime`-stamped — window-chrome iteration (drop overlays, | |
| 50 | - // new drag affordances, third-party-plugin compat) lands faster | |
| 51 | - // than plugin version bumps. Without an mtime stamp the browser | |
| 52 | - // keeps `?ver=<plugin-version>` valid for the whole release cycle | |
| 53 | - // and the user keeps seeing yesterday's CSS even after a hard | |
| 54 | - // reload. Stamps the parent `windows.css` only; the @imports inside | |
| 55 | - // (`window-chrome.css`, `window-states.css`, …) inherit the cache | |
| 56 | - // directive from the parent fetch, so a busted `windows.css` busts | |
| 57 | - // the whole subtree. | |
| 99 | + | |
| 100 | + /* | |
| 101 | + * Window styles — one handle per sheet, chained by dependency. | |
| 102 | + * | |
| 103 | + * These used to be `@import url( … )`ed from `windows.css` under | |
| 104 | + * the single `os-windows` handle. That was a standing | |
| 105 | + * cache bug: an `@import` URL carries no `?ver=`, so a changed | |
| 106 | + * sub-sheet had no URL for the browser to invalidate. Stamping the | |
| 107 | + * PARENT with the subtree's max mtime (which is what | |
| 108 | + * `openstation_css_subtree_version()` was for) made the browser | |
| 109 | + * re-fetch `windows.css` and then request each sub-sheet at an | |
| 110 | + * unchanged URL — free to be served from its heuristic cache. The | |
| 111 | + * result was edits not landing until a hard refresh, and rules | |
| 112 | + * being relocated into `windows.css` purely to dodge it. | |
| 113 | + * | |
| 114 | + * Now every sheet is separately registered with its own | |
| 115 | + * `filemtime` stamp, so each has a real cache key. | |
| 116 | + * | |
| 117 | + * THE DEPENDENCY CHAIN IS LOAD-BEARING. WordPress prints | |
| 118 | + * dependencies before dependents, so chaining each sheet to the | |
| 119 | + * previous one reproduces the order the `@import` block had, and | |
| 120 | + * `os-windows` (which depends on the last link) still | |
| 121 | + * prints after them and still wins ties: | |
| 122 | + * | |
| 123 | + * window-chrome → window-states → effects → window-links | |
| 124 | + * → windows | |
| 125 | + * | |
| 126 | + * `window-overview` is deliberately NOT in this chain — it is | |
| 127 | + * registered below, after `os-windows`, so it can load deferred. | |
| 128 | + * Adding a sheet here means splicing it into the chain, not | |
| 129 | + * appending an unrelated dependency: order is the contract. | |
| 130 | + * (The Preferences window's sheet is not here at all: it rides | |
| 131 | + * the `apps/os-settings/` app as a first-open companion style.) | |
| 132 | + */ | |
| 133 | + $window_sheets = array( | |
| 134 | + 'os-window-chrome' => 'assets/css/window-chrome.css', | |
| 135 | + 'os-window-states' => 'assets/css/window-states.css', | |
| 136 | + 'os-effects' => 'assets/css/effects.css', | |
| 137 | + 'os-window-links' => 'assets/css/window-links.css', | |
| 138 | + ); | |
| 139 | + $previous = array( 'os-variables', 'dashicons' ); | |
| 140 | + foreach ( $window_sheets as $handle => $relative ) { | |
| 141 | + wp_register_style( | |
| 142 | + $handle, | |
| 143 | + OPENSTATION_URL . $relative, | |
| 144 | + $previous, | |
| 145 | + $built_version( $relative ) | |
| 146 | + ); | |
| 147 | + $previous = array( $handle ); | |
| 148 | + } | |
| 149 | + | |
| 150 | + // Entry point. Depends on the tail of the chain above, so | |
| 151 | + // enqueuing this one handle still pulls in every critical window | |
| 152 | + // sheet — the behaviour callers had when they were `@import`s. | |
| 58 | 153 | wp_register_style( |
| 59 | - 'desktop-mode-windows', | |
| 60 | - DESKTOP_MODE_URL . 'assets/css/windows.css', | |
| 61 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 154 | + 'os-windows', | |
| 155 | + OPENSTATION_URL . 'assets/css/windows.css', | |
| 156 | + $previous, | |
| 62 | 157 | $built_version( 'assets/css/windows.css' ) |
| 63 | 158 | ); |
| 159 | + // Loads DEFERRED (see `openstation_defer_non_critical_styles()`): | |
| 160 | + // the UI it styles — the window overview — is lazy-loaded JS that | |
| 161 | + // can never be on screen at first paint, so its CSS has no | |
| 162 | + // business blocking render. It depends on `os-windows` so it | |
| 163 | + // prints after it, preserving the cascade position it had as an | |
| 164 | + // `@import`. | |
| 64 | 165 | wp_register_style( |
| 65 | - 'desktop-mode-dock', | |
| 66 | - DESKTOP_MODE_URL . 'assets/css/dock.css', | |
| 67 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 68 | - $version | |
| 166 | + 'os-window-overview', | |
| 167 | + OPENSTATION_URL . 'assets/css/window-overview.css', | |
| 168 | + array( 'os-windows' ), | |
| 169 | + $built_version( 'assets/css/window-overview.css' ) | |
| 69 | 170 | ); |
| 171 | + // Solo mode — one window, no desk around it. Loads last so it can | |
| 172 | + // hide surfaces the sheets above declared, and only enqueues on a | |
| 173 | + // solo request, so a normal shell never pays for it. | |
| 70 | 174 | wp_register_style( |
| 71 | - 'desktop-mode-dock-peek', | |
| 72 | - DESKTOP_MODE_URL . 'assets/css/dock-peek.css', | |
| 73 | - array( 'desktop-mode-dock' ), | |
| 74 | - $version | |
| 175 | + 'os-solo', | |
| 176 | + OPENSTATION_URL . 'assets/css/solo.css', | |
| 177 | + array( 'os-windows' ), | |
| 178 | + $built_version( 'assets/css/solo.css' ) | |
| 75 | 179 | ); |
| 180 | + wp_register_style( | |
| 181 | + 'os-dock', | |
| 182 | + OPENSTATION_URL . 'assets/css/dock.css', | |
| 183 | + array( 'os-variables', 'dashicons' ), | |
| 184 | + $built_version( 'assets/css/dock.css' ) | |
| 185 | + ); | |
| 186 | + wp_register_style( | |
| 187 | + 'os-dock-peek', | |
| 188 | + OPENSTATION_URL . 'assets/css/dock-peek.css', | |
| 189 | + array( 'os-dock' ), | |
| 190 | + $built_version( 'assets/css/dock-peek.css' ) | |
| 191 | + ); | |
| 192 | + // The phone layer. Every rule is scoped to | |
| 193 | + // `html[data-os-mode="mobile"]`, so the sheet is inert on a | |
| 194 | + // desktop and the first paint on a phone is already right (the | |
| 195 | + // head stamp writes the attribute before any stylesheet applies). | |
| 196 | + // Depends on the dock and window sheets because it overrides them. | |
| 197 | + wp_register_style( | |
| 198 | + 'os-mobile', | |
| 199 | + OPENSTATION_URL . 'assets/css/mobile.css', | |
| 200 | + array( 'os-variables', 'dashicons', 'os-dock', 'os-windows' ), | |
| 201 | + $built_version( 'assets/css/mobile.css' ) | |
| 202 | + ); | |
| 203 | + // The workspace wizard. Scoped to `.os-workspace-wizard`, so it is | |
| 204 | + // inert until the user opens it from the overview bar's `+` or a | |
| 205 | + // tile's Edit. Those controls are styled with the rest of the bar | |
| 206 | + // in `window-overview.css`. | |
| 207 | + wp_register_style( | |
| 208 | + 'os-workspaces', | |
| 209 | + OPENSTATION_URL . 'assets/css/workspaces.css', | |
| 210 | + array( 'os-variables', 'dashicons' ), | |
| 211 | + $built_version( 'assets/css/workspaces.css' ) | |
| 212 | + ); | |
| 213 | + // Keyboard-shortcuts window. Scoped to `.os-shortcuts`, so it is | |
| 214 | + // inert until the System menu opens the window, and unconditional | |
| 215 | + // for the same reason the layout sheet is: the window can be | |
| 216 | + // opened at any moment and a deferred sheet would paint it raw. | |
| 217 | + wp_register_style( | |
| 218 | + 'os-shortcuts', | |
| 219 | + OPENSTATION_URL . 'assets/css/shortcuts.css', | |
| 220 | + array( 'os-variables' ), | |
| 221 | + $built_version( 'assets/css/shortcuts.css' ) | |
| 222 | + ); | |
| 223 | + // The OpenStation desktop layout — the core/plugin seam on the rail | |
| 224 | + // plus the constellation hover-submenu flyout. Both surfaces are | |
| 225 | + // scoped (`[data-os-layout="openstation"]` / `.os-constellation`), | |
| 226 | + // so the sheet is inert in every other layout and is loaded | |
| 227 | + // unconditionally rather than gated on the user's current pick: | |
| 228 | + // the layout is switchable live from OpenStation Preferences, and a | |
| 229 | + // conditional enqueue would leave the first switch unstyled. | |
| 230 | + wp_register_style( | |
| 231 | + 'os-openstation-layout', | |
| 232 | + OPENSTATION_URL . 'assets/css/openstation-layout.css', | |
| 233 | + array( 'os-dock' ), | |
| 234 | + $built_version( 'assets/css/openstation-layout.css' ) | |
| 235 | + ); | |
| 76 | 236 | // `filemtime`-stamped — the chromeless overrides iterate faster |
| 77 | 237 | // than the plugin-wide version bumps (per-page compat shims and |
| 78 | 238 | // page-title-action exceptions land in patches), and a stale |
| 79 | 239 | // cached copy means the user sees yesterday's rules. Without the |
| @@ -79,11 +239,11 @@ | ||
| 79 | 239 | // cached copy means the user sees yesterday's rules. Without the |
| 80 | 240 | // stamp, the browser keeps `?ver=0.8.1` valid for the whole |
| 81 | 241 | // release cycle. |
| 82 | 242 | wp_register_style( |
| 83 | - 'desktop-mode-chromeless', | |
| 84 | - DESKTOP_MODE_URL . 'assets/css/chromeless.css', | |
| 85 | - array( 'desktop-mode' ), | |
| 243 | + 'os-chromeless', | |
| 244 | + OPENSTATION_URL . 'assets/css/chromeless.css', | |
| 245 | + array( 'openstation' ), | |
| 86 | 246 | $built_version( 'assets/css/chromeless.css' ) |
| 87 | 247 | ); |
| 88 | 248 | |
| 89 | 249 | // `filemtime`-stamped — the AI assistant surface (error states, |
| @@ -92,71 +252,94 @@ | ||
| 92 | 252 | // valid for the whole release cycle and the user keeps seeing |
| 93 | 253 | // yesterday's CSS even after a hard reload. |
| 94 | 254 | wp_register_style( |
| 95 | 255 | 'desktop-mode-ai-assistant', |
| 96 | - DESKTOP_MODE_URL . 'assets/css/ai-assistant.css', | |
| 97 | - array( 'desktop-mode-variables' ), | |
| 256 | + OPENSTATION_URL . 'assets/css/ai-assistant.css', | |
| 257 | + array( 'os-variables' ), | |
| 98 | 258 | $built_version( 'assets/css/ai-assistant.css' ) |
| 99 | 259 | ); |
| 100 | 260 | |
| 101 | 261 | wp_register_style( |
| 102 | 262 | 'desktop-mode-bug-report', |
| 103 | - DESKTOP_MODE_URL . 'assets/css/bug-report.css', | |
| 104 | - array( 'desktop-mode-variables' ), | |
| 105 | - $version | |
| 263 | + OPENSTATION_URL . 'assets/css/bug-report.css', | |
| 264 | + array( 'os-variables' ), | |
| 265 | + $built_version( 'assets/css/bug-report.css' ) | |
| 106 | 266 | ); |
| 107 | 267 | |
| 108 | 268 | // `filemtime` instead of the plugin-wide `$version` for the |
| 109 | 269 | // recycle-bin CSS — this file iterates faster than the bundle |
| 110 | 270 | // and we never want a stale CSS cache to mask a real fix. |
| 111 | - $recycle_bin_css = DESKTOP_MODE_DIR . 'assets/css/recycle-bin.css'; | |
| 271 | + $recycle_bin_css = OPENSTATION_DIR . 'assets/css/recycle-bin.css'; | |
| 112 | 272 | wp_register_style( |
| 113 | 273 | 'desktop-mode-recycle-bin', |
| 114 | - DESKTOP_MODE_URL . 'assets/css/recycle-bin.css', | |
| 115 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 274 | + OPENSTATION_URL . 'assets/css/recycle-bin.css', | |
| 275 | + array( 'os-variables', 'dashicons' ), | |
| 116 | 276 | file_exists( $recycle_bin_css ) ? (string) filemtime( $recycle_bin_css ) : $version |
| 117 | 277 | ); |
| 118 | 278 | |
| 119 | - // `filemtime` for the native Posts window CSS — same rationale as | |
| 120 | - // the recycle-bin CSS: bundle iterates faster than the plugin | |
| 121 | - // version and stale caches are worse than the cost of a 304. | |
| 122 | - $posts_window_css = DESKTOP_MODE_DIR . 'assets/css/posts-window.css'; | |
| 279 | + // Files-on-the-Desktop tile + layer styles. `filemtime` for the | |
| 280 | + // same reason as the recycle-bin CSS: this file | |
| 281 | + // iterates faster than the plugin version, and a stale cache | |
| 282 | + // would mask a real fix. | |
| 283 | + $desktop_files_css = OPENSTATION_DIR . 'assets/css/desktop-files.css'; | |
| 123 | 284 | wp_register_style( |
| 124 | - 'desktop-mode-posts-window', | |
| 125 | - DESKTOP_MODE_URL . 'assets/css/posts-window.css', | |
| 126 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 127 | - file_exists( $posts_window_css ) ? (string) filemtime( $posts_window_css ) : $version | |
| 285 | + 'os-files', | |
| 286 | + OPENSTATION_URL . 'assets/css/desktop-files.css', | |
| 287 | + array( 'os-variables', 'dashicons' ), | |
| 288 | + file_exists( $desktop_files_css ) ? (string) filemtime( $desktop_files_css ) : $version | |
| 128 | 289 | ); |
| 129 | 290 | |
| 130 | - // Native Plugins window CSS — same `filemtime`-cache-bust posture | |
| 131 | - // as the Posts/Recycle Bin styles. | |
| 132 | - $plugins_window_css = DESKTOP_MODE_DIR . 'assets/css/plugins-window.css'; | |
| 291 | + // Games hub window (launcher grid, scoreboard, challenges) + | |
| 292 | + // per-game styles. Same `filemtime` cache-bust posture as the | |
| 293 | + // other fast-iterating feature stylesheets. | |
| 294 | + $games_css = OPENSTATION_DIR . 'assets/css/games.css'; | |
| 133 | 295 | wp_register_style( |
| 134 | - 'desktop-mode-plugins-window', | |
| 135 | - DESKTOP_MODE_URL . 'assets/css/plugins-window.css', | |
| 136 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 137 | - file_exists( $plugins_window_css ) ? (string) filemtime( $plugins_window_css ) : $version | |
| 296 | + 'desktop-mode-games', | |
| 297 | + OPENSTATION_URL . 'assets/css/games.css', | |
| 298 | + array( 'os-variables', 'dashicons' ), | |
| 299 | + file_exists( $games_css ) ? (string) filemtime( $games_css ) : $version | |
| 138 | 300 | ); |
| 301 | + $game_inkfall_css = OPENSTATION_DIR . 'assets/css/game-inkfall.css'; | |
| 302 | + wp_register_style( | |
| 303 | + 'os-game-inkfall', | |
| 304 | + OPENSTATION_URL . 'assets/css/game-inkfall.css', | |
| 305 | + array( 'os-variables' ), | |
| 306 | + file_exists( $game_inkfall_css ) ? (string) filemtime( $game_inkfall_css ) : $version | |
| 307 | + ); | |
| 308 | + $game_alphabet_soup_css = OPENSTATION_DIR . 'assets/css/game-alphabet-soup.css'; | |
| 309 | + wp_register_style( | |
| 310 | + 'os-game-alphabet-soup', | |
| 311 | + OPENSTATION_URL . 'assets/css/game-alphabet-soup.css', | |
| 312 | + array( 'os-variables' ), | |
| 313 | + file_exists( $game_alphabet_soup_css ) ? (string) filemtime( $game_alphabet_soup_css ) : $version | |
| 314 | + ); | |
| 139 | 315 | |
| 140 | - // Native Comments window CSS — same `filemtime` posture. | |
| 141 | - $comments_window_css = DESKTOP_MODE_DIR . 'assets/css/comments-window.css'; | |
| 316 | + // Pinned-notes layer styles (paper, pushpin, pastel tokens, pin | |
| 317 | + // animations). Same `filemtime` cache-bust posture as the other | |
| 318 | + // fast-iterating feature stylesheets above. Depends on `os-files` | |
| 319 | + // because a pinned note dresses the canonical `.os-file-tile` | |
| 320 | + // chrome — anything that restyles a tile has to print after the | |
| 321 | + // file that declares one. | |
| 322 | + $notes_css = OPENSTATION_DIR . 'assets/css/notes.css'; | |
| 142 | 323 | wp_register_style( |
| 143 | - 'desktop-mode-comments-window', | |
| 144 | - DESKTOP_MODE_URL . 'assets/css/comments-window.css', | |
| 145 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 146 | - file_exists( $comments_window_css ) ? (string) filemtime( $comments_window_css ) : $version | |
| 324 | + 'os-notes', | |
| 325 | + OPENSTATION_URL . 'assets/css/notes.css', | |
| 326 | + array( 'os-variables', 'dashicons', 'os-files' ), | |
| 327 | + file_exists( $notes_css ) ? (string) filemtime( $notes_css ) : $version | |
| 147 | 328 | ); |
| 148 | 329 | |
| 149 | - // Files-on-the-Desktop tile + layer styles. `filemtime` for the | |
| 150 | - // same reason as the recycle-bin / posts-window CSS: this file | |
| 151 | - // iterates faster than the plugin version, and a stale cache | |
| 152 | - // would mask a real fix. | |
| 153 | - $desktop_files_css = DESKTOP_MODE_DIR . 'assets/css/desktop-files.css'; | |
| 330 | + // Announcement-dialog styles (scrim, hero card, buttons). Registered | |
| 331 | + // always, enqueued only for a user who is actually owed the | |
| 332 | + // announcement — see the gate in `openstation_enqueue_assets()`. It | |
| 333 | + // is not lazy-loaded on top of that: on the one boot where it does | |
| 334 | + // go out, the dialog opens from the main bundle a second later, and | |
| 335 | + // a fetch racing that would show an unstyled card. | |
| 336 | + $announce_css = OPENSTATION_DIR . 'assets/css/announce.css'; | |
| 154 | 337 | wp_register_style( |
| 155 | - 'desktop-mode-files', | |
| 156 | - DESKTOP_MODE_URL . 'assets/css/desktop-files.css', | |
| 157 | - array( 'desktop-mode-variables', 'dashicons' ), | |
| 158 | - file_exists( $desktop_files_css ) ? (string) filemtime( $desktop_files_css ) : $version | |
| 338 | + 'os-announce', | |
| 339 | + OPENSTATION_URL . 'assets/css/announce.css', | |
| 340 | + array( 'os-variables' ), | |
| 341 | + file_exists( $announce_css ) ? (string) filemtime( $announce_css ) : $version | |
| 159 | 342 | ); |
| 160 | 343 | |
| 161 | 344 | // Scripts. |
| 162 | 345 | // |
| @@ -167,10 +350,10 @@ | ||
| 167 | 350 | // lookups. Both handles are core-shipped but only pre-enqueued |
| 168 | 351 | // when Gutenberg-adjacent deps pull them in, so we list them |
| 169 | 352 | // explicitly to guarantee load order. |
| 170 | 353 | wp_register_script( |
| 171 | - 'desktop-mode', | |
| 172 | - DESKTOP_MODE_URL . 'assets/js/desktop' . $suffix . '.js', | |
| 354 | + 'openstation', | |
| 355 | + OPENSTATION_URL . 'assets/js/desktop' . $suffix . '.js', | |
| 173 | 356 | // `heartbeat` + `jquery` — the recycle-bin badge module |
| 174 | 357 | // (loaded as part of this bundle) opts into the WordPress |
| 175 | 358 | // Heartbeat API so the count tile / desktop-icon badge |
| 176 | 359 | // stays in sync even when the bin window is closed. |
| @@ -175,13 +358,24 @@ | ||
| 175 | 358 | // Heartbeat API so the count tile / desktop-icon badge |
| 176 | 359 | // stays in sync even when the bin window is closed. |
| 177 | 360 | array( 'wp-hooks', 'wp-i18n', 'heartbeat', 'jquery' ), |
| 178 | 361 | $built_version( 'assets/js/desktop' . $suffix . '.js' ), |
| 179 | - true | |
| 362 | + // Footer + defer: the shell boots on DOMContentLoaded anyway, | |
| 363 | + // so deferring frees the parser instead of blocking at the | |
| 364 | + // footer print point. Both inline payloads attached to this | |
| 365 | + // handle (`__openStationMenuCommands`, the jazz-quote version | |
| 366 | + // stamp) are `'before'`-position, which WP keeps as blocking | |
| 367 | + // inline ahead of a deferred tag — order is preserved. On WP | |
| 368 | + // < 6.3 the array collapses to a truthy `$in_footer`, same as | |
| 369 | + // before. | |
| 370 | + array( | |
| 371 | + 'in_footer' => true, | |
| 372 | + 'strategy' => 'defer', | |
| 373 | + ) | |
| 180 | 374 | ); |
| 181 | 375 | |
| 182 | - // `desktop-mode-iframe-bridge` — opt-in iframe-side bridge that | |
| 183 | - // provides `wp.desktop.iframe.publish/subscribe/onConnection/ | |
| 376 | + // `os-iframe-bridge` — opt-in iframe-side bridge that | |
| 377 | + // provides `wp.os.iframe.publish/subscribe/onConnection/ | |
| 184 | 378 | // requestConnection` to any same-origin iframe that enqueues it. |
| 185 | 379 | // Same code is also injected inline by the chromeless bridge |
| 186 | 380 | // (so chromeless wp-admin pages don't need a separate enqueue) |
| 187 | 381 | // and auto-injected when a native window opts in via |
| @@ -187,19 +381,60 @@ | ||
| 187 | 381 | // and auto-injected when a native window opts in via |
| 188 | 382 | // `iframeContent: { bridge: true }`. Plugins targeting their |
| 189 | 383 | // own iframe pages just enqueue this handle. |
| 190 | 384 | wp_register_script( |
| 191 | - 'desktop-mode-iframe-bridge', | |
| 192 | - DESKTOP_MODE_URL . 'assets/js/iframe-bridge' . $suffix . '.js', | |
| 385 | + 'os-iframe-bridge', | |
| 386 | + OPENSTATION_URL . 'assets/js/iframe-bridge' . $suffix . '.js', | |
| 193 | 387 | array(), |
| 194 | 388 | $built_version( 'assets/js/iframe-bridge' . $suffix . '.js' ), |
| 195 | 389 | true |
| 196 | 390 | ); |
| 197 | 391 | |
| 198 | - // `desktop-mode-gutenberg-drop-receiver` — iframe-side bundle | |
| 392 | + // `os-deactivation-feedback` — the dialog that asks one optional | |
| 393 | + // question when an admin deactivates OpenStation. Enqueued on | |
| 394 | + // `plugins.php` (classic, chromeless and network admin) by | |
| 395 | + // `includes/feedback/deactivation.php`, and lazy-loaded by the | |
| 396 | + // native Plugins app from its config block. Plain DOM on purpose: | |
| 397 | + // the classic screen has no `<os-*>` kit. | |
| 398 | + wp_register_script( | |
| 399 | + 'os-deactivation-feedback', | |
| 400 | + OPENSTATION_URL . 'assets/js/deactivation-feedback' . $suffix . '.js', | |
| 401 | + array( 'wp-i18n' ), | |
| 402 | + $built_version( 'assets/js/deactivation-feedback' . $suffix . '.js' ), | |
| 403 | + true | |
| 404 | + ); | |
| 405 | + wp_set_script_translations( | |
| 406 | + 'os-deactivation-feedback', | |
| 407 | + 'desktop-mode', | |
| 408 | + OPENSTATION_DIR . 'languages' | |
| 409 | + ); | |
| 410 | + $feedback_css = OPENSTATION_DIR . 'assets/css/deactivation-feedback.css'; | |
| 411 | + wp_register_style( | |
| 412 | + 'os-deactivation-feedback', | |
| 413 | + OPENSTATION_URL . 'assets/css/deactivation-feedback.css', | |
| 414 | + array(), | |
| 415 | + file_exists( $feedback_css ) ? (string) filemtime( $feedback_css ) : $version | |
| 416 | + ); | |
| 417 | + | |
| 418 | + // `os-chromeless-bridge` — the iframe side of every window, | |
| 419 | + // enqueued on `admin_footer` by | |
| 420 | + // `openstation_chromeless_bridge_script()` with its per-request | |
| 421 | + // data attached as a `before` inline block. Registered here (not | |
| 422 | + // there) so the handle exists before the enqueue and so the asset | |
| 423 | + // guard's OPENSTATION_URL snapshot protects it like every other | |
| 424 | + // bundle of ours. | |
| 425 | + wp_register_script( | |
| 426 | + 'os-chromeless-bridge', | |
| 427 | + OPENSTATION_URL . 'assets/js/chromeless-bridge' . $suffix . '.js', | |
| 428 | + array(), | |
| 429 | + $built_version( 'assets/js/chromeless-bridge' . $suffix . '.js' ), | |
| 430 | + true | |
| 431 | + ); | |
| 432 | + | |
| 433 | + // `os-gutenberg-drop-receiver` — iframe-side bundle | |
| 199 | 434 | // enqueued only on the Block Editor screens (`post.php` / |
| 200 | - // `post-new.php`) for desktop-mode users. Listens for | |
| 201 | - // `desktop-mode-drop` postMessages from the parent shell (see | |
| 435 | + // `post-new.php`) for openstation users. Listens for | |
| 436 | + // `os-drop` postMessages from the parent shell (see | |
| 202 | 437 | // `src/drag/iframe-drop-targets.ts`) and inserts the matching |
| 203 | 438 | // Gutenberg block via `wp.data.dispatch('core/block-editor')`. |
| 204 | 439 | // Depends on `wp-blocks` + `wp-data` so the editor stores are |
| 205 | 440 | // guaranteed enqueued before the receiver runs its first message |
| @@ -204,120 +439,124 @@ | ||
| 204 | 439 | // Depends on `wp-blocks` + `wp-data` so the editor stores are |
| 205 | 440 | // guaranteed enqueued before the receiver runs its first message |
| 206 | 441 | // handler. |
| 207 | 442 | wp_register_script( |
| 208 | - 'desktop-mode-gutenberg-drop-receiver', | |
| 209 | - DESKTOP_MODE_URL . 'assets/js/gutenberg-drop-receiver' . $suffix . '.js', | |
| 443 | + 'os-gutenberg-drop-receiver', | |
| 444 | + OPENSTATION_URL . 'assets/js/gutenberg-drop-receiver' . $suffix . '.js', | |
| 210 | 445 | array( 'wp-blocks', 'wp-data' ), |
| 211 | 446 | $built_version( 'assets/js/gutenberg-drop-receiver' . $suffix . '.js' ), |
| 212 | 447 | true |
| 213 | 448 | ); |
| 214 | 449 | |
| 215 | - // `desktop-mode-recycle-bin` — small bundle for the Recycle Bin | |
| 216 | - // native window. Lazy-loaded by the native-window sync the first | |
| 217 | - // time the bin opens; registers a render callback on | |
| 218 | - // `window.desktopModeNativeWindows['desktop-mode-recycle-bin']`. | |
| 219 | - $recycle_bin_js = DESKTOP_MODE_DIR . 'assets/js/recycle-bin' . $suffix . '.js'; | |
| 450 | + // The Recycle Bin window is an App Framework app (`apps/trash/`); | |
| 451 | + // its client view rides the app-bundle pipeline, so no dedicated | |
| 452 | + // script handle. The `desktop-mode-recycle-bin` STYLE handle above | |
| 453 | + // stays — the drag-to-trash drop-target highlight must be present | |
| 454 | + // at boot (dropping on the closed bin's dock tile), not window-open. | |
| 455 | + | |
| 456 | + // `desktop-mode-games` — bundle for the Games hub native window | |
| 457 | + // (launcher grid, scoreboard, challenges client). Lazy-loaded by | |
| 458 | + // the native-window sync the first time the hub opens; registers a | |
| 459 | + // render callback on | |
| 460 | + // `window.openStationNativeWindows['desktop-mode-games']`. | |
| 461 | + // `heartbeat` + `jquery` — the challenges client rides the | |
| 462 | + // WordPress Heartbeat bus for live delivery. | |
| 463 | + $games_js = OPENSTATION_DIR . 'assets/js/games' . $suffix . '.js'; | |
| 220 | 464 | wp_register_script( |
| 221 | - 'desktop-mode-recycle-bin', | |
| 222 | - DESKTOP_MODE_URL . 'assets/js/recycle-bin' . $suffix . '.js', | |
| 223 | - // `heartbeat` + `jquery` — the bin opts in to the WordPress | |
| 224 | - // Heartbeat API while its window is open as the catch-all | |
| 225 | - // real-time channel for deletes that don't render an admin | |
| 226 | - // footer (REST/AJAX/other tabs/WP-CLI). See | |
| 227 | - // `src/recycle-bin/realtime.ts` for the subscriber. | |
| 465 | + 'desktop-mode-games', | |
| 466 | + OPENSTATION_URL . 'assets/js/games' . $suffix . '.js', | |
| 228 | 467 | array( 'wp-i18n', 'heartbeat', 'jquery' ), |
| 229 | - file_exists( $recycle_bin_js ) ? (string) filemtime( $recycle_bin_js ) : $version, | |
| 468 | + file_exists( $games_js ) ? (string) filemtime( $games_js ) : $version, | |
| 230 | 469 | true |
| 231 | 470 | ); |
| 232 | 471 | wp_set_script_translations( |
| 233 | - 'desktop-mode-recycle-bin', | |
| 472 | + 'desktop-mode-games', | |
| 234 | 473 | 'desktop-mode', |
| 235 | - DESKTOP_MODE_DIR . 'languages' | |
| 474 | + OPENSTATION_DIR . 'languages' | |
| 236 | 475 | ); |
| 237 | 476 | |
| 238 | - // `desktop-mode-posts-window` — small bundle for the native Posts | |
| 239 | - // window. Lazy-loaded by the native-window sync the first time the | |
| 240 | - // window opens (via the dock-click swap when the user opts in); | |
| 241 | - // registers a render callback on | |
| 242 | - // `window.desktopModeNativeWindows['desktop-mode-posts']`. | |
| 243 | - $posts_window_js = DESKTOP_MODE_DIR . 'assets/js/posts-window' . $suffix . '.js'; | |
| 477 | + // `os-game-inkfall` — the Inkfall game bundle. Loaded | |
| 478 | + // lazily by the games framework on first launch; publishes the | |
| 479 | + // game def on `window.openStationGames.inkfall`. | |
| 480 | + $game_inkfall_js = OPENSTATION_DIR . 'assets/js/game-inkfall' . $suffix . '.js'; | |
| 244 | 481 | wp_register_script( |
| 245 | - 'desktop-mode-posts-window', | |
| 246 | - DESKTOP_MODE_URL . 'assets/js/posts-window' . $suffix . '.js', | |
| 482 | + 'os-game-inkfall', | |
| 483 | + OPENSTATION_URL . 'assets/js/game-inkfall' . $suffix . '.js', | |
| 247 | 484 | array( 'wp-i18n' ), |
| 248 | - file_exists( $posts_window_js ) ? (string) filemtime( $posts_window_js ) : $version, | |
| 485 | + file_exists( $game_inkfall_js ) ? (string) filemtime( $game_inkfall_js ) : $version, | |
| 249 | 486 | true |
| 250 | 487 | ); |
| 251 | 488 | wp_set_script_translations( |
| 252 | - 'desktop-mode-posts-window', | |
| 489 | + 'os-game-inkfall', | |
| 253 | 490 | 'desktop-mode', |
| 254 | - DESKTOP_MODE_DIR . 'languages' | |
| 491 | + OPENSTATION_DIR . 'languages' | |
| 255 | 492 | ); |
| 256 | 493 | |
| 257 | - // `desktop-mode-plugins-window` — small bundle for the native | |
| 258 | - // Plugins window. Lazy-loaded by the native-window sync the first | |
| 259 | - // time the window opens (via the dock-click swap when the user | |
| 260 | - // opts in); registers a render callback on | |
| 261 | - // `window.desktopModeNativeWindows['desktop-mode-plugins']`. | |
| 262 | - $plugins_window_js = DESKTOP_MODE_DIR . 'assets/js/plugins-window' . $suffix . '.js'; | |
| 494 | + // `os-game-alphabet-soup` — the Alphabet Soup game | |
| 495 | + // bundle. Loaded lazily by the games framework on first launch; | |
| 496 | + // publishes the game def on | |
| 497 | + // `window.openStationGames['alphabet-soup']`. | |
| 498 | + $game_alphabet_soup_js = OPENSTATION_DIR . 'assets/js/game-alphabet-soup' . $suffix . '.js'; | |
| 263 | 499 | wp_register_script( |
| 264 | - 'desktop-mode-plugins-window', | |
| 265 | - DESKTOP_MODE_URL . 'assets/js/plugins-window' . $suffix . '.js', | |
| 500 | + 'os-game-alphabet-soup', | |
| 501 | + OPENSTATION_URL . 'assets/js/game-alphabet-soup' . $suffix . '.js', | |
| 266 | 502 | array( 'wp-i18n' ), |
| 267 | - file_exists( $plugins_window_js ) ? (string) filemtime( $plugins_window_js ) : $version, | |
| 503 | + file_exists( $game_alphabet_soup_js ) ? (string) filemtime( $game_alphabet_soup_js ) : $version, | |
| 268 | 504 | true |
| 269 | 505 | ); |
| 270 | 506 | wp_set_script_translations( |
| 271 | - 'desktop-mode-plugins-window', | |
| 507 | + 'os-game-alphabet-soup', | |
| 272 | 508 | 'desktop-mode', |
| 273 | - DESKTOP_MODE_DIR . 'languages' | |
| 509 | + OPENSTATION_DIR . 'languages' | |
| 274 | 510 | ); |
| 275 | 511 | |
| 276 | - // `desktop-mode-comments-window` — small bundle for the native | |
| 277 | - // Comments window. Lazy-loaded by the native-window sync the first | |
| 278 | - // time the window opens (via the dock-click swap when the user | |
| 279 | - // opts in); registers a render callback on | |
| 280 | - // `window.desktopModeNativeWindows['desktop-mode-comments']`. | |
| 281 | - $comments_window_js = DESKTOP_MODE_DIR . 'assets/js/comments-window' . $suffix . '.js'; | |
| 282 | - wp_register_script( | |
| 283 | - 'desktop-mode-comments-window', | |
| 284 | - DESKTOP_MODE_URL . 'assets/js/comments-window' . $suffix . '.js', | |
| 285 | - array( 'wp-i18n' ), | |
| 286 | - file_exists( $comments_window_js ) ? (string) filemtime( $comments_window_js ) : $version, | |
| 287 | - true | |
| 288 | - ); | |
| 289 | - wp_set_script_translations( | |
| 290 | - 'desktop-mode-comments-window', | |
| 291 | - 'desktop-mode', | |
| 292 | - DESKTOP_MODE_DIR . 'languages' | |
| 293 | - ); | |
| 294 | - | |
| 295 | - // `desktop-mode-animated-logo-wallpaper` — built-in PixiJS canvas | |
| 296 | - // wallpaper, moved out of `desktop.min.js` in 0.8.4. The wallpaper | |
| 512 | + // `os-animated-logo-wallpaper` — built-in PixiJS canvas | |
| 513 | + // wallpaper, moved out of `desktop.min.js`. The wallpaper | |
| 297 | 514 | // `server-sync` loads this handle when the user selects the |
| 298 | 515 | // `wp-animated-logo` wallpaper (or opens OS Settings → Wallpaper |
| 299 | 516 | // and the picker pulls every registered canvas def in). The |
| 300 | 517 | // bundle's only side effect is publishing the `WallpaperDef` on |
| 301 | - // `window.desktopModeWallpapers['wp-animated-logo']`. | |
| 302 | - $animated_logo_js = DESKTOP_MODE_DIR . 'assets/js/animated-logo-wallpaper' . $suffix . '.js'; | |
| 518 | + // `window.openStationWallpapers['wp-animated-logo']`. | |
| 519 | + $animated_logo_js = OPENSTATION_DIR . 'assets/js/animated-logo-wallpaper' . $suffix . '.js'; | |
| 303 | 520 | wp_register_script( |
| 304 | - 'desktop-mode-animated-logo-wallpaper', | |
| 305 | - DESKTOP_MODE_URL . 'assets/js/animated-logo-wallpaper' . $suffix . '.js', | |
| 521 | + 'os-animated-logo-wallpaper', | |
| 522 | + OPENSTATION_URL . 'assets/js/animated-logo-wallpaper' . $suffix . '.js', | |
| 306 | 523 | array( 'wp-hooks' ), |
| 307 | 524 | file_exists( $animated_logo_js ) ? (string) filemtime( $animated_logo_js ) : $version, |
| 308 | 525 | true |
| 309 | 526 | ); |
| 310 | 527 | |
| 528 | + // `os-snow-wallpaper` — built-in PixiJS canvas | |
| 529 | + // wallpaper: snowfall that accumulates on window tops and melts | |
| 530 | + // away. Same lazy-load path as the animated logo: the wallpaper | |
| 531 | + // `server-sync` injects this handle when the user selects the | |
| 532 | + // `wp-snow` wallpaper (or opens OS Settings → Wallpaper and the | |
| 533 | + // picker pulls the def in). The bundle's only side effect is | |
| 534 | + // publishing the `WallpaperDef` on | |
| 535 | + // `window.openStationWallpapers['wp-snow']`. | |
| 536 | + $snow_js = OPENSTATION_DIR . 'assets/js/snow-wallpaper' . $suffix . '.js'; | |
| 537 | + wp_register_script( | |
| 538 | + 'os-snow-wallpaper', | |
| 539 | + OPENSTATION_URL . 'assets/js/snow-wallpaper' . $suffix . '.js', | |
| 540 | + array( 'wp-hooks', 'wp-i18n' ), | |
| 541 | + file_exists( $snow_js ) ? (string) filemtime( $snow_js ) : $version, | |
| 542 | + true | |
| 543 | + ); | |
| 544 | + wp_set_script_translations( | |
| 545 | + 'os-snow-wallpaper', | |
| 546 | + 'desktop-mode', | |
| 547 | + OPENSTATION_DIR . 'languages' | |
| 548 | + ); | |
| 549 | + | |
| 311 | 550 | // `desktop-mode-ai-assistant` — AI Copilot spotlight overlay, |
| 312 | - // moved out of `desktop.min.js` in 0.8.4. The main bundle ships a | |
| 313 | - // stub matching the public `wp.desktop.ai` contract; the stub | |
| 551 | + // moved out of `desktop.min.js`. The main bundle ships a | |
| 552 | + // stub matching the public `wp.os.ai` contract; the stub | |
| 314 | 553 | // `<script>`-injects this handle the first time the user opens |
| 315 | 554 | // the assistant (Cmd+K or admin-bar button). |
| 316 | - $ai_assistant_js = DESKTOP_MODE_DIR . 'assets/js/ai-assistant' . $suffix . '.js'; | |
| 555 | + $ai_assistant_js = OPENSTATION_DIR . 'assets/js/ai-assistant' . $suffix . '.js'; | |
| 317 | 556 | wp_register_script( |
| 318 | 557 | 'desktop-mode-ai-assistant', |
| 319 | - DESKTOP_MODE_URL . 'assets/js/ai-assistant' . $suffix . '.js', | |
| 558 | + OPENSTATION_URL . 'assets/js/ai-assistant' . $suffix . '.js', | |
| 320 | 559 | array( 'wp-hooks', 'wp-i18n' ), |
| 321 | 560 | file_exists( $ai_assistant_js ) ? (string) filemtime( $ai_assistant_js ) : $version, |
| 322 | 561 | true |
| 323 | 562 | ); |
| @@ -323,19 +562,19 @@ | ||
| 323 | 562 | ); |
| 324 | 563 | wp_set_script_translations( |
| 325 | 564 | 'desktop-mode-ai-assistant', |
| 326 | 565 | 'desktop-mode', |
| 327 | - DESKTOP_MODE_DIR . 'languages' | |
| 566 | + OPENSTATION_DIR . 'languages' | |
| 328 | 567 | ); |
| 329 | 568 | |
| 330 | 569 | // Wire the translation bundle to this script handle. WP looks |
| 331 | - // for `languages/desktop-mode-{locale}-desktop-mode.json` and | |
| 570 | + // for `languages/os-{locale}-os.json` and | |
| 332 | 571 | // injects its `locale_data` into `wp.i18n` just before the |
| 333 | 572 | // script runs — so every `__()` call resolves to the right |
| 334 | 573 | // language without any runtime fetch. |
| 335 | 574 | wp_set_script_translations( |
| 575 | + 'openstation', | |
| 336 | 576 | 'desktop-mode', |
| 337 | - 'desktop-mode', | |
| 338 | - DESKTOP_MODE_DIR . 'languages' | |
| 577 | + OPENSTATION_DIR . 'languages' | |
| 339 | 578 | ); |
| 340 | 579 | } |
| 341 | -add_action( 'init', 'desktop_mode_register_assets' ); | |
| 580 | +add_action( 'init', 'openstation_register_assets' ); | |
