Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows the desktop server to boot up after the changes in #30768 and #32253.
Changes proposed in this Pull Request
Fix how we detect the desktop environment, also checking for desktop-development, and fix the page we serve to use the fallback path for production builds.
Testing instructions
release/4.2.0
branch in WP-Desktop. The branch is already set up to reference the commits in this PR. Also, there are some related changes in that branch that are not indevelop
yet.make dev-server
to start the development server.make dev
.make build
to build the production app.release
folder and verify that Calypso comes up inside the desktop shell without errors.See also the relevant discussion in #32738.