Skip to content

Commit

Permalink
fix: migrate to storybook 6 (#771)
Browse files Browse the repository at this point in the history
* fix: migrate to storybook 6
* fix: use .js for babelrc
* fix: force the use of an older version of styled-jsx
* fix: force the use of ui @ 6
  • Loading branch information
martinkrulltott authored Jan 19, 2021
1 parent 1a53c6a commit 49e0f0a
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 142 deletions.
5 changes: 0 additions & 5 deletions .storybook/.babelrc

This file was deleted.

7 changes: 7 additions & 0 deletions .storybook/.babelrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const babelPath = require.resolve(
'@dhis2/cli-app-scripts/config/app.babel.config.js'
)

module.exports = {
extends: babelPath,
}
33 changes: 0 additions & 33 deletions .storybook/config.js

This file was deleted.

5 changes: 2 additions & 3 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = {
addons: [
'@storybook/preset-create-react-app'
],
addons: ['@storybook/preset-create-react-app'],
stories: ['../src/**/*.stories.@(js|mdx)'],
}
24 changes: 24 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react'
import { CssReset } from '@dhis2/ui-core'

export const decorators = [
Story => (
<div>
<CssReset />
<Story />
<style jsx>{`
:global(html) {
height: 100%;
}
:global(body) {
height: 100%;
min-height: 100%;
}
:global(#root) {
height: 100%;
padding: 16px;
}
`}</style>
</div>
),
]
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@dhis2/cli-style": "^7.2.2",
"@dhis2/d2-i18n": "^1.0.6",
"@sambego/storybook-state": "^2.0.1",
"@storybook/addons": "^5.3.21",
"@storybook/preset-create-react-app": "^2.1.2",
"@storybook/addons": "^6.1.14",
"@storybook/preset-create-react-app": "^3.1.5",
"@storybook/react": "^6.1.14",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.15.5",
Expand Down Expand Up @@ -61,5 +61,8 @@
},
"files": [
"build"
]
],
"resolutions": {
"@dhis2/ui": "^6.1.3"
}
}
128 changes: 30 additions & 98 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
dependencies:
"@babel/types" "^7.12.7"

"@babel/helper-module-imports@7.12.5", "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
Expand Down Expand Up @@ -1555,31 +1555,13 @@
dependencies:
prop-types "^15"

"@dhis2/ui-constants@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.7.8.tgz#3356de03c5e9ddc0b5fac5087df8ccd97f0dc3c0"
integrity sha512-Ca9PvKP8s0jcWtqLl5tyAyhoy0F6rAohAiLvoJvRmx1M7lXzxwpHjLZnaQ4b1js3tn7BPB7HRdvv+SREqYY+PA==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-constants@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-6.1.3.tgz#04f10f0e5439cea8d4db750d457ce0ed8d79f563"
integrity sha512-7EzkkUiG62WKlrxGFi5DbQsF82JSFdGPXfnGCNv+P9Tw1c5cho2BBhIuYpkF5nkokMLmwwOvkp5u/P2KM44lNQ==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-core@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.7.8.tgz#063f8a10e583803d8b85d168ddbfb52e1f72750b"
integrity sha512-ijmXT8QlBS6RjHsbPOsBzaAb9j5DOvQeoLkhFo5eQZswavug2gW+S/Vh2tgxfNP8gybZ0tHKaJXeXN3bkg7Xnw==
dependencies:
"@dhis2/prop-types" "^1.6.4"
"@popperjs/core" "^2.5.3"
classnames "^2.2.6"
react-popper "^2.2.3"
resize-observer-polyfill "^1.5.1"

"@dhis2/ui-core@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-6.1.3.tgz#3a4be4763e599708d56fa8576b4519048d97f267"
Expand All @@ -1591,16 +1573,6 @@
react-popper "^2.2.3"
resize-observer-polyfill "^1.5.1"

"@dhis2/ui-forms@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-5.7.8.tgz#7b4489b796e2a79bebd1a24b8c1df59103e566c0"
integrity sha512-8c7IKJAqGL+IIZ7sjUbTrlwGHFpwX6KfF8eToDxXkkNONyyRIiFo7uVI43+rHii7+WmFwEhacWWjeYhfVBICfg==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"
final-form "^4.20.1"
react-final-form "^6.5.1"

"@dhis2/ui-forms@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-6.1.3.tgz#02e843e51b6d27fb1ec351b42d91fa510f15b481"
Expand All @@ -1611,28 +1583,13 @@
final-form "^4.20.1"
react-final-form "^6.5.1"

