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

Import new location for base styles #1435

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Conversation

koke
Copy link
Member

@koke koke commented Oct 11, 2019

In WordPress/gutenberg#17883 the base SCSS styles are moving to a separate package. This updates our SASS transformer so it knows to look for them in the new path.

This can be merged before WordPress/gutenberg#17883 since I didn't remove the old location.

To test:

Update the gutenberg submodule to WordPress/gutenberg#17883 and see if everything runs correctly

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

@koke koke added the Tooling label Oct 11, 2019
@koke koke added this to the 1.15 milestone Oct 11, 2019
@koke koke requested a review from Tug October 11, 2019 07:53
@@ -67,6 +67,7 @@ if ( reactNativeMinorVersion >= 59 ) {
const autoImportIncludePaths = [
path.join( path.dirname( __filename ), 'src' ),
path.join( path.dirname( __filename ), 'gutenberg/assets/stylesheets' ),
Copy link
Contributor

Choose a reason for hiding this comment

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

This line can be removed.

Suggested change
path.join( path.dirname( __filename ), 'gutenberg/assets/stylesheets' ),

Copy link
Member Author

Choose a reason for hiding this comment

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

It can, after WordPress/gutenberg#17883 is merged 😉
I left that so we don't have to coordinate merging both PRs. Once the base-styles are merged, we can remove that line in another PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's a good strategy in this case to keep both the "old" and the new paths so we smoothly transition to the new one. I'm approving this PR, but let us know if you have some more feedback here @gziolo and we can address it in the follow up PR.

Copy link
Contributor

@hypest hypest left a comment

Choose a reason for hiding this comment

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

LGTM!

Tested both with and without WordPress/gutenberg#17883 in place.

And good to see this fix land before the web-side change lands, thanks Koke!

@hypest hypest merged commit 9db0e46 into develop Oct 14, 2019
@hypest hypest deleted the add/package-base-styles branch October 14, 2019 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants