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

Stylis v4 #1817

Merged
merged 25 commits into from
Jun 22, 2020
Merged

Stylis v4 #1817

merged 25 commits into from
Jun 22, 2020

Conversation

Andarist
Copy link
Member

This is not ready by any means - just an initial attempt at using new Stylis.

It looks really promising, when preparing this I've found some minor problems with Stylis v4, for most of them I've already opened PRs against Stylis. The biggest unsolved problem right now is prefixing by adding a completely new rule (adding webkit keyframes) in combination with rulesheet plugin. Truth to be told - I'm not even sure if we really need this, but from Stylis perspective it should be possible to do this nevertheless.

cc @mitchellhamilton

@changeset-bot
Copy link

changeset-bot bot commented Mar 20, 2020

🦋 Changeset is good to go

Latest commit: 2ec872c

We got this.

This PR includes changesets to release 13 packages
Name Type
@emotion/babel-plugin Major
@emotion/sheet Major
@emotion/cache Major
@emotion/css Major
@emotion/react Major
@emotion/styled Major
@emotion/utils Major
@emotion/server Major
@emotion/jest Major
@emotion/primitives-core Major
@emotion/serialize Patch
@emotion/native Major
@emotion/primitives Major

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

packages/cache/src/index.js Outdated Show resolved Hide resolved
packages/cache/src/index.js Outdated Show resolved Hide resolved
@codesandbox-ci
Copy link

codesandbox-ci bot commented Mar 20, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 2ec872c:

Sandbox Source
Emotion Configuration

@codecov
Copy link

codecov bot commented Mar 25, 2020

Codecov Report

Merging #1817 into next will increase coverage by 0.02%.
The diff coverage is 99.21%.

Impacted Files Coverage Δ
packages/utils/src/index.js 100.00% <ø> (ø)
packages/sheet/src/index.js 97.50% <75.00%> (-2.50%) ⬇️
packages/babel-plugin/src/utils/minify.js 100.00% <100.00%> (ø)
...ugin/src/utils/transform-expression-with-styles.js 95.74% <100.00%> (-0.09%) ⬇️
packages/cache/src/index.js 97.18% <100.00%> (-0.82%) ⬇️
packages/cache/src/stylis-plugins.js 100.00% <100.00%> (ø)
packages/css/test/instance/emotion-instance.js 100.00% <100.00%> (ø)
packages/jest/src/serializer.js 97.67% <0.00%> (-2.33%) ⬇️

Copy link
Member

@emmatown emmatown left a comment

Choose a reason for hiding this comment

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

This is looking great!! 🎉 🎉