"@dhis2/ui-icons@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.7.8.tgz#cb18c1bfbbcf49b2dae4c2b3ff7a3aeff46aa7f2"
integrity sha512-3P/Ptsf6HEdi0q8q6ba4Hcr8yuK+Y29PJn1Z56IZNZ+sZmFYiU7vxk5aMwA+s1EnjcPWQjrdwLzqqBAJE2W3Qg==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-icons@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-6.1.3.tgz#c813fe5adfa8306943431f5ed7c60def06c25d54"
integrity sha512-0whrQPCaEVB5V1GVNl3GO0m3oE1RAIuTHxF38ZVwcOy20NX2+wcwvPUUxAcm4RvIkhfc/eACEmCYTajLt/BpjA==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-widgets@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.7.8.tgz#77318381dd92848f9ab2cbc5414a2b57599309fe"
integrity sha512-QVLOdB836uUXBRw4OT6x/z1WR7j2ykxpMyat4g9sOXngj6t9+2UXZUO7Zegudj/HsZjTMDiN9A285zwxsd+khQ==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"

"@dhis2/ui-widgets@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-6.1.3.tgz#19a475572a69e4f712dbca66105c0cb2f58c5539"
Expand All @@ -1641,18 +1598,7 @@
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"

"@dhis2/ui@^5.7.2":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-5.7.8.tgz#17604580d02cd4a7756552154a089e730a0fdf02"
integrity sha512-FHyTP6geAkR/jwX1/xG8yl8PvGaNhms8zUmaNiBLQ0mUmD9oJb47U8YXhJ5nVd0SFJnmuckOWgAWMt3meZGJTA==
dependencies:
"@dhis2/ui-constants" "5.7.8"
"@dhis2/ui-core" "5.7.8"
"@dhis2/ui-forms" "5.7.8"
"@dhis2/ui-icons" "5.7.8"
"@dhis2/ui-widgets" "5.7.8"

"@dhis2/ui@^6.1.3":
"@dhis2/ui@^5.7.2", "@dhis2/ui@^6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.1.3.tgz#b5b319dfae64d1b136d0d226bda42b5322b6e5f2"
integrity sha512-aibDs4p2RaIPOQcAAYMej19rGmayQPBLeG0PaFfikSPHYFszG5BN+83uQEk7I7S9bv1cP/sI9YYghlw0V15L/g==
Expand Down Expand Up @@ -2279,7 +2225,7 @@
schema-utils "^2.6.5"
source-map "^0.7.3"

"@popperjs/core@^2.5.3", "@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
"@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f"
integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw==
Expand Down Expand Up @@ -2365,7 +2311,7 @@
global "^4.3.2"
util-deprecate "^1.0.2"

"@storybook/addons@6.1.14":
"@storybook/addons@6.1.14", "@storybook/addons@^6.1.14":
version "6.1.14"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.1.14.tgz#2b81304bbe696923df95cdcf85cfc592d10f4065"
integrity sha512-HlpmV7aejp/MeW8bo/WKME3i71gi0men9qcwoovjDjnSF6jXoNLT336a5udKXdHqYSZgzdyURlgLtilCWkWaJQ==
Expand All @@ -2380,7 +2326,7 @@
global "^4.3.2"
regenerator-runtime "^0.13.7"

"@storybook/addons@^5.3.21", "@storybook/addons@^5.3.3":
"@storybook/addons@^5.3.3":
version "5.3.21"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.21.tgz#ee312c738c33e8c34dc11777ef93522c3c36e56a"
integrity sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==
Expand Down Expand Up @@ -2853,17 +2799,6 @@
dependencies:
lodash "^4.17.15"

"@storybook/node-logger@*", "@storybook/node-logger@6.1.14":
version "6.1.14"
resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.14.tgz#e5294f986e3ec5c67b2738895b9d16c9a2b667fa"
integrity sha512-3jrw7coAwFXZu4qK1vm54bCPhNRvxjG+7jISbhhocDoNIv0nLWL3+tJyrC5/k/XHQiUlLkhEzpMaASADmkttNw==
dependencies:
"@types/npmlog" "^4.1.2"
chalk "^4.0.0"
core-js "^3.0.1"
npmlog "^4.1.2"
pretty-hrtime "^1.0.3"

"@storybook/node-logger@5.3.18":
version "5.3.18"
resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.18.tgz#ee278acb8b6f10d456a24c0ff6d59818a0c3ad94"
Expand All @@ -2876,16 +2811,28 @@
pretty-hrtime "^1.0.3"
regenerator-runtime "^0.13.3"

