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.

Sign up for GitHub

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

Jump to bottom

Migration to Emotion 11 #17640

Merged
merged 20 commits into from Apr 7, 2022
Merged

Migration to Emotion 11 #17640

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
50b1731
Update Emotion deps
Andarist Mar 6, 2022
c2b6cd0
Copy over Emotion 10 styles
Andarist Mar 9, 2022
e9dfab4
Fix types for theme-related APIs
Andarist Mar 18, 2022
1d761c2
Merge branch 'next' into emotion11
Andarist Mar 18, 2022
18a8e84
update snapshots
Andarist Mar 18, 2022
729a870
Fixed an issue with some snapshotSerializers being applied more than …
Andarist Mar 19, 2022
2c16154
Merge branch 'next' into emotion11
Andarist Mar 31, 2022
ccbb7f4
Add a TODO comment
Andarist Mar 31, 2022
8b1f7bd
Merge branch 'next' into emotion11
Andarist Mar 31, 2022
ca1b4b6
Merge branch 'next' into emotion11
ndelangen Mar 31, 2022
54520ee
Merge branch 'next' into emotion11
ndelangen Mar 31, 2022
030b20c
Merge branch 'next' into emotion11
shilman Mar 31, 2022
fc7fd5e
Merge branch 'next' into emotion11
Andarist Apr 5, 2022
e7d45b8
make `useTheme` generic again to avoid a breaking change
Andarist Apr 5, 2022
1c16897
update snapshot
Andarist Apr 5, 2022
bf47ce5
Merge branch 'next' into emotion11
ndelangen Apr 7, 2022
5b75d9b
Merge branch 'emotion11' of github.com:storybookjs/storybook into emo…
ndelangen Apr 7, 2022
853d2d9
corrections on versions
ndelangen Apr 7, 2022
1572813
Merge branch 'next' into emotion11
ndelangen Apr 7, 2022
a263bf7
fix versions.ts
ndelangen Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .babelrc.js
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ module.exports = {
'@babel/plugin-syntax-dynamic-import',
['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
'babel-plugin-macros',
['emotion', { sourceMap: true, autoLabel: true }],
['@emotion', { sourceMap: true, autoLabel: 'always' }],
],
env: {
test: withTests,
Expand Down Expand Up @@ -90,7 +90,7 @@ module.exports = {
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
'babel-plugin-macros',
['emotion', { sourceMap: true, autoLabel: true }],
['@emotion', { sourceMap: true, autoLabel: 'always' }],
'babel-plugin-add-react-displayname',
],
env: {
Expand Down Expand Up @@ -125,7 +125,7 @@ module.exports = {
],
],
plugins: [
'emotion',
'@emotion',
'babel-plugin-macros',
'@babel/plugin-transform-arrow-functions',
'@babel/plugin-transform-shorthand-properties',
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-core/package.json
View file
Open in desktop
Expand Up @@ -69,6 +69,7 @@
"devDependencies": {
"@angular/core": "^11.2.0",
"@angular/platform-browser-dynamic": "^11.2.0",
"@emotion/jest": "^11.8.0",
"@storybook/addon-docs": "6.5.0-alpha.51",
"@storybook/angular": "6.5.0-alpha.51",
"@storybook/react": "6.5.0-alpha.51",
Expand All @@ -77,7 +78,6 @@
"babel-loader": "^8.0.0",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.1",
"jest-emotion": "^10.0.32",
"jest-preset-angular": "^8.3.2",
"jest-vue-preprocessor": "^1.7.1",
"rxjs": "^6.6.3",
Expand Down
3 changes: 0 additions & 3 deletions addons/storyshots/storyshots-core/stories/storyshot.enzyme.test.js
View file
Open in desktop
@@ -1,12 +1,9 @@
import path from 'path';
import { mount } from 'enzyme';
import { createSerializer as enzymeSerializer } from 'enzyme-to-json';
import { createSerializer as emotionSerializer } from 'jest-emotion';
import initStoryshots from '../dist/ts3.9';

initStoryshots({
framework: 'react',
configPath: path.join(__dirname, '..', '.storybook'),
renderer: mount,
snapshotSerializers: [enzymeSerializer(), emotionSerializer()],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was creating an infinite loop because the emotion serializer is already used in the root jest.config.js and this config was merged with this one here. As the result - 2 emotion serializers were applied here and this messed them up.

More details can be found here:
emotion-js/emotion#2704

});
3 changes: 0 additions & 3 deletions app/angular/src/server/framework-preset-angular-cli.test.ts
View file
Open in desktop
Expand Up @@ -797,9 +797,6 @@ const newWebpackConfiguration = (
modules: ['node_modules'],
mainFields: ['browser', 'main'],
alias: {
'@emotion/core': '/Users/joe/storybook/node_modules/@emotion/core',
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
'@emotion/styled': '/Users/joe/storybook/node_modules/@emotion/styled',
'emotion-theming': '/Users/joe/storybook/node_modules/emotion-theming',
'@storybook/addons': '/Users/joe/storybook/lib/addons',
'@storybook/api': '/Users/joe/storybook/lib/api',
'@storybook/channels': '/Users/joe/storybook/lib/channels',
Expand Down
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
"storyshots-puppeteer": "yarn run build-storybook && yarn run do-storyshots-puppeteer"
},
"devDependencies": {
"@emotion/jest": "^11.8.0",
"@packtracker/webpack-plugin": "^2.3.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
"@storybook/addon-a11y": "6.5.0-alpha.51",
Expand Down Expand Up @@ -49,7 +50,6 @@
"express": "^4.17.1",
"format-json": "^1.0.3",
"global": "^4.4.0",
"jest-emotion": "^10.0.32",
"lodash": "^4.17.21",
"paths.macro": "^3.0.1",
"prop-types": "^15.7.2",
Expand Down