packages/cache/src/stylis-plugins.js Show resolved Hide resolved
packages/jest/test/printer.test.js Show resolved Hide resolved
@@ -7,7 +7,7 @@ exports[`ssr @import 1`] = `
<div class="css-1lrxbo5">
</div>
<style data-emotion="css-global 1sh9nmh">
@import url('https://some-url');h1{color:hotpink;}
h1{color:hotpink;}@import url('https://some-url');
Copy link
Member

Choose a reason for hiding this comment

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

@import has to be the first rule(or at least before non @import rules) when using insertRule, could you check if this not being first here is fine?

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 probably is not - I've changed tests to always put @import first: 2d95e2c

Stylis v3 was special-casing this and it actually has moved import rules to the first position when compiling, v4 doesn't do that anymore. It seems to me that it's a valid approach to just require from the user to put those first "manually". Special-casing this would require from us writing a special stylis plugin for the server path - IMHO it's not worth it.

If we decide this being a requirement on the consumer side then this special case could be dropped I think:

let isImportRule =

@import rules should not occur in the scoped styles and for global ones they should just be put first. Keep also in mind that @charset should have even higher priority than @import and we do not special case it anyway - it's way less common though.

Copy link
Member

Choose a reason for hiding this comment

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

Keep also in mind that @charset should have even higher priority than @import and we do not special case it anyway - it's way less common though.

Yeah, I'm not super worried about @charset given I've never seen anyone use it.

Okay - I think I'm fine with requiring @import be first and only be in Global. We definitely need a better error than what we would have if we just removed the isImportRule stuff though.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, I've pushed out changes around this - together with new dev-only warnings for incorrect inputs.

packages/stylis/src/index.js Outdated Show resolved Hide resolved
packages/stylis/src/index.js Outdated Show resolved Hide resolved
packages/cache/src/index.js Outdated Show resolved Hide resolved
packages/cache/src/index.js Outdated Show resolved Hide resolved
@Andarist
Copy link
Member Author

Just realized a problem with the @import thing. It will mean that this will be broken:

Good catch, I totally have missed this breaking the vanilla emotion.

I like the idea of making each injectGlobal having its own style tag (it would nicely match how <Global/> behaves) but when I think about it then it seems to complicate the APIs around flushing and .sheet access (although I'm not completely sure why .sheet is available directly). As to flushing - we could maintain a list of sheets inside @emotion/css to flush them all? I have also thought about how this would play with rehydration etc but at the first glance this doesn't seem to be problematic. From what I understand calling hydrate is required anyway and it inserts ids into a cache, not sheets, so everything is fine.

@emmatown
Copy link
Member

calling hydrate is required anyway and it inserts ids into a cache, not sheets, so everything is fine.

This isn't true, the same auto-hydration that happens for @emotion/react happens here.


So I just ran this code

const { injectGlobal } = require("emotion");
const { renderStylesToString } = require("emotion-server");

injectGlobal`.thing {display:flex;}`;

injectGlobal`@import 'custom.css';`;

console.log(renderStylesToString(""));

It outputs

<style data-emotion-css="njnz1q mndbu7">.thing{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}@import 'custom.css';</style>

So I'm kind of just inclined to say "@imports must only happen in the first injectGlobal call in your app" and then all of our problems are solved right? As long as we error with a nice message when this happens, I'm okay with it.

@Andarist
Copy link
Member Author

This isn't true, the same auto-hydration that happens for @emotion/react happens here.

You are right, it seems like hydrate is not needed at all then?

So I'm kind of just inclined to say "@imports must only happen in the first injectGlobal call in your app" and then all of our problems are solved right?

If we assume that @import cant be lazily inserted during a page's lifetime - then yeah, there is no problem.

As long as we error with a nice message when this happens, I'm okay with it.

Okay - gonna improve this error a little bit tomorrow:

'`@import` rules must be inserted before other rules.'

@emmatown
Copy link
Member

You are right, it seems like hydrate is not needed at all then?

#1876 (comment)

@Andarist
Copy link
Member Author

@mitchellhamilton I've improved the errors logged on incorrect @import usage in the latest commit: a1d7173 . Please take a look if this looks good to you. We also have other, somewhat lighter/more-specific warnings concerned with a single stylis call which you can check out in action here:

test('@import nested in scoped `css`', () => {
renderer.create(
<div
css={css`
@import url('https://some-url');
h1 {
color: hotpink;
}
`}
/>
)
expect((console.error: any).mock.calls).toMatchInlineSnapshot(`
Array [
Array [
"\`@import\` rules can't be nested inside other rules. Please move it to the top and put it before regular rules. Keep in mind that they can only be used within global styles.",
],
]
`)
})
test('@import prepended with other rules', () => {
renderer.create(
<Global
styles={css`
h1 {
color: hotpink;
}
@import url('https://some-url');
`}
/>
)
expect((console.error: any).mock.calls).toMatchInlineSnapshot(`
Array [
Array [
"\`@import\` rules can't be preceded by regular rules. Please put it before them.",
],
]
`)
})
test('@import prepended by other @import', () => {
renderer.create(
<Global
styles={css`
@import url('https://some-url');
@import url('https://some-url2');
`}
/>
)
expect((console.error: any).mock.calls).toMatchInlineSnapshot(`Array []`)
})
, this new commit improves a situation when @import gets inserted incorrectly between stylis calls. Keep also in mind that this mostly affects vanilla Emotion users as @emotion/react scopes <Global/> styles to separate <style/> elements.

I believe this was the last remaining item here so if you approve this then we should finally be ready to merge this 🎉

Copy link
Member

@emmatown emmatown left a comment

Choose a reason for hiding this comment

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

Just some little nits. I assume you're gonna update docs in another PR or something?

)
}

;(this: any)._alreadyInsertedOrderInsensitiveRule =
Copy link
Member

Choose a reason for hiding this comment

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

Not really a blocker but why not make this an optional property on the class?

Copy link
Member Author

Choose a reason for hiding this comment

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

Just a minor difference - an optional property would be visible as part of the public type and we don't need it to be there.

packages/sheet/src/index.js Outdated Show resolved Hide resolved

- plugins written for the former Stylis v3 are not compatible with the new version. To learn more on how to write a plugin for Stylis v4 you can check out its [README](https://github.com/thysultan/stylis.js#middleware) and the source code of core plugins.
- vendor-prefixing was previously customizable using `prefix` option. This was always limited to turning off all of some of the prefixes as all available prefixes were on by default. The `prefix` option is gone and to customize which prefixes are applied you need to fork (copy-paste) the prefixer plugin and adjust it to your needs. While this being somewhat more problematic to setup at first we believe that the vast majority of users were not customizing this anyway. By not including the possibility to customize this through an extra option the final solution is more performant because there is no extra overhead of checking if a particular property should be prefixed or not.
- Prefixer is now just a plugin which happens to be put in default `stylisPlugins`. If you plan to use custom `stylisPlugins` and you want to have your styles prefixed automatically you must include prefixer in your custom `stylisPlugins`.
Copy link
Member

Choose a reason for hiding this comment

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

You should tell users where to get the default prefixer from here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Added such mention just now.

.changeset/warm-ties-drop.md Outdated Show resolved Hide resolved
packages/cache/src/stylis-plugins.js Outdated Show resolved Hide resolved
packages/cache/src/stylis-plugins.js Outdated Show resolved Hide resolved
@Andarist
Copy link
Member Author

Andarist commented Jun 14, 2020

I assume you're gonna update docs in another PR or something?

Do you have anything in mind that needs to be documented besides vendor-prefixing stuff covered by those 2nd and 3rd points of this changeset:

- vendor-prefixing was previously customizable using `prefix` option. This was always limited to turning off all of some of the prefixes as all available prefixes were on by default. The `prefix` option is gone and to customize which prefixes are applied you need to fork (copy-paste) the prefixer plugin and adjust it to your needs. While this being somewhat more problematic to setup at first we believe that the vast majority of users were not customizing this anyway. By not including the possibility to customize this through an extra option the final solution is more performant because there is no extra overhead of checking if a particular property should be prefixed or not.
- Prefixer is now just a plugin which happens to be put in default `stylisPlugins`. If you plan to use custom `stylisPlugins` and you want to have your styles prefixed automatically you must include prefixer in your custom `stylisPlugins`. You can import `prefixer` from the `stylis` module to do that.

@emmatown
Copy link
Member

@zenininja
Copy link

Stylis upgrade seems to have broken the React Native compatibility :(. Please check here #1986

louisgv pushed a commit to louisgv/emotion that referenced this pull request Sep 6, 2020
* Stylis v4 tryout

* Move @import rules in test to be first

* Improved compat plugin

* Add tests for orphanated pseudos

* orphanated -> orphaned

* Upgrade stylis and improve compat plugin

* Improve compat plugin - avoid double compilation

* Shorten compat plugin a little bit

* Add guard for global top-level rules in the compat plugin

* Fix tagged templates minifier (emotion-js#1836)

* Add TS test to check for excessive instantiation regressions

* Fix tagged templates minifier

* Use non-forked stylis for minification

* Pass missing argument to toInputTree and fix isAutoInsertedRule for parent-less rules

* Temporarily add @emotion/stylis as dep of @emotion/babel-plugin

* Update snapshots

* Make compat plugin be always included

* move removeLabel into omnipresentPlugins

* Stop special-casing @import insertion

* fix getServerStylisCache

* Remove outdated docs around stylisPlugins and prefix options

* Add changesets

* Add note about prefixer being just a plugin to stylisPlugins docs

* Actually use officially published Stylis v4

* Improve error message about incorrect @import insertion

* Fix flow errors

* Reword error messages and changeset content

Co-authored-by: Mitchell Hamilton <mitchell@hamil.town>

* update snapshots

* Remove mention of `@import` not being usable in `css` calls as it wasnt true for @emotion/react+<Global/>

* Add mention to the changeset about where one can find a prefixer

* Update .changeset/warm-ties-drop.md

Co-authored-by: Mitchell Hamilton <mitchell@hamil.town>
@github-actions github-actions bot mentioned this pull request Nov 10, 2020
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.

None yet

4 participants