"@storybook/preset-create-react-app@^2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-2.1.2.tgz#7fd563768c5a4441ce8550e117cc435722e772fe"
integrity sha512-bynFJDAVDzyfu+NEPXYMNUBRxm6ib4FgPBWComW+f+ULVWDjv8Mmq5qKMI/vPhixXAvffYRt9HB49V0f8kFxiw==
"@storybook/node-logger@6.1.14":
version "6.1.14"
resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.14.tgz#e5294f986e3ec5c67b2738895b9d16c9a2b667fa"
integrity sha512-3jrw7coAwFXZu4qK1vm54bCPhNRvxjG+7jISbhhocDoNIv0nLWL3+tJyrC5/k/XHQiUlLkhEzpMaASADmkttNw==
dependencies:
"@types/npmlog" "^4.1.2"
chalk "^4.0.0"
core-js "^3.0.1"
npmlog "^4.1.2"
pretty-hrtime "^1.0.3"

"@storybook/preset-create-react-app@^3.1.5":
version "3.1.5"
resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-3.1.5.tgz#af46c9d64c384980d458fe99c10dcbaa623f93fd"
integrity sha512-tzYcCRD5j22/HoDZ1tvsKaVnzyd4qqTE9sn3cx56Reb0XHcm4XkvG87jx0NvBGPCZrsThyBAtB3+XNxoFbI+9Q==
dependencies:
"@storybook/node-logger" "*"
"@types/babel__core" "^7.1.6"
"@types/webpack" "^4.41.7"
"@types/babel__core" "^7.1.7"
"@types/webpack" "^4.41.13"
babel-plugin-react-docgen "^4.1.0"
pnp-webpack-plugin "^1.6.4"
semver "^7.1.3"
react-docgen-typescript-plugin "^0.6.2"
semver "^7.3.2"

"@storybook/react@^5.3.3":
version "5.3.18"
Expand Down Expand Up @@ -3347,7 +3294,7 @@
resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==

"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.6", "@types/babel__core@^7.1.7":
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.7":
version "7.1.12"
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
Expand Down Expand Up @@ -3677,7 +3624,7 @@
"@types/source-list-map" "*"
source-map "^0.6.1"

"@types/webpack@^4.41.7", "@types/webpack@^4.41.8":
"@types/webpack@^4.41.13", "@types/webpack@^4.41.8":
version "4.41.26"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef"
integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==
Expand Down Expand Up @@ -4898,7 +4845,7 @@ babel-plugin-named-asset-import@^0.3.1, babel-plugin-named-asset-import@^0.3.7:
resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==

babel-plugin-react-docgen@^4.0.0, babel-plugin-react-docgen@^4.2.1:
babel-plugin-react-docgen@^4.0.0, babel-plugin-react-docgen@^4.1.0, babel-plugin-react-docgen@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b"
integrity sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==
Expand Down Expand Up @@ -16230,7 +16177,7 @@ semver@7.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==

semver@7.3.2, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
semver@7.3.2, semver@^7.2.1, semver@^7.3.2:
version "7.3.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
Expand Down Expand Up @@ -17041,7 +16988,7 @@ style-loader@1.3.0, style-loader@^1.0.0, style-loader@^1.2.1:
loader-utils "^2.0.0"
schema-utils "^2.7.0"

styled-jsx@3.3.2:
styled-jsx@3.3.2, styled-jsx@^3.2.2, styled-jsx@^3.2.5:
version "3.3.2"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.3.2.tgz#2474601a26670a6049fb4d3f94bd91695b3ce018"
integrity sha512-daAkGd5mqhbBhLd6jYAjYBa9LpxYCzsgo/f6qzPdFxVB8yoGbhxvzQgkC0pfmCVvW3JuAEBn0UzFLBfkHVZG1g==
Expand All @@ -17055,21 +17002,6 @@ styled-jsx@3.3.2:
stylis "3.5.4"
stylis-rule-sheet "0.0.10"

styled-jsx@^3.2.2, styled-jsx@^3.2.5:
version "3.4.1"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.4.1.tgz#5b12c5e841cec3d7310f5ab6b94c3c8df665caf5"
integrity sha512-Jl1pcQVTnHdsfePHxZ0GgxxgU3+KgiDKj9QTp2vZ0eifg2cgNV5RFdgfxcXvJyspsynUhF32opNZ4jmM1EIROA==
dependencies:
"@babel/helper-module-imports" "7.12.5"
"@babel/types" "7.8.3"
babel-plugin-syntax-jsx "6.18.0"
convert-source-map "1.7.0"
loader-utils "1.2.3"
source-map "0.7.3"
string-hash "1.1.3"
stylis "3.5.4"
stylis-rule-sheet "0.0.10"

stylehacks@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
Expand Down

0 comments on commit 49e0f0a

Please sign in to comment.