Skip to content

Emit deleted site event when removing empty site - #2929

Merged
fredrikekelund merged 1 commit into
trunkfrom
f26d/emit-deleted-event-when-empty-dir
Mar 27, 2026
Merged

Emit deleted site event when removing empty site#2929
fredrikekelund merged 1 commit into
trunkfrom
f26d/emit-deleted-event-when-empty-dir

Conversation

@fredrikekelund

Copy link
Copy Markdown
Contributor

Related issues

  • N/A

How AI was used in this PR

N/A

Proposed Changes

#2836 moved the "if site directory is empty, delete it from the config" logic from Studio to the CLI. This PR fixes a small glitch in that logic: it wasn't emitting SITE_EVENTS.DELETED events, so sites disappeared from the config but not from the Studio sidebar.

Testing Instructions

  1. Before starting the app, remove or rename one of your site directories
  2. npm start
  3. Ensure that the site does not appear in the Studio sidebar

Pre-merge Checklist

  • Have you checked for TypeScript, React or other console errors?
@fredrikekelund
fredrikekelund requested review from a team and bcotrim March 27, 2026 07:59
@fredrikekelund fredrikekelund self-assigned this Mar 27, 2026

@bcotrim bcotrim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!
LGTM 👍

@fredrikekelund
fredrikekelund enabled auto-merge (squash) March 27, 2026 08:05
@fredrikekelund
fredrikekelund merged commit 0190262 into trunk Mar 27, 2026
8 of 10 checks passed
@fredrikekelund
fredrikekelund deleted the f26d/emit-deleted-event-when-empty-dir branch March 27, 2026 08:06

@katinthehatsite katinthehatsite left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The worked for me, I did not see the site I removed in the sidebar 👍

@wpmobilebot

Copy link
Copy Markdown
Collaborator

📊 Performance Test Results

Comparing 40cd007 vs trunk

app-size

Metric trunk 40cd007 Diff Change
App Size (Mac) 1268.05 MB 1267.83 MB 0.22 MB ⚪ 0.0%

site-editor

Metric trunk 40cd007 Diff Change
load 1865 ms 1912 ms +47 ms ⚪ 0.0%

site-startup

Metric trunk 40cd007 Diff Change
siteCreation 8151 ms 8182 ms +31 ms ⚪ 0.0%
siteStartup 4851 ms 4845 ms 6 ms ⚪ 0.0%

Results are median values from multiple test runs.

Legend: 🟢 Improvement (faster) | 🔴 Regression (slower) | ⚪ No change (<50ms diff)

fredrikekelund added a commit that referenced this pull request Mar 27, 2026
* [skip ci] Code freeze: Update translatable strings for 1.7.7

* [skip ci] Code freeze: Add draft release notes for 1.7.7

