Update wp-calypso dependency and regenerate shrinkwrap #1581
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Due to the introduction of 'file:' dependencies to wp-calypso master, this change pins the dependency to a snapshot of a dedicated branch.
This was referenced Feb 20, 2019
marcinbot
approved these changes
Feb 21, 2019
Agreed – should have mentioned that the Calypso branch plan was proposed by @DanReyLop in p9oQ9f-7S-p2 #comment-198. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Due to the introduction of
file:dependencies to wp-calypso in Automattic/wp-calypso@b4baa44, the dependency tracks a dedicated branch (feature/woocommerce-services-dependency) off of that commit's parent, rather than a snapshot of the master branch. For now, we willcherry-pickdesired commits frommasterto this branch.Note: I considered specifying the branch itself rather than a particular commit, as I figured we will essentially have full control over that branch, but in fact we will still benefit from a review process for introducing Calypso changes to the plugin build (and from stable builds in general, as @DanReyLop pointed out).
These commits have been cherry-picked to that branch, and included in this update:
Also, Automattic/wp-calypso@a0b2026 (prior to the branching) fixes a color scheme bug in which the "Buy & Print" button was
var( --color-accent )but its busy state was still$blue-medium.