Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/desktop loader #33230

Merged
merged 5 commits into from
May 27, 2019
Merged

Fix/desktop loader #33230

merged 5 commits into from
May 27, 2019

Conversation

loremattei
Copy link
Contributor

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

  1. Check out the 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 in develop yet.
  2. Run the make dev-server to start the development server.
  3. In a separate terminal run make dev.
  4. Verify that Calypso comes up inside the desktop shell.
  5. Exit the desktop app and kill the dev server.
  6. Run make build to build the production app.
  7. Run the artifacts in the release folder and verify that Calypso comes up inside the desktop shell without errors.

See also the relevant discussion in #32738.

@loremattei loremattei requested a review from blowery May 22, 2019 13:16
@matticbot
Copy link
Contributor

@matticbot
Copy link
Contributor

This PR does not affect the size of JS and CSS bundles shipped to the user's browser.

Generated by performance advisor bot at iscalypsofastyet.com.

Copy link
Contributor

@blowery blowery left a comment

Choose a reason for hiding this comment

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

LGTM

@loremattei loremattei added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels May 27, 2019
@loremattei loremattei merged commit f7951f0 into master May 27, 2019
@loremattei loremattei deleted the fix/desktop-loader branch May 27, 2019 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants