From ffa8ce140a0138d410edb0ab720bdb6aa5c42002 Mon Sep 17 00:00:00 2001 From: Wenche Tollevsen Date: Mon, 9 Nov 2020 10:07:46 +0100 Subject: [PATCH] Get the storefront up and running again after Typescript migration (#846) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🚧 Work in progress Stuck on styled.css.withConfig is not a function * 🚧 Try to get storefront up and running again Try to get storefront up and running again -m Strange things are happening with styled.css.withConfig, had to disable the displayName in the config to avoid the error. Should not be necassary * ♻️ Swap the props table component with a generel link to storybook * ➕ Use EDS from npm instead of local version. --- .npmrc | 2 +- .../docs/components/accordion/usage.mdx | 4 +- .../docs/components/buttons/usage.mdx | 2 +- .../docs/components/cards/usage.mdx | 10 +- .../docs/components/chips/usage.mdx | 2 +- .../docs/components/divider/usage.mdx | 2 +- .../docs/components/lists/usage.mdx | 4 +- .../navigation-table-of-contents/usage.mdx | 4 +- .../docs/components/navigation-tabs/usage.mdx | 10 +- .../components/navigation-top-bar/usage.mdx | 8 +- .../components/notification-banner/usage.mdx | 8 +- .../components/notification-dialog/usage.mdx | 8 +- .../notification-snackbar/usage.mdx | 4 +- .../docs/components/popovers/usage.mdx | 8 +- .../components/progress-indicators/usage.mdx | 8 +- .../docs/components/scrim/usage.mdx | 2 +- .../docs/components/search/usage.mdx | 2 +- .../components/selection-controls/usage.mdx | 6 +- .../docs/components/side-sheet/usage.mdx | 2 +- .../docs/components/slider/usage.mdx | 2 +- .../docs/components/table/usage.mdx | 10 +- .../docs/components/text-fields/usage.mdx | 2 +- .../docs/components/tooltip/usage.mdx | 2 +- apps/storefront/doczrc.js | 1 + apps/storefront/gatsby-config.js | 5 +- apps/storefront/package.json | 7 +- apps/storefront/pnpm-lock.yaml | 143 ++++++++++++++++-- apps/storefront/src/components/PropsTable.jsx | 18 ++- package.yaml | 1 + 29 files changed, 214 insertions(+), 73 deletions(-) diff --git a/.npmrc b/.npmrc index 87ee044683..b8ae6429c5 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ shared-workspace-shrinkwrap = true -link-workspace-packages = true +link-workspace-packages = false package-lock = true diff --git a/apps/storefront/docs/components/accordion/usage.mdx b/apps/storefront/docs/components/accordion/usage.mdx index 339b332360..12cb2ef2c8 100644 --- a/apps/storefront/docs/components/accordion/usage.mdx +++ b/apps/storefront/docs/components/accordion/usage.mdx @@ -47,8 +47,8 @@ import { Accordion } from '@equinor/eds-core-react' ### Accordion - + ### AccordionItem - + diff --git a/apps/storefront/docs/components/buttons/usage.mdx b/apps/storefront/docs/components/buttons/usage.mdx index b64615282c..760668626d 100644 --- a/apps/storefront/docs/components/buttons/usage.mdx +++ b/apps/storefront/docs/components/buttons/usage.mdx @@ -37,4 +37,4 @@ import { Button } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/cards/usage.mdx b/apps/storefront/docs/components/cards/usage.mdx index 76711b6caa..328350f4c7 100644 --- a/apps/storefront/docs/components/cards/usage.mdx +++ b/apps/storefront/docs/components/cards/usage.mdx @@ -45,20 +45,20 @@ import { Card } from '@equinor/eds-core-react' ### Card - + ### CardHeader - + ### CardHeaderTitle - + ### CardMedia - + ### CardActions - + diff --git a/apps/storefront/docs/components/chips/usage.mdx b/apps/storefront/docs/components/chips/usage.mdx index 9b67cc0e5c..192450ac5b 100644 --- a/apps/storefront/docs/components/chips/usage.mdx +++ b/apps/storefront/docs/components/chips/usage.mdx @@ -42,4 +42,4 @@ import { Chip } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/divider/usage.mdx b/apps/storefront/docs/components/divider/usage.mdx index 09ce68b057..0cbda065b2 100644 --- a/apps/storefront/docs/components/divider/usage.mdx +++ b/apps/storefront/docs/components/divider/usage.mdx @@ -30,4 +30,4 @@ import { Divider } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/lists/usage.mdx b/apps/storefront/docs/components/lists/usage.mdx index 1e30363d7c..cc8d1cba38 100644 --- a/apps/storefront/docs/components/lists/usage.mdx +++ b/apps/storefront/docs/components/lists/usage.mdx @@ -27,8 +27,8 @@ import { List } from '@equinor/eds-core-react' ### List - + ### ListItem - + diff --git a/apps/storefront/docs/components/navigation-table-of-contents/usage.mdx b/apps/storefront/docs/components/navigation-table-of-contents/usage.mdx index da8f3e1aec..21224b5ab4 100644 --- a/apps/storefront/docs/components/navigation-table-of-contents/usage.mdx +++ b/apps/storefront/docs/components/navigation-table-of-contents/usage.mdx @@ -36,8 +36,8 @@ import { TableOfContents } from '@equinor/eds-core-react' ### TableOfContents - + ### LinkItem - + diff --git a/apps/storefront/docs/components/navigation-tabs/usage.mdx b/apps/storefront/docs/components/navigation-tabs/usage.mdx index 491b2d1229..455b1ceca4 100644 --- a/apps/storefront/docs/components/navigation-tabs/usage.mdx +++ b/apps/storefront/docs/components/navigation-tabs/usage.mdx @@ -38,20 +38,20 @@ import { Tabs } from '@equinor/eds-core-react' ### Tabs - + ### TabList - + ### Tab - + ### TabPanels - + ### TabPanel - + diff --git a/apps/storefront/docs/components/navigation-top-bar/usage.mdx b/apps/storefront/docs/components/navigation-top-bar/usage.mdx index 406fc24ccb..26ee9d15b1 100644 --- a/apps/storefront/docs/components/navigation-top-bar/usage.mdx +++ b/apps/storefront/docs/components/navigation-top-bar/usage.mdx @@ -39,16 +39,16 @@ import { TopBar } from '@equinor/eds-core-react' ### TopBar - + ### Header - + ### CustomContent - + ### Actions - + diff --git a/apps/storefront/docs/components/notification-banner/usage.mdx b/apps/storefront/docs/components/notification-banner/usage.mdx index bc4e18e93a..29aafa59b3 100644 --- a/apps/storefront/docs/components/notification-banner/usage.mdx +++ b/apps/storefront/docs/components/notification-banner/usage.mdx @@ -41,16 +41,16 @@ import { Banner } from '@equinor/eds-core-react' ### Banner - + ### BannerMessage - + ### BannerIcon - + ### BannerActions - + diff --git a/apps/storefront/docs/components/notification-dialog/usage.mdx b/apps/storefront/docs/components/notification-dialog/usage.mdx index a324bf38ea..cbd5bb5a49 100644 --- a/apps/storefront/docs/components/notification-dialog/usage.mdx +++ b/apps/storefront/docs/components/notification-dialog/usage.mdx @@ -38,16 +38,16 @@ import { Dialog } from '@equinor/eds-core-react' ### Dialog - + ### Actions - + ### Title - + ### CustomContent - + diff --git a/apps/storefront/docs/components/notification-snackbar/usage.mdx b/apps/storefront/docs/components/notification-snackbar/usage.mdx index 6c08911553..88524b5b7f 100644 --- a/apps/storefront/docs/components/notification-snackbar/usage.mdx +++ b/apps/storefront/docs/components/notification-snackbar/usage.mdx @@ -35,8 +35,8 @@ import { Snackbar } from '@equinor/eds-core-react' ### Snackbar - + ### SnackbarAction - + diff --git a/apps/storefront/docs/components/popovers/usage.mdx b/apps/storefront/docs/components/popovers/usage.mdx index 6625128d0e..40fda79332 100644 --- a/apps/storefront/docs/components/popovers/usage.mdx +++ b/apps/storefront/docs/components/popovers/usage.mdx @@ -37,16 +37,16 @@ import { Popover } from '@equinor/eds-core-react' ### Popover - + ### PopoverAnchor - + ### PopoverTitle - + ### PopoverContent - + diff --git a/apps/storefront/docs/components/progress-indicators/usage.mdx b/apps/storefront/docs/components/progress-indicators/usage.mdx index 0054817586..d63dbbc703 100644 --- a/apps/storefront/docs/components/progress-indicators/usage.mdx +++ b/apps/storefront/docs/components/progress-indicators/usage.mdx @@ -32,16 +32,16 @@ import { ### CircularProgress - + ### DotProgress - + ### LinearProgress - + ### StarProgress - + diff --git a/apps/storefront/docs/components/scrim/usage.mdx b/apps/storefront/docs/components/scrim/usage.mdx index fb26aa0381..d10e3cfdc7 100644 --- a/apps/storefront/docs/components/scrim/usage.mdx +++ b/apps/storefront/docs/components/scrim/usage.mdx @@ -25,4 +25,4 @@ import { Scrim } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/search/usage.mdx b/apps/storefront/docs/components/search/usage.mdx index 5eab26cc17..69224d0952 100644 --- a/apps/storefront/docs/components/search/usage.mdx +++ b/apps/storefront/docs/components/search/usage.mdx @@ -38,4 +38,4 @@ import { Search } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/selection-controls/usage.mdx b/apps/storefront/docs/components/selection-controls/usage.mdx index 648aa45da5..a2c35e68f8 100644 --- a/apps/storefront/docs/components/selection-controls/usage.mdx +++ b/apps/storefront/docs/components/selection-controls/usage.mdx @@ -27,12 +27,12 @@ import { Checkbox, Switch, Radio } from '@equinor/eds-core-react' ### Switch - + ### Checkbox - + ### Radio - + diff --git a/apps/storefront/docs/components/side-sheet/usage.mdx b/apps/storefront/docs/components/side-sheet/usage.mdx index 4c87d1aef3..918e34ceef 100644 --- a/apps/storefront/docs/components/side-sheet/usage.mdx +++ b/apps/storefront/docs/components/side-sheet/usage.mdx @@ -44,4 +44,4 @@ import { SideSheet } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/slider/usage.mdx b/apps/storefront/docs/components/slider/usage.mdx index 2ed1415665..25ca94848a 100644 --- a/apps/storefront/docs/components/slider/usage.mdx +++ b/apps/storefront/docs/components/slider/usage.mdx @@ -40,4 +40,4 @@ import { Slider } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/table/usage.mdx b/apps/storefront/docs/components/table/usage.mdx index 91004e881d..3cf450c9e4 100644 --- a/apps/storefront/docs/components/table/usage.mdx +++ b/apps/storefront/docs/components/table/usage.mdx @@ -76,20 +76,20 @@ Select all the `Table` header layers and convert them to a frame/artboard by usi ### Table - + ### Head - + ### Body - + ### Row - + ### Cell - + diff --git a/apps/storefront/docs/components/text-fields/usage.mdx b/apps/storefront/docs/components/text-fields/usage.mdx index 3b36239ee8..393252c7c7 100644 --- a/apps/storefront/docs/components/text-fields/usage.mdx +++ b/apps/storefront/docs/components/text-fields/usage.mdx @@ -36,4 +36,4 @@ import { TextField } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/docs/components/tooltip/usage.mdx b/apps/storefront/docs/components/tooltip/usage.mdx index da1f8abf55..e3028c19d4 100644 --- a/apps/storefront/docs/components/tooltip/usage.mdx +++ b/apps/storefront/docs/components/tooltip/usage.mdx @@ -32,4 +32,4 @@ import { Tooltip } from '@equinor/eds-core-react' ## API - + diff --git a/apps/storefront/doczrc.js b/apps/storefront/doczrc.js index 166e01d593..54bd147dba 100644 --- a/apps/storefront/doczrc.js +++ b/apps/storefront/doczrc.js @@ -1,6 +1,7 @@ /* eslint import/no-default-export: off*/ export default { files: '**/*.mdx', + typescript: true, // will be prefixed in themeConfig: { // “The initialColorMode flag no longer works, use initialColorModeName instead” it says on https://theme-ui.com/migrating/ diff --git a/apps/storefront/gatsby-config.js b/apps/storefront/gatsby-config.js index e15fffa3e3..0dc89e344d 100644 --- a/apps/storefront/gatsby-config.js +++ b/apps/storefront/gatsby-config.js @@ -64,7 +64,10 @@ module.exports = { }, }, { - resolve: 'gatsby-plugin-styled-components', + resolve: `gatsby-plugin-styled-components`, + options: { + displayName: false, + }, }, { resolve: 'gatsby-plugin-load-script', diff --git a/apps/storefront/package.json b/apps/storefront/package.json index 75c6f286b5..aabf606893 100644 --- a/apps/storefront/package.json +++ b/apps/storefront/package.json @@ -13,12 +13,13 @@ }, "dependencies": { "@emotion/core": "^10.0.28", - "@equinor/eds-core-react": "workspace:*", - "@equinor/eds-icons": "workspace:*", - "@equinor/eds-tokens": "workspace:*", + "@equinor/eds-core-react": "^0.6.2", + "@equinor/eds-icons": "^0.4.0", + "@equinor/eds-tokens": "^0.4.0", "@mdx-js/react": "^1.6.6", "@mikaelkristiansson/domready": "^1.0.10", "@reach/router": "^1.3.4", + "babel-plugin-styled-components": "^1.11.1", "docz": "^2.3.1", "focus-visible": "^5.1.0", "gatsby": "^2.23.10", diff --git a/apps/storefront/pnpm-lock.yaml b/apps/storefront/pnpm-lock.yaml index c486a1a7f6..ceb8fc3ed9 100644 --- a/apps/storefront/pnpm-lock.yaml +++ b/apps/storefront/pnpm-lock.yaml @@ -1,11 +1,12 @@ dependencies: '@emotion/core': 10.0.28_react@16.13.1 - '@equinor/eds-core-react': 'link:../../libraries/core-react' - '@equinor/eds-icons': 'link:../../libraries/icons' - '@equinor/eds-tokens': 'link:../../libraries/tokens' + '@equinor/eds-core-react': 0.6.2_beaba6b0dd04a5acd327321cb21768d5 + '@equinor/eds-icons': 0.4.0 + '@equinor/eds-tokens': 0.4.0 '@mdx-js/react': 1.6.6_react@16.13.1 '@mikaelkristiansson/domready': 1.0.10 '@reach/router': 1.3.4_react-dom@16.13.1+react@16.13.1 + babel-plugin-styled-components: 1.11.1_styled-components@5.1.1 docz: 2.3.1_c95255344fcbf6b4c2c4015e2d9e0f3f focus-visible: 5.1.0 gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 @@ -18,7 +19,7 @@ dependencies: gatsby-plugin-offline: 3.2.17_gatsby@2.24.2 gatsby-plugin-react-helmet: 3.3.10_gatsby@2.24.2+react-helmet@6.1.0 gatsby-plugin-sharp: 2.6.19_gatsby@2.24.2 - gatsby-plugin-styled-components: 3.3.10_61d52dcf0f1a79491f6f292ce3e13f22 + gatsby-plugin-styled-components: 3.3.10_f2051772a68ce125630e64fc60cd4ad2 gatsby-react-router-scroll: 3.0.11_3914268316c542370cbb046de235e031 gatsby-source-filesystem: 2.3.19_gatsby@2.24.2 gatsby-theme-docz: 2.3.1_c95255344fcbf6b4c2c4015e2d9e0f3f @@ -139,7 +140,7 @@ packages: integrity: sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng== /@babel/helper-annotate-as-pure/7.10.4: dependencies: - '@babel/types': 7.10.4 + '@babel/types': 7.12.6 dev: false resolution: integrity: sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA== @@ -250,6 +251,12 @@ packages: dev: false resolution: integrity: sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw== + /@babel/helper-module-imports/7.12.5: + dependencies: + '@babel/types': 7.12.6 + dev: false + resolution: + integrity: sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== /@babel/helper-module-transforms/7.10.4: dependencies: '@babel/helper-module-imports': 7.10.4 @@ -1200,6 +1207,14 @@ packages: dev: false resolution: integrity: sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg== + /@babel/types/7.12.6: + dependencies: + '@babel/helper-validator-identifier': 7.10.4 + lodash: 4.17.20 + to-fast-properties: 2.0.0 + dev: false + resolution: + integrity: sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA== /@emotion/babel-plugin-jsx-pragmatic/0.1.5: dependencies: '@babel/plugin-syntax-jsx': 7.10.4 @@ -1320,6 +1335,42 @@ packages: dev: false resolution: integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== + /@equinor/eds-core-react/0.6.2_beaba6b0dd04a5acd327321cb21768d5: + dependencies: + '@equinor/eds-icons': 0.4.0 + '@equinor/eds-tokens': 0.4.0 + '@testing-library/react-hooks': 3.4.2_react@16.13.1 + focus-visible: 5.1.0 + lodash: 4.17.20 + prop-types: 15.7.2 + react: 16.13.1 + react-dom: 16.13.1_react@16.13.1 + styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + dev: false + engines: + node: '>=10.0.0' + pnpm: '>=4' + peerDependencies: + prop-types: ^15.7.2 + react: ^16.8.6 + react-dom: ^16.8.6 + styled-components: ^4.2.0 + resolution: + integrity: sha512-ZQnuevIa0czYyMN5nwLC7L3VjVvv2/LPnjqZbqxbM8gxUAEy+fM40BqC2V5n2s3UF0IvgKaJ4hb4iDlyv2Epug== + /@equinor/eds-icons/0.4.0: + dev: false + engines: + node: '>=10.0.0' + pnpm: '>=4' + resolution: + integrity: sha512-UNZqIZqxCBPIpkenwzFyP18oKtWSt8Y52TlQLSgVp5pNwKY2hVzRC60j5iCRenCT1vF8fr+LDXkDUOl4mE4HTw== + /@equinor/eds-tokens/0.4.0: + dev: false + engines: + node: '>=10.0.0' + pnpm: '>=4' + resolution: + integrity: sha512-LEsIcAVNLkgkbjR9WSsMb8W5sAe/NWsQtqPtU7fd44l0Lda+v3FzWL7OOUnb4Da9FPARu/1ZGgad4WLBFcym6Q== /@graphql-tools/schema/6.0.12_graphql@14.7.0: dependencies: '@graphql-tools/utils': 6.0.12_graphql@14.7.0 @@ -1995,6 +2046,17 @@ packages: node: '>=6' resolution: integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + /@testing-library/react-hooks/3.4.2_react@16.13.1: + dependencies: + '@babel/runtime': 7.10.4 + '@types/testing-library__react-hooks': 3.4.1 + react: 16.13.1 + dev: false + peerDependencies: + react: '>=16.9.0' + react-test-renderer: '>=16.9.0' + resolution: + integrity: sha512-RfPG0ckOzUIVeIqlOc1YztKgFW+ON8Y5xaSPbiBkfj9nMkkiLhLeBXT5icfPX65oJV/zCZu4z8EVnUc6GY9C5A== /@theme-ui/typography/0.2.46: dependencies: compass-vertical-rhythm: 1.4.5 @@ -2136,6 +2198,12 @@ packages: dev: false resolution: integrity: sha512-h0NbqXN/tJuBY/xggZSej1SKQEstbHO7J/omt1tYoFGmj3YXOodZKbbqD4mNDh7zvEGYd7YFrac1LTtAr3xsYQ== + /@types/react-test-renderer/16.9.3: + dependencies: + '@types/react': 16.9.43 + dev: false + resolution: + integrity: sha512-wJ7IlN5NI82XMLOyHSa+cNN4Z0I+8/YaLl04uDgcZ+W+ExWCmCiVTLT/7fRNqzy4OhStZcUwIqLNF7q+AdW43Q== /@types/react/16.9.43: dependencies: '@types/prop-types': 15.7.3 @@ -2150,6 +2218,12 @@ packages: dev: false resolution: integrity: sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q== + /@types/testing-library__react-hooks/3.4.1: + dependencies: + '@types/react-test-renderer': 16.9.3 + dev: false + resolution: + integrity: sha512-G4JdzEcq61fUyV6wVW9ebHWEiLK2iQvaBuCHHn9eMSbZzVh4Z4wHnUGIvQOYCCYeu5DnUtFyNYuAAgbSaO/43Q== /@types/tmp/0.0.33: dev: false resolution: @@ -2240,7 +2314,6 @@ packages: node: ^8.10.0 || ^10.13.0 || >=11.10.1 peerDependencies: eslint: '*' - typescript: '*' resolution: integrity: sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== /@typescript-eslint/experimental-utils/2.34.0_eslint@6.8.0+typescript@3.5.3: @@ -3167,6 +3240,18 @@ packages: styled-components: '>= 2' resolution: integrity: sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg== + /babel-plugin-styled-components/1.11.1_styled-components@5.1.1: + dependencies: + '@babel/helper-annotate-as-pure': 7.10.4 + '@babel/helper-module-imports': 7.12.5 + babel-plugin-syntax-jsx: 6.18.0 + lodash: 4.17.20 + styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + dev: false + peerDependencies: + styled-components: '>= 2' + resolution: + integrity: sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA== /babel-plugin-syntax-jsx/6.18.0: dev: false resolution: @@ -7380,9 +7465,10 @@ packages: gatsby: '>2.0.15' resolution: integrity: sha512-0SVP2xk8Ml+hml30+oBP/SRm/ztGV6sDOlOUoEHuv6SssxkDcKc9aSScn0qB1HsKGDYDm1gcmDmw48Bq4U78rA== - /gatsby-plugin-styled-components/3.3.10_61d52dcf0f1a79491f6f292ce3e13f22: + /gatsby-plugin-styled-components/3.3.10_f2051772a68ce125630e64fc60cd4ad2: dependencies: '@babel/runtime': 7.10.4 + babel-plugin-styled-components: 1.11.1_styled-components@5.1.1 gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc dev: false @@ -7774,7 +7860,6 @@ packages: gatsby: '*' react: ^16.4.2 react-dom: ^16.4.2 - typescript: '*' requiresBuild: true resolution: integrity: sha512-2zhCJZBPRJiUGbFRnCogMY3liBoFdb3+cCmIpp5b4BzGUEm+t+QZPSW34xkV5IE1WNywuIMtpZF6G8xTbuepbA== @@ -7882,7 +7967,7 @@ packages: p-defer: 3.0.0 parseurl: 1.3.3 physical-cpu-count: 2.0.0 - pnp-webpack-plugin: 1.6.4 + pnp-webpack-plugin: 1.6.4_typescript@3.5.3 postcss-flexbugs-fixes: 4.2.1 postcss-loader: 3.0.0 prompts: 2.3.2 @@ -10325,6 +10410,10 @@ packages: dev: false resolution: integrity: sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + /lodash/4.17.20: + dev: false + resolution: + integrity: sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== /log-symbols/2.2.0: dependencies: chalk: 2.4.2 @@ -10564,6 +10653,8 @@ packages: /match-sorter/3.1.1: bundledDependencies: - remove-accents + dependencies: + remove-accents: 0.4.2 dev: false resolution: integrity: sha512-Qlox3wRM/Q4Ww9rv1cBmYKNJwWVX/WC+eA3+1S3Fv4EOhrqyp812ZEfVFKQk0AP6RfzmPUUOwEZBbJ8IRt8SOw== @@ -12255,6 +12346,16 @@ packages: node: '>=6' resolution: integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== + /pnp-webpack-plugin/1.6.4_typescript@3.5.3: + dependencies: + ts-pnp: 1.2.0_typescript@3.5.3 + dev: false + engines: + node: '>=6' + peerDependencies: + typescript: '*' + resolution: + integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== /polished/3.6.5: dependencies: '@babel/runtime': 7.10.4 @@ -13862,6 +13963,10 @@ packages: hasBin: true resolution: integrity: sha1-y0Y709vLS5l5STXu4c9x16jjBow= + /remove-accents/0.4.2: + dev: false + resolution: + integrity: sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U= /remove-trailing-separator/1.1.0: dev: false resolution: @@ -15709,6 +15814,19 @@ packages: optional: true resolution: integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== + /ts-pnp/1.2.0_typescript@3.5.3: + dependencies: + typescript: 3.5.3 + dev: false + engines: + node: '>=6' + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + resolution: + integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== /tsconfig-paths/3.9.0: dependencies: '@types/json5': 0.0.29 @@ -17125,12 +17243,13 @@ packages: integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== specifiers: '@emotion/core': ^10.0.28 - '@equinor/eds-core-react': 'workspace:*' - '@equinor/eds-icons': 'workspace:*' - '@equinor/eds-tokens': 'workspace:*' + '@equinor/eds-core-react': ^0.6.2 + '@equinor/eds-icons': ^0.4.0 + '@equinor/eds-tokens': ^0.4.0 '@mdx-js/react': ^1.6.6 '@mikaelkristiansson/domready': ^1.0.10 '@reach/router': ^1.3.4 + babel-plugin-styled-components: ^1.11.1 docz: ^2.3.1 focus-visible: ^5.1.0 gatsby: ^2.23.10 diff --git a/apps/storefront/src/components/PropsTable.jsx b/apps/storefront/src/components/PropsTable.jsx index 4743ea6cb2..54c84443f6 100644 --- a/apps/storefront/src/components/PropsTable.jsx +++ b/apps/storefront/src/components/PropsTable.jsx @@ -1,5 +1,12 @@ import React from 'react' -import PropTypes from 'prop-types' + +// @TODO: This is the version used before the Typescript migration. +// In theory docz support typescript by adding a typescript: true flag to docz config. +// This didn't work out of the box, at least not when the typescript version of react-core +// is not published on npm. +// We should rewrite to use docz Props component, and test it with the Typescript version +// For the time being we just provide a link to the storybook +/* import PropTypes from 'prop-types' import RDPropsTable from 'react-docgen-props-table' const PropsTable = ({ props }) => { @@ -8,6 +15,15 @@ const PropsTable = ({ props }) => { PropsTable.propTypes = { props: PropTypes.object.isRequired, +} */ + +const PropsTable = () => { + return ( + <p> + Looking for the API table of available props? We got you covered in the{' '} + <a href="https://eds-storybook-react.azurewebsites.net/">Storybook</a> 👏{' '} + </p> + ) } export default PropsTable // eslint-disable-line diff --git a/package.yaml b/package.yaml index a39ea0d1c3..293f0b2444 100644 --- a/package.yaml +++ b/package.yaml @@ -22,6 +22,7 @@ scripts: @equinor/eds-storybook-react run build storybook: pnpm --filter @equinor/eds-storybook-react run dev storefront: pnpm --filter @equinor/eds-storefront run dev + storefront-build: pnpm --filter @equinor/eds-core-react install core-react: pnpm --filter @equinor/eds-core-react run dev figma-broker: pnpm --filter @equinor/eds-figma-broker run dev test:core-react: pnpm --filter @equinor/eds-core-react run test