* Fix Prettier lint error in ipc-handlers import statement (#2893)

* Update Studio CLI settings toggle copy and layout (#2855)

* Update Studio CLI toggle copy and layout

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix unit tests to follow UI change

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Wojtek Naruniec <wojtek@naruniec.me>

* Studio: Borders don't have correct colors in dark mode (#2885)

* Add rule for buttons borders

* Improve comment

---------

Co-authored-by: Kateryna Kodonenko <kateryna@automattic.com>

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7-beta1

* Update CLI version

* Preliminary release notes cleanup

* Fix: CLI doesn't generate site thumbnails (#2850)

* Consolidate thumbnail capture to shared CLI path

Create a single thumbnail capture path through captureSiteThumbnail() that is used by both the desktop UI (loadThemeDetails) and CLI events subscriber. This eliminates duplication and uses pendingCaptures deduplication to prevent concurrent BrowserWindow creation when the same site is captured by multiple paths simultaneously.

* remove comments

* Use sequential util with deduplicateKey for thumbnail capture

* Fix E2E copy-site test targeting wrong BrowserWindow

The thumbnail capture feature creates hidden BrowserWindows for
screenshots. The copy-site test used getAllWindows()[0] to send
the IPC event, which could target the screenshot window instead
of the main app window, causing the copy action to silently fail.
Use getFocusedWindow() with a visible-window fallback instead.

---------

Co-authored-by: katinthehatsite <katerynakodonenko@gmail.com>

* Disable Redis/memcached when JSPI is unavailable (#2900)

* Disable Redis and memcached PHP extensions when JSPI is unavailable

These extensions require JSPI (JavaScript Promise Integration), which is
only available in Node.js 24+. On Node <24, enabling them crashes the
WordPress server at startup. This conditionally disables them when JSPI
isn't available, matching the pattern in process-manager-daemon.ts.

Also bumps the minimum engine version to >=24.0.0 since the production
build strips asyncify binaries, making Node 24+ a de facto requirement.

* Revert engine version bump to >=22.0.0

* Sort sites by sortOrder when loading from IPC (#2902)

* Fix regressions around deleting preview sites (#2903)

* Support deleting all preview sites from CLI and app

* Update tests

* Fix

* Improve schemas and types

* Tweak

* Fix JSPI detection using runtime feature check (#2906)

* Fix JSPI detection using runtime feature check instead of Node version

Replace semver.gte(process.version, '24.0.0') with a runtime check for
WebAssembly.promising to detect JSPI availability. The version check
assumed Node 24+ has JSPI enabled by default, but it requires the
--experimental-wasm-jspi flag. This caused "Redis extension requires
JSPI" errors when running CLI commands directly without the flag.

Extract the check into a shared isJspiAvailable helper in
tools/common/lib/jspi.ts so there is a single source of truth.

* Remove unverified claim about JSPI proposal stage from comment

* Fix linting

* Address review suggestions

* Pass `--experimental-wasm-jspi` to node in bin script

---------

Co-authored-by: Fredrik Rombach Ekelund <fredrik.rombach.ekelund@automattic.com>

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7-beta2

* Minuscule CLI README tweak (#2917)

* Minuscule CLI README tweak

* Fix tests

* Address review comments

* Rename `appdata-v1.json` to `appdata-v1.deprecated.json` (#2916)

* Rename `appdata-v1.json` to `appdata-v1.deprecated.json`

* Fix tests

* Fix tests

* Fix tests

* Fix What's New current step icon color in dark mode (#2921)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Update release notes for 1.7.7 (#2905)

* Update release notes for 1.7.7

* Address review suggestions

* Ensure that language packs are bundled in `wp-files` (#2922)

* Add phpMyAdmin to What's New dialog (#2920)

* Add phpMyAdmin to What's New dialog

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Improve wording

* Force What's New for next version

* Update phpMyAdmin illustration with dot grid background

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Shaun Andrews <shaun@automattic.com>

* Refactor and clean up site deletion logic in app (#2915)

* Refactor site deletion in app

* Nit fix

* [skip ci] Bump version to 1.7.7-beta3

* Emit `deleted` site event when removing empty site (#2929)

* Bump CLI version

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7

* [skip ci] Bump CLI version to 1.7.7

---------

Co-authored-by: Roberto Aranda <roberto.aranda@automattic.com>
Co-authored-by: Shaun Andrews <shaun@automattic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Wojtek Naruniec <wojtek@naruniec.me>
Co-authored-by: katinthehatsite <katerynakodonenko@gmail.com>
Co-authored-by: Kateryna Kodonenko <kateryna@automattic.com>
Co-authored-by: Fredrik Rombach Ekelund <fredrik.rombach.ekelund@automattic.com>
Co-authored-by: Gergely Csécsey <gergely.csecsey@automattic.com>
Co-authored-by: Ivan Ottinger <ivan.ottinger@automattic.com>
Co-authored-by: Bernardo Cotrim <bmmcotrim@gmail.com>
Co-authored-by: Fredrik Rombach Ekelund <fredrik@f26d.dev>
Co-authored-by: Antonio Sejas <antonio.sejas@automattic.com>
Co-authored-by: Wojtek Naruniec <wojtek.naruniec@automattic.com>
fredrikekelund added a commit that referenced this pull request Apr 2, 2026
* [skip ci] Code freeze: Update translatable strings for 1.7.7

* [skip ci] Code freeze: Add draft release notes for 1.7.7

* Fix Prettier lint error in ipc-handlers import statement (#2893)

* Update Studio CLI settings toggle copy and layout (#2855)

* Update Studio CLI toggle copy and layout

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix unit tests to follow UI change

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Wojtek Naruniec <wojtek@naruniec.me>

* Studio: Borders don't have correct colors in dark mode (#2885)

* Add rule for buttons borders

* Improve comment

---------

Co-authored-by: Kateryna Kodonenko <kateryna@automattic.com>

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7-beta1

* Update CLI version

* Preliminary release notes cleanup

* Fix: CLI doesn't generate site thumbnails (#2850)

* Consolidate thumbnail capture to shared CLI path

Create a single thumbnail capture path through captureSiteThumbnail() that is used by both the desktop UI (loadThemeDetails) and CLI events subscriber. This eliminates duplication and uses pendingCaptures deduplication to prevent concurrent BrowserWindow creation when the same site is captured by multiple paths simultaneously.

* remove comments

* Use sequential util with deduplicateKey for thumbnail capture

* Fix E2E copy-site test targeting wrong BrowserWindow

The thumbnail capture feature creates hidden BrowserWindows for
screenshots. The copy-site test used getAllWindows()[0] to send
the IPC event, which could target the screenshot window instead
of the main app window, causing the copy action to silently fail.
Use getFocusedWindow() with a visible-window fallback instead.

---------

Co-authored-by: katinthehatsite <katerynakodonenko@gmail.com>

* Disable Redis/memcached when JSPI is unavailable (#2900)

* Disable Redis and memcached PHP extensions when JSPI is unavailable

These extensions require JSPI (JavaScript Promise Integration), which is
only available in Node.js 24+. On Node <24, enabling them crashes the
WordPress server at startup. This conditionally disables them when JSPI
isn't available, matching the pattern in process-manager-daemon.ts.

Also bumps the minimum engine version to >=24.0.0 since the production
build strips asyncify binaries, making Node 24+ a de facto requirement.

* Revert engine version bump to >=22.0.0

* Sort sites by sortOrder when loading from IPC (#2902)

* Fix regressions around deleting preview sites (#2903)

* Support deleting all preview sites from CLI and app

* Update tests

* Fix

* Improve schemas and types

* Tweak

* Fix JSPI detection using runtime feature check (#2906)

* Fix JSPI detection using runtime feature check instead of Node version

Replace semver.gte(process.version, '24.0.0') with a runtime check for
WebAssembly.promising to detect JSPI availability. The version check
assumed Node 24+ has JSPI enabled by default, but it requires the
--experimental-wasm-jspi flag. This caused "Redis extension requires
JSPI" errors when running CLI commands directly without the flag.

Extract the check into a shared isJspiAvailable helper in
tools/common/lib/jspi.ts so there is a single source of truth.

* Remove unverified claim about JSPI proposal stage from comment

* Fix linting

* Address review suggestions

* Pass `--experimental-wasm-jspi` to node in bin script

---------

Co-authored-by: Fredrik Rombach Ekelund <fredrik.rombach.ekelund@automattic.com>

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7-beta2

* Minuscule CLI README tweak (#2917)

* Minuscule CLI README tweak

* Fix tests

* Address review comments

* Rename `appdata-v1.json` to `appdata-v1.deprecated.json` (#2916)

* Rename `appdata-v1.json` to `appdata-v1.deprecated.json`

* Fix tests

* Fix tests

* Fix tests

* Fix What's New current step icon color in dark mode (#2921)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Update release notes for 1.7.7 (#2905)

* Update release notes for 1.7.7

* Address review suggestions

* Ensure that language packs are bundled in `wp-files` (#2922)

* Add phpMyAdmin to What's New dialog (#2920)

* Add phpMyAdmin to What's New dialog

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Improve wording

* Force What's New for next version

* Update phpMyAdmin illustration with dot grid background

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Shaun Andrews <shaun@automattic.com>

* Refactor and clean up site deletion logic in app (#2915)

* Refactor site deletion in app

* Nit fix

* [skip ci] Bump version to 1.7.7-beta3

* Emit `deleted` site event when removing empty site (#2929)

* Bump CLI version

* [skip ci] Update translations

* [skip ci] Bump version to 1.7.7

* [skip ci] Bump CLI version to 1.7.7

---------

Co-authored-by: Roberto Aranda <roberto.aranda@automattic.com>
Co-authored-by: Shaun Andrews <shaun@automattic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Wojtek Naruniec <wojtek@naruniec.me>
Co-authored-by: katinthehatsite <katerynakodonenko@gmail.com>
Co-authored-by: Kateryna Kodonenko <kateryna@automattic.com>
Co-authored-by: Fredrik Rombach Ekelund <fredrik.rombach.ekelund@automattic.com>
Co-authored-by: Gergely Csécsey <gergely.csecsey@automattic.com>
Co-authored-by: Ivan Ottinger <ivan.ottinger@automattic.com>
Co-authored-by: Bernardo Cotrim <bmmcotrim@gmail.com>
Co-authored-by: Fredrik Rombach Ekelund <fredrik@f26d.dev>
Co-authored-by: Antonio Sejas <antonio.sejas@automattic.com>
Co-authored-by: Wojtek Naruniec <wojtek.naruniec@automattic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants