From 5b53d03516961ba559f2f5e8e179140de739593e Mon Sep 17 00:00:00 2001 From: Victor Nystad Date: Tue, 10 Nov 2020 12:18:57 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Update=20React=20imports=20(#859?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔧 Change React imports Explicitly import `* as React` * 🎨 Get React version from Core React package.json Since we’re not using the latest version of React at the moment, we can’t have Eslint assume we’re using it when linting the code * 📝 Update README * 📌 Update lock-files --- .eslintrc.js | 8 +- apps/figma-broker/pnpm-lock.yaml | 2 +- apps/storefront/pnpm-lock.yaml | 119 +++++------ apps/storybook-html/pnpm-lock.yaml | 193 ++++++++++++++++-- apps/storybook-react/pnpm-lock.yaml | 108 +++------- libraries/core-react/README.md | 2 +- libraries/core-react/pnpm-lock.yaml | 29 ++- .../src/Accordion/Accordion.test.tsx | 2 +- .../core-react/src/Accordion/Accordion.tsx | 3 +- .../src/Accordion/AccordionHeader.tsx | 8 +- .../src/Accordion/AccordionHeaderTitle.tsx | 3 +- .../src/Accordion/AccordionItem.tsx | 3 +- .../src/Accordion/AccordionPanel.tsx | 3 +- .../core-react/src/Avatar/Avatar.test.tsx | 2 +- libraries/core-react/src/Avatar/Avatar.tsx | 3 +- .../core-react/src/Banner/Banner.test.tsx | 2 +- libraries/core-react/src/Banner/Banner.tsx | 3 +- .../core-react/src/Banner/BannerActions.tsx | 3 +- .../core-react/src/Banner/BannerIcon.tsx | 3 +- .../core-react/src/Banner/BannerMessage.tsx | 3 +- .../core-react/src/Breadcrumbs/Breadcrumb.tsx | 3 +- .../src/Breadcrumbs/Breadcrumbs.test.tsx | 2 +- .../src/Breadcrumbs/Breadcrumbs.tsx | 3 +- .../core-react/src/Button/Button.test.tsx | 2 +- libraries/core-react/src/Button/Button.tsx | 3 +- libraries/core-react/src/Card/Card.test.tsx | 2 +- libraries/core-react/src/Card/Card.tsx | 3 +- libraries/core-react/src/Card/CardActions.tsx | 3 +- libraries/core-react/src/Card/CardHeader.tsx | 3 +- .../core-react/src/Card/CardHeaderTitle.tsx | 3 +- libraries/core-react/src/Card/CardMedia.tsx | 3 +- libraries/core-react/src/Chip/Chip.test.tsx | 2 +- libraries/core-react/src/Chip/Chip.tsx | 3 +- libraries/core-react/src/Dialog/Actions.tsx | 3 +- .../core-react/src/Dialog/CustomContent.tsx | 3 +- libraries/core-react/src/Dialog/Dialog.tsx | 3 +- libraries/core-react/src/Dialog/Title.tsx | 3 +- .../core-react/src/Divider/Divider.test.tsx | 2 +- libraries/core-react/src/Divider/Divider.tsx | 3 +- libraries/core-react/src/Icon/Icon.test.tsx | 2 +- libraries/core-react/src/Icon/Icon.tsx | 3 +- libraries/core-react/src/List/List.test.tsx | 2 +- libraries/core-react/src/List/List.tsx | 3 +- libraries/core-react/src/List/ListItem.tsx | 3 +- .../core-react/src/Menu/Menu.context.tsx | 3 +- libraries/core-react/src/Menu/Menu.test.tsx | 2 +- libraries/core-react/src/Menu/Menu.tsx | 3 +- libraries/core-react/src/Menu/MenuItem.tsx | 3 +- libraries/core-react/src/Menu/MenuList.tsx | 8 +- libraries/core-react/src/Menu/MenuSection.tsx | 3 +- libraries/core-react/src/Menu/index.tsx | 3 +- libraries/core-react/src/Menu/test-utils.tsx | 3 +- .../src/Pagination/Pagination.test.tsx | 2 +- .../core-react/src/Pagination/Pagination.tsx | 9 +- .../src/Pagination/PaginationItem.tsx | 3 +- libraries/core-react/src/Paper/Paper.tsx | 3 +- .../core-react/src/Popover/Popover.test.tsx | 2 +- libraries/core-react/src/Popover/Popover.tsx | 3 +- .../core-react/src/Popover/PopoverAnchor.tsx | 3 +- .../core-react/src/Popover/PopoverContent.tsx | 3 +- .../core-react/src/Popover/PopoverItem.tsx | 9 +- .../core-react/src/Popover/PopoverTitle.tsx | 3 +- .../Circular/CircularProgress.test.tsx | 2 +- .../Progress/Circular/CircularProgress.tsx | 3 +- .../src/Progress/Dots/DotProgress.test.tsx | 2 +- .../src/Progress/Dots/DotProgress.tsx | 3 +- .../Progress/Linear/LinearProgress.test.tsx | 2 +- .../src/Progress/Linear/LinearProgress.tsx | 3 +- .../src/Progress/Star/StarProgress.test.tsx | 2 +- .../src/Progress/Star/StarProgress.tsx | 3 +- libraries/core-react/src/Scrim/Scrim.test.tsx | 3 +- libraries/core-react/src/Scrim/Scrim.tsx | 3 +- .../core-react/src/Search/Search.test.tsx | 2 +- libraries/core-react/src/Search/Search.tsx | 3 +- .../Checkbox/Checkbox.test.tsx | 3 +- .../SelectionControls/Checkbox/Checkbox.tsx | 3 +- .../SelectionControls/Radio/Radio.test.tsx | 2 +- .../src/SelectionControls/Radio/Radio.tsx | 3 +- .../src/SelectionControls/Switch/Input.tsx | 3 +- .../SelectionControls/Switch/InputWrapper.tsx | 3 +- .../SelectionControls/Switch/Switch.test.tsx | 2 +- .../src/SelectionControls/Switch/Switch.tsx | 3 +- .../Switch/SwitchDefault.tsx | 3 +- .../SelectionControls/Switch/SwitchSmall.tsx | 3 +- .../src/SideSheet/SideSheet.test.tsx | 2 +- .../core-react/src/SideSheet/SideSheet.tsx | 3 +- libraries/core-react/src/Slider/MinMax.tsx | 3 +- libraries/core-react/src/Slider/Output.tsx | 3 +- .../core-react/src/Slider/Slider.test.tsx | 2 +- libraries/core-react/src/Slider/Slider.tsx | 3 +- .../core-react/src/Slider/SliderInput.tsx | 3 +- .../core-react/src/Snackbar/Snackbar.test.tsx | 2 +- .../core-react/src/Snackbar/Snackbar.tsx | 3 +- .../src/Snackbar/SnackbarAction.tsx | 3 +- libraries/core-react/src/Table/Body.tsx | 3 +- libraries/core-react/src/Table/Cell.tsx | 3 +- libraries/core-react/src/Table/Head.tsx | 3 +- libraries/core-react/src/Table/Row.tsx | 3 +- libraries/core-react/src/Table/Table.tsx | 3 +- .../src/TableOfContents/LinkItem.tsx | 3 +- .../TableOfContents/TableOfContents.test.tsx | 2 +- .../src/TableOfContents/TableOfContents.tsx | 3 +- libraries/core-react/src/Tabs/Tab.tsx | 3 +- libraries/core-react/src/Tabs/TabList.tsx | 3 +- libraries/core-react/src/Tabs/TabPanel.tsx | 3 +- libraries/core-react/src/Tabs/TabPanels.tsx | 8 +- libraries/core-react/src/Tabs/Tabs.test.tsx | 3 +- libraries/core-react/src/Tabs/Tabs.tsx | 3 +- .../src/TextField/HelperText/HelperText.tsx | 3 +- .../core-react/src/TextField/Icon/Icon.tsx | 2 +- .../core-react/src/TextField/Input/Input.tsx | 3 +- .../core-react/src/TextField/Label/Label.tsx | 2 +- .../src/TextField/TextField.test.tsx | 2 +- .../core-react/src/TextField/TextField.tsx | 3 +- .../core-react/src/TextField/context.tsx | 3 +- .../core-react/src/Tooltip/Tooltip.test.tsx | 2 +- libraries/core-react/src/Tooltip/Tooltip.tsx | 3 +- libraries/core-react/src/TopBar/Actions.tsx | 3 +- .../core-react/src/TopBar/CustomContent.tsx | 3 +- libraries/core-react/src/TopBar/Header.tsx | 3 +- .../core-react/src/TopBar/TopBar.test.tsx | 2 +- libraries/core-react/src/TopBar/TopBar.tsx | 3 +- .../src/Typography/Typography.test.tsx | 2 +- .../core-react/src/Typography/Typography.tsx | 3 +- libraries/core/pnpm-lock.yaml | 2 +- libraries/icons/pnpm-lock.yaml | 2 +- libraries/tokens/pnpm-lock.yaml | 2 +- pnpm-lock.yaml | 2 +- 128 files changed, 491 insertions(+), 326 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4f1056927f..67706797a9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,3 +1,9 @@ +const pkg = require('./libraries/core-react/package.json') + +const { + devDependencies: { react: reactVersion }, +} = pkg + module.exports = { root: true, extends: [ @@ -25,7 +31,7 @@ module.exports = { }, settings: { react: { - version: 'detect', + version: reactVersion, }, }, globals: { diff --git a/apps/figma-broker/pnpm-lock.yaml b/apps/figma-broker/pnpm-lock.yaml index ad11da5d26..fd255d3714 100644 --- a/apps/figma-broker/pnpm-lock.yaml +++ b/apps/figma-broker/pnpm-lock.yaml @@ -10,7 +10,7 @@ dependencies: prettier: 2.0.5 ramda: 0.27.0 svgo: 1.3.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@koa/router/9.0.1: dependencies: diff --git a/apps/storefront/pnpm-lock.yaml b/apps/storefront/pnpm-lock.yaml index ceb8fc3ed9..73ef1a4a52 100644 --- a/apps/storefront/pnpm-lock.yaml +++ b/apps/storefront/pnpm-lock.yaml @@ -7,9 +7,9 @@ dependencies: '@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 + docz: 2.3.1_react-dom@16.13.1+react@16.13.1 focus-visible: 5.1.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-image: 2.4.13 gatsby-link: 2.4.12_3914268316c542370cbb046de235e031 gatsby-plugin-algolia-docsearch: 1.0.5_gatsby@2.24.2 @@ -38,11 +38,11 @@ dependencies: react-helmet: 6.1.0_react@16.13.1 remark-emoji: 2.1.0 shallow-compare: 1.2.2 - styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + styled-components: 5.1.1_react-dom@16.13.1+react@16.13.1 devDependencies: prettier: 2.0.5 stylelint-config-recommended: 3.0.0 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@ardatan/aggregate-error/0.0.1: dev: false @@ -1345,7 +1345,7 @@ packages: prop-types: 15.7.2 react: 16.13.1 react-dom: 16.13.1_react@16.13.1 - styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + styled-components: 5.1.1_react-dom@16.13.1+react@16.13.1 dev: false engines: node: '>=10.0.0' @@ -1956,7 +1956,7 @@ packages: error-stack-parser: 2.0.6 string-width: 2.1.1 strip-ansi: 3.0.1 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false peerDependencies: webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 @@ -3147,7 +3147,7 @@ packages: mkdirp: 0.5.5 pify: 4.0.1 schema-utils: 2.7.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false engines: node: '>= 6.9' @@ -3220,7 +3220,7 @@ packages: integrity: sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== /babel-plugin-remove-graphql-queries/2.9.13_gatsby@2.24.2: dependencies: - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 dev: false engines: node: '>=10.13.0' @@ -3234,7 +3234,7 @@ packages: '@babel/helper-module-imports': 7.10.4 babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.19 - styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + styled-components: 5.1.1_react-dom@16.13.1+react@16.13.1 dev: false peerDependencies: styled-components: '>= 2' @@ -3246,7 +3246,7 @@ packages: '@babel/helper-module-imports': 7.12.5 babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.20 - styled-components: 5.1.1_479e60ee9c1aa71dc1eb81036e3619dc + styled-components: 5.1.1_react-dom@16.13.1+react@16.13.1 dev: false peerDependencies: styled-components: '>= 2' @@ -4879,7 +4879,7 @@ packages: postcss-modules-values: 1.3.0 postcss-value-parser: 3.3.1 source-list-map: 2.0.1 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false engines: node: '>= 6.9.0 <7.0.0 || >= 8.9.0' @@ -5584,7 +5584,7 @@ packages: dev: false resolution: integrity: sha512-MDQ/GNnR6yc6gkGI6vrTWUwSxapNFh021JW9AW9eQIBu2E8560fggKBot8o/E9NuJt/h2bencoKnk8RH063aCg== - /docz/2.3.1_c95255344fcbf6b4c2c4015e2d9e0f3f: + /docz/2.3.1_react-dom@16.13.1+react@16.13.1: dependencies: '@emotion/core': 10.0.28_react@16.13.1 '@mdx-js/react': 1.6.6_react@16.13.1 @@ -5592,7 +5592,7 @@ packages: capitalize: 2.0.3 docz-core: 2.3.0 fast-deep-equal: 2.0.1 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-plugin-eslint: 2.0.8_gatsby@2.24.2 gatsby-plugin-typescript: 2.4.14_gatsby@2.24.2 gatsby-theme-docz: 2.3.1_c95255344fcbf6b4c2c4015e2d9e0f3f @@ -5609,7 +5609,6 @@ packages: dev: false hasBin: true peerDependencies: - docz: '*' react: ^16.8.0 react-dom: ^16.8.0 resolution: @@ -6039,7 +6038,7 @@ packages: object-assign: 4.1.1 object-hash: 1.3.1 rimraf: 2.7.1 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false peerDependencies: eslint: '>=1.6.0 <7.0.0' @@ -6730,7 +6729,7 @@ packages: dependencies: loader-utils: 1.4.0 schema-utils: 0.4.7 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false engines: node: '>= 4.3 < 5.0.0 || >= 5.10' @@ -7206,7 +7205,7 @@ packages: /gatsby-plugin-algolia-docsearch/1.0.5_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 dev: false peerDependencies: gatsby: ^2.0.0 @@ -7215,7 +7214,7 @@ packages: /gatsby-plugin-alias-imports/1.0.5_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd dev: false peerDependencies: gatsby: '>2.0.0' @@ -7224,7 +7223,7 @@ packages: /gatsby-plugin-compile-es6-packages/2.1.0_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd regex-escape: 3.4.9 dev: false peerDependencies: @@ -7236,7 +7235,7 @@ packages: '@babel/runtime': 7.10.4 '@emotion/babel-preset-css-prop': 10.0.27 '@emotion/core': 10.0.28_react@16.13.1 - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd dev: false engines: node: '>=10.13.0' @@ -7248,7 +7247,7 @@ packages: integrity: sha512-OQrNgq3Te+bjra/sNo2PwOm24dPVr8MsjWf3X/3ciPf4bkf+Ey0jzJ36JnIIUIzZvpbyBHAr6eNzSOWnE2X2zA== /gatsby-plugin-eslint/2.0.8_gatsby@2.24.2: dependencies: - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 dev: false peerDependencies: eslint: ^6.6.0 @@ -7259,7 +7258,7 @@ packages: /gatsby-plugin-load-script/1.1.0_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 dev: false peerDependencies: gatsby: ^2.20.12 @@ -7268,7 +7267,7 @@ packages: /gatsby-plugin-manifest/2.4.18_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-core-utils: 1.3.12 semver: 5.7.1 sharp: 0.25.4 @@ -7372,7 +7371,7 @@ packages: dependencies: '@babel/runtime': 7.10.4 cheerio: 1.0.0-rc.3 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-core-utils: 1.3.12 glob: 7.1.6 idb-keyval: 3.2.0 @@ -7390,7 +7389,7 @@ packages: '@babel/runtime': 7.10.4 bluebird: 3.7.2 fs-exists-cached: 1.0.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-page-utils: 0.2.17 glob: 7.1.6 lodash: 4.17.19 @@ -7404,7 +7403,7 @@ packages: integrity: sha512-mIIotda+tR59tb3gk5qW3CUVSsdA608hchuX/+bKUCyuqyqZKjPffOdGUgy92Aa+mmIKgJTiGDUnIJoVsHSdtg== /gatsby-plugin-react-helmet-async/1.0.16_0d3de3853106fe1b308c9747ca1b1415: dependencies: - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd react: 16.13.1 react-dom: 16.13.1_react@16.13.1 react-helmet-async: 1.0.6_react-dom@16.13.1+react@16.13.1 @@ -7419,7 +7418,7 @@ packages: /gatsby-plugin-react-helmet/3.3.10_gatsby@2.24.2+react-helmet@6.1.0: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 react-helmet: 6.1.0_react@16.13.1 dev: false engines: @@ -7431,7 +7430,7 @@ packages: integrity: sha512-AcXYwmS3r298JWs6iQ3OLNxIe8L8i5a2iSdLr/SDMpHqumYm7q/vB9kCX0et5wM7DIuZ7aPXDrdi5yDCAvU5lg== /gatsby-plugin-root-import/2.0.5_gatsby@2.24.2: dependencies: - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd dev: false peerDependencies: gatsby: '>=1' @@ -7443,7 +7442,7 @@ packages: async: 2.6.3 bluebird: 3.7.2 fs-extra: 8.1.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-core-utils: 1.3.12 got: 8.3.2 imagemin: 6.1.0 @@ -7469,8 +7468,8 @@ packages: 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 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 + styled-components: 5.1.1_react-dom@16.13.1+react@16.13.1 dev: false engines: node: '>=10.13.0' @@ -7588,7 +7587,7 @@ packages: chokidar: 3.4.0 file-type: 12.4.2 fs-extra: 8.1.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-core-utils: 1.3.12 got: 9.6.0 md5-file: 3.2.3 @@ -7635,10 +7634,10 @@ packages: '@theme-ui/typography': 0.2.46 babel-plugin-export-metadata: 2.3.0 copy-text-to-clipboard: 2.2.0 - docz: 2.3.1_c95255344fcbf6b4c2c4015e2d9e0f3f + docz: 2.3.1_react-dom@16.13.1+react@16.13.1 emotion-theming: 10.0.27_c989b1aa057905c7a8b69bf973f55a19 fs-extra: 8.1.0 - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc + gatsby: 2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd gatsby-plugin-alias-imports: 1.0.5_gatsby@2.24.2 gatsby-plugin-compile-es6-packages: 2.1.0_gatsby@2.24.2 gatsby-plugin-emotion: 4.3.10_cdf84ffd3567639bd6470dc52b87109d @@ -7678,7 +7677,7 @@ packages: '@babel/runtime': 7.10.4 bluebird: 3.7.2 fs-extra: 8.1.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 gatsby-plugin-sharp: 2.6.19_gatsby@2.24.2 potrace: 2.1.6 probe-image-size: 4.1.1 @@ -7695,7 +7694,7 @@ packages: /gatsby-transformer-yaml/2.4.10_gatsby@2.24.2: dependencies: '@babel/runtime': 7.10.4 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 + gatsby: 2.24.2_react-dom@16.13.1+react@16.13.1 js-yaml: 3.14.0 lodash: 4.17.19 unist-util-select: 1.5.0 @@ -7706,7 +7705,7 @@ packages: gatsby: ^2.0.15 resolution: integrity: sha512-jQwtyIn0pvT1GfmdxKUKgdJwgK/z8aVVN7wFeHuskhDwWzxCghB88ybyhS7gOF0ttyKNYjQIpwgwt9PnL+AJBQ== - /gatsby/2.24.2_87c673b4c99150bcbaa42956bba55e13: + /gatsby/2.24.2_7ad1e1a5bb97bbc75ca12d1d39096bfd: dependencies: '@babel/code-frame': 7.10.4 '@babel/core': 7.10.4 @@ -7719,8 +7718,8 @@ packages: '@pmmmwh/react-refresh-webpack-plugin': 0.3.3_d8528028579e0129932d17e99387126e '@reach/router': 1.3.4_react-dom@16.13.1+react@16.13.1 '@types/http-proxy': 1.17.4 - '@typescript-eslint/eslint-plugin': 2.34.0_984cbb313f9ea271f36cadd8f9814e06 - '@typescript-eslint/parser': 2.34.0_eslint@6.8.0 + '@typescript-eslint/eslint-plugin': 2.34.0_5a17f289f30f975b48207d0526ec4dc8 + '@typescript-eslint/parser': 2.34.0_eslint@6.8.0+typescript@3.5.3 address: 1.1.2 autoprefixer: 9.8.5 axios: 0.19.2 @@ -7768,7 +7767,6 @@ packages: file-loader: 1.1.11_webpack@4.43.0 fs-exists-cached: 1.0.0 fs-extra: 8.1.0 - gatsby: 2.24.2_87c673b4c99150bcbaa42956bba55e13 gatsby-cli: 2.12.60 gatsby-core-utils: 1.3.12 gatsby-graphiql-explorer: 0.4.11 @@ -7810,7 +7808,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 @@ -7843,7 +7841,7 @@ packages: util.promisify: 1.0.1 uuid: 3.4.0 v8-compile-cache: 1.1.2 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-dev-middleware: 3.7.2_webpack@4.43.0 webpack-dev-server: 3.11.0_webpack@4.43.0 webpack-hot-middleware: 2.25.0 @@ -7857,13 +7855,13 @@ packages: node: '>=10.13.0' hasBin: true peerDependencies: - gatsby: '*' react: ^16.4.2 react-dom: ^16.4.2 + typescript: '*' requiresBuild: true resolution: integrity: sha512-2zhCJZBPRJiUGbFRnCogMY3liBoFdb3+cCmIpp5b4BzGUEm+t+QZPSW34xkV5IE1WNywuIMtpZF6G8xTbuepbA== - /gatsby/2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc: + /gatsby/2.24.2_react-dom@16.13.1+react@16.13.1: dependencies: '@babel/code-frame': 7.10.4 '@babel/core': 7.10.4 @@ -7876,8 +7874,8 @@ packages: '@pmmmwh/react-refresh-webpack-plugin': 0.3.3_d8528028579e0129932d17e99387126e '@reach/router': 1.3.4_react-dom@16.13.1+react@16.13.1 '@types/http-proxy': 1.17.4 - '@typescript-eslint/eslint-plugin': 2.34.0_5a17f289f30f975b48207d0526ec4dc8 - '@typescript-eslint/parser': 2.34.0_eslint@6.8.0+typescript@3.5.3 + '@typescript-eslint/eslint-plugin': 2.34.0_984cbb313f9ea271f36cadd8f9814e06 + '@typescript-eslint/parser': 2.34.0_eslint@6.8.0 address: 1.1.2 autoprefixer: 9.8.5 axios: 0.19.2 @@ -7925,7 +7923,6 @@ packages: file-loader: 1.1.11_webpack@4.43.0 fs-exists-cached: 1.0.0 fs-extra: 8.1.0 - gatsby: 2.24.2_d48f8ebf7c6f206e49bdb45b3ebb87cc gatsby-cli: 2.12.60 gatsby-core-utils: 1.3.12 gatsby-graphiql-explorer: 0.4.11 @@ -7967,7 +7964,7 @@ packages: p-defer: 3.0.0 parseurl: 1.3.3 physical-cpu-count: 2.0.0 - pnp-webpack-plugin: 1.6.4_typescript@3.5.3 + pnp-webpack-plugin: 1.6.4 postcss-flexbugs-fixes: 4.2.1 postcss-loader: 3.0.0 prompts: 2.3.2 @@ -7996,12 +7993,11 @@ packages: tmp: 0.2.1 true-case-path: 2.2.1 type-of: 2.0.1 - typescript: 3.5.3 url-loader: 1.1.2_webpack@4.43.0 util.promisify: 1.0.1 uuid: 3.4.0 v8-compile-cache: 1.1.2 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-dev-middleware: 3.7.2_webpack@4.43.0 webpack-dev-server: 3.11.0_webpack@4.43.0 webpack-hot-middleware: 2.25.0 @@ -8015,10 +8011,8 @@ packages: node: '>=10.13.0' hasBin: true peerDependencies: - gatsby: '*' react: ^16.4.2 react-dom: ^16.4.2 - typescript: '*' requiresBuild: true resolution: integrity: sha512-2zhCJZBPRJiUGbFRnCogMY3liBoFdb3+cCmIpp5b4BzGUEm+t+QZPSW34xkV5IE1WNywuIMtpZF6G8xTbuepbA== @@ -10954,7 +10948,7 @@ packages: loader-utils: 1.4.0 normalize-url: 1.9.1 schema-utils: 1.0.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-sources: 1.4.3 dev: false engines: @@ -11425,7 +11419,7 @@ packages: dependencies: loader-utils: 1.4.0 schema-utils: 1.0.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false engines: node: '>= 8.9.0' @@ -11648,7 +11642,7 @@ packages: dependencies: cssnano: 4.1.10 last-call-webpack-plugin: 3.0.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false peerDependencies: webpack: ^4.0.0 @@ -15327,7 +15321,7 @@ packages: dev: false resolution: integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== - /styled-components/5.1.1_479e60ee9c1aa71dc1eb81036e3619dc: + /styled-components/5.1.1_react-dom@16.13.1+react@16.13.1: dependencies: '@babel/helper-module-imports': 7.10.4 '@babel/traverse': 7.10.4 @@ -15346,7 +15340,6 @@ packages: react: '>= 16.8.0' react-dom: '>= 16.8.0' react-is: '>= 16.8.0' - styled-components: '*' resolution: integrity: sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== /stylehacks/4.0.3: @@ -15571,7 +15564,7 @@ packages: serialize-javascript: 3.1.0 source-map: 0.6.1 terser: 4.8.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-sources: 1.4.3 worker-farm: 1.7.0 dev: false @@ -16341,7 +16334,7 @@ packages: loader-utils: 1.4.0 mime: 2.4.6 schema-utils: 1.0.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 dev: false engines: node: '>= 6.9.0' @@ -16600,7 +16593,7 @@ packages: mime: 2.4.6 mkdirp: 0.5.5 range-parser: 1.2.1 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-log: 2.0.0 dev: false engines: @@ -16640,7 +16633,7 @@ packages: strip-ansi: 3.0.1 supports-color: 6.1.0 url: 0.11.0 - webpack: 4.43.0_webpack@4.43.0 + webpack: 4.43.0 webpack-dev-middleware: 3.7.2_webpack@4.43.0 webpack-log: 2.0.0 ws: 6.2.1 @@ -16707,7 +16700,7 @@ packages: dev: false resolution: integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA== - /webpack/4.43.0_webpack@4.43.0: + /webpack/4.43.0: dependencies: '@webassemblyjs/ast': 1.9.0 '@webassemblyjs/helper-module-context': 1.9.0 @@ -16736,8 +16729,6 @@ packages: engines: node: '>=6.11.5' hasBin: true - peerDependencies: - webpack: '*' resolution: integrity: sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== /websocket-driver/0.6.5: diff --git a/apps/storybook-html/pnpm-lock.yaml b/apps/storybook-html/pnpm-lock.yaml index b7eb67f804..a2d1a3e572 100644 --- a/apps/storybook-html/pnpm-lock.yaml +++ b/apps/storybook-html/pnpm-lock.yaml @@ -9,7 +9,7 @@ devDependencies: '@storybook/addon-storysource': 5.2.6_react-dom@16.12.0+react@16.12.0 '@storybook/html': 5.2.6_857a459f32e08451cc6a8fb9b43751b7 babel-loader: 8.0.6_@babel+core@7.7.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@babel/code-frame/7.5.5: dependencies: @@ -1163,7 +1163,7 @@ packages: unfetch: 4.1.0 url-loader: 2.2.0_file-loader@3.0.1+webpack@4.41.2 util-deprecate: 1.0.2 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 webpack-dev-middleware: 3.7.2_webpack@4.41.2 webpack-hot-middleware: 2.25.0 dev: true @@ -1488,6 +1488,11 @@ packages: dev: true resolution: integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + /abbrev/1.1.1: + dev: true + optional: true + resolution: + integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== /accepts/1.3.7: dependencies: mime-types: 2.1.25 @@ -2644,7 +2649,7 @@ packages: /corejs-upgrade-webpack-plugin/2.2.0: dependencies: resolve-from: 5.0.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true resolution: integrity: sha512-J0QMp9GNoiw91Kj/dkIQFZeiCXgXoja/Wlht1SPybxerBWh4NCmb0pOgCv61lrlQZETwvVVfAFAA3IqoEO9aqQ== @@ -2773,7 +2778,7 @@ packages: postcss-modules-values: 3.0.0 postcss-value-parser: 4.0.2 schema-utils: 2.5.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true engines: node: '>= 8.9.0' @@ -2833,6 +2838,13 @@ packages: node: '>=0.10' resolution: integrity: sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + /deep-extend/0.6.0: + dev: true + engines: + node: '>=4.0.0' + optional: true + resolution: + integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== /deep-object-diff/1.1.0: dev: true resolution: @@ -2896,6 +2908,14 @@ packages: dev: true resolution: integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + /detect-libc/1.0.3: + dev: true + engines: + node: '>=0.10' + hasBin: true + optional: true + resolution: + integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= /detect-port-alt/1.1.6: dependencies: address: 1.1.2 @@ -3004,7 +3024,7 @@ packages: /dotenv-webpack/1.7.0_webpack@4.41.2: dependencies: dotenv-defaults: 1.0.2 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true peerDependencies: webpack: ^1 || ^2 || ^3 || ^4 @@ -3454,7 +3474,7 @@ packages: dependencies: loader-utils: 1.2.3 schema-utils: 1.0.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true engines: node: '>= 6.9.0' @@ -3636,6 +3656,13 @@ packages: node: '>=6 <7 || >=8' resolution: integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + /fs-minipass/1.2.7: + dependencies: + minipass: 2.9.0 + dev: true + optional: true + resolution: + integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== /fs-write-stream-atomic/1.0.10: dependencies: graceful-fs: 4.2.3 @@ -3654,11 +3681,14 @@ packages: - node-pre-gyp dependencies: nan: 2.14.0 + node-pre-gyp: 0.12.0 deprecated: 'One of your dependencies needs to upgrade to fsevents v2: 1) Proper nodejs v10+ support 2) No more fetching binaries from AWS, smaller package size' dev: true engines: node: '>=4.0' optional: true + os: + - darwin requiresBuild: true resolution: integrity: sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== @@ -3986,7 +4016,7 @@ packages: pretty-error: 2.1.1 tapable: 1.1.3 util.promisify: 1.0.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true engines: node: '>=6.9' @@ -4061,6 +4091,13 @@ packages: dev: true resolution: integrity: sha1-xg7taebY/bazEEofy8ocGS3FtQE= + /ignore-walk/3.0.3: + dependencies: + minimatch: 3.0.4 + dev: true + optional: true + resolution: + integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== /ignore/3.3.10: dev: true resolution: @@ -4886,6 +4923,21 @@ packages: dev: true resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /minipass/2.9.0: + dependencies: + safe-buffer: 5.2.0 + yallist: 3.1.1 + dev: true + optional: true + resolution: + integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + /minizlib/1.3.3: + dependencies: + minipass: 2.9.0 + dev: true + optional: true + resolution: + integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== /mississippi/3.0.0: dependencies: concat-stream: 1.6.2 @@ -4969,6 +5021,18 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + /needle/2.5.2: + dependencies: + debug: 3.2.6 + iconv-lite: 0.4.24 + sax: 1.2.4 + dev: true + engines: + node: '>= 4.4.x' + hasBin: true + optional: true + resolution: + integrity: sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ== /negotiator/0.6.2: dev: true engines: @@ -5030,12 +5094,38 @@ packages: dev: true resolution: integrity: sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== + /node-pre-gyp/0.12.0: + dependencies: + detect-libc: 1.0.3 + mkdirp: 0.5.1 + needle: 2.5.2 + nopt: 4.0.3 + npm-packlist: 1.4.8 + npmlog: 4.1.2 + rc: 1.2.8 + rimraf: 2.7.1 + semver: 5.7.1 + tar: 4.4.13 + dev: true + hasBin: true + optional: true + resolution: + integrity: sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== /node-releases/1.1.40: dependencies: semver: 6.3.0 dev: true resolution: integrity: sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ== + /nopt/4.0.3: + dependencies: + abbrev: 1.1.1 + osenv: 0.1.5 + dev: true + hasBin: true + optional: true + resolution: + integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 @@ -5056,6 +5146,27 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + /npm-bundled/1.1.1: + dependencies: + npm-normalize-package-bin: 1.0.1 + dev: true + optional: true + resolution: + integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + /npm-normalize-package-bin/1.0.1: + dev: true + optional: true + resolution: + integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + /npm-packlist/1.4.8: + dependencies: + ignore-walk: 3.0.3 + npm-bundled: 1.1.1 + npm-normalize-package-bin: 1.0.1 + dev: true + optional: true + resolution: + integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 @@ -5223,12 +5334,27 @@ packages: dev: true resolution: integrity: sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + /os-homedir/1.0.2: + dev: true + engines: + node: '>=0.10.0' + optional: true + resolution: + integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= /os-tmpdir/1.0.2: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /osenv/0.1.5: + dependencies: + os-homedir: 1.0.2 + os-tmpdir: 1.0.2 + dev: true + optional: true + resolution: + integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-finally/1.0.0: dev: true engines: @@ -5793,7 +5919,7 @@ packages: dependencies: loader-utils: 1.2.3 schema-utils: 1.0.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true engines: node: '>= 6.9.0' @@ -5801,6 +5927,17 @@ packages: webpack: ^4.3.0 resolution: integrity: sha512-kZnO5MoIyrojfrPWqrhFNLZemIAX8edMOCp++yC5RKxzFB3m92DqKNhKlU6+FvpOhWtvyh3jOaD7J6/9tpdIKg== + /rc/1.2.8: + dependencies: + deep-extend: 0.6.0 + ini: 1.3.5 + minimist: 1.2.0 + strip-json-comments: 2.0.1 + dev: true + hasBin: true + optional: true + resolution: + integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== /react-clientside-effect/1.2.2_react@16.12.0: dependencies: '@babel/runtime': 7.7.2 @@ -6370,6 +6507,11 @@ packages: dev: true resolution: integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + /sax/1.2.4: + dev: true + optional: true + resolution: + integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== /scheduler/0.18.0: dependencies: loose-envify: 1.4.0 @@ -6827,6 +6969,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + /strip-json-comments/2.0.1: + dev: true + engines: + node: '>=0.10.0' + optional: true + resolution: + integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /style-loader/0.23.1: dependencies: loader-utils: 1.2.3 @@ -6879,6 +7028,21 @@ packages: node: '>=6' resolution: integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== + /tar/4.4.13: + dependencies: + chownr: 1.1.3 + fs-minipass: 1.2.7 + minipass: 2.9.0 + minizlib: 1.3.3 + mkdirp: 0.5.1 + safe-buffer: 5.2.0 + yallist: 3.1.1 + dev: true + engines: + node: '>=4.5' + optional: true + resolution: + integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== /telejson/3.1.0: dependencies: '@types/is-function': 1.0.0 @@ -6909,7 +7073,7 @@ packages: serialize-javascript: 1.9.1 source-map: 0.6.1 terser: 4.4.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 webpack-sources: 1.4.3 worker-farm: 1.7.0 dev: true @@ -7189,13 +7353,16 @@ packages: loader-utils: 1.2.3 mime: 2.4.4 schema-utils: 2.5.0 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 dev: true engines: node: '>= 8.9.0' peerDependencies: file-loader: '*' webpack: ^4.0.0 + peerDependenciesMeta: + file-loader: + optional: true resolution: integrity: sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw== /url-parse/1.4.7: @@ -7292,7 +7459,7 @@ packages: mime: 2.4.4 mkdirp: 0.5.1 range-parser: 1.2.1 - webpack: 4.41.2_webpack@4.41.2 + webpack: 4.41.2 webpack-log: 2.0.0 dev: true engines: @@ -7326,7 +7493,7 @@ packages: dev: true resolution: integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - /webpack/4.41.2_webpack@4.41.2: + /webpack/4.41.2: dependencies: '@webassemblyjs/ast': 1.8.5 '@webassemblyjs/helper-module-context': 1.8.5 @@ -7355,8 +7522,6 @@ packages: engines: node: '>=6.11.5' hasBin: true - peerDependencies: - webpack: '*' resolution: integrity: sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== /websocket-driver/0.7.3: diff --git a/apps/storybook-react/pnpm-lock.yaml b/apps/storybook-react/pnpm-lock.yaml index 291f50ce79..48042ddc5a 100644 --- a/apps/storybook-react/pnpm-lock.yaml +++ b/apps/storybook-react/pnpm-lock.yaml @@ -6,7 +6,7 @@ dependencies: babel-runtime: 6.26.0 react-dom: 16.13.1_react@16.13.1 react-hook-form: 5.7.2_react@16.13.1 - styled-components: 5.1.1_9a4a3b3ed34a772b68db523825332f5f + styled-components: 5.1.1_988f4f9157fb8e0dba6a9870bbd1cb60 devDependencies: '@babel/core': 7.10.2 '@babel/plugin-transform-react-jsx': 7.10.1_@babel+core@7.10.2 @@ -26,7 +26,7 @@ devDependencies: babel-loader: 8.1.0_@babel+core@7.10.2 react: 16.13.1 react-is: 16.13.1 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@babel/code-frame/7.10.1: dependencies: @@ -3570,32 +3570,6 @@ packages: global: 4.4.0 resolution: integrity: sha512-IY/p0f9XxfHZWVkjeIYOwF6xuonjgmZ9mYPy7Ks47zzDFrUe0/g5cqfBJBUj1YOqlANbF6XCO8YiKXjkE70olw== - /@storybook/components/6.0.27: - dependencies: - '@storybook/client-logger': 6.0.27 - '@storybook/csf': 0.0.1 - '@storybook/theming': 6.0.27_react-dom@16.14.0+react@16.14.0 - '@types/overlayscrollbars': 1.12.0 - '@types/react-color': 3.0.4 - '@types/react-syntax-highlighter': 11.0.4 - core-js: 3.6.5 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.20 - markdown-to-jsx: 6.11.4_react@16.14.0 - memoizerific: 1.11.3 - overlayscrollbars: 1.13.0 - polished: 3.6.7 - popper.js: 1.16.1 - react: 16.14.0 - react-color: 2.18.1_react@16.14.0 - react-dom: 16.14.0_react@16.14.0 - react-popper-tooltip: 2.11.1_react-dom@16.14.0+react@16.14.0 - react-syntax-highlighter: 12.2.1_react@16.14.0 - react-textarea-autosize: 8.2.0_react@16.14.0 - ts-dedent: 1.2.0 - resolution: - integrity: sha512-CnWgr/jgo7/XU+s7jhpNYevUivEsJccMRxuyOI+Ry8ndnoheifT4fp4+O5OaOeC08hStlPyad85LdTbOKigt7g== /@storybook/components/6.0.27_@types+react@16.9.54: dependencies: '@storybook/client-logger': 6.0.27 @@ -3666,7 +3640,7 @@ packages: '@storybook/router': 6.0.27_react-dom@16.13.1+react@16.13.1 '@storybook/semver': 7.3.2 '@storybook/theming': 6.0.27_react-dom@16.13.1+react@16.13.1 - '@storybook/ui': 6.0.27 + '@storybook/ui': 6.0.27_@types+react@16.9.54 '@types/glob-base': 0.3.0 '@types/micromatch': 4.0.1 '@types/node-fetch': 2.5.7 @@ -3727,7 +3701,7 @@ packages: unfetch: 4.2.0 url-loader: 4.1.1_file-loader@6.1.1+webpack@4.44.1 util-deprecate: 1.0.2 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 webpack-dev-middleware: 3.7.2_webpack@4.44.1 webpack-hot-middleware: 2.25.0 webpack-virtual-modules: 0.2.2 @@ -3782,7 +3756,7 @@ packages: react-dom: 16.13.1_react@16.13.1 regenerator-runtime: 0.13.7 ts-dedent: 1.1.1 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 dev: false engines: node: '>=8.0.0' @@ -3931,14 +3905,14 @@ packages: react-dom: '*' resolution: integrity: sha512-6jm7tJuGUZzSftRQce776fS9/Pt5OAypmaTOj035z3RWswoQ1pj8olXVnSNxSt6jyYoWrJru8kiCl7w78q0rPg== - /@storybook/ui/6.0.27: + /@storybook/ui/6.0.27_@types+react@16.9.54: dependencies: '@emotion/core': 10.0.35_react@16.14.0 '@storybook/addons': 6.0.27_react-dom@16.14.0+react@16.14.0 '@storybook/api': 6.0.27_react-dom@16.14.0 '@storybook/channels': 6.0.27 '@storybook/client-logger': 6.0.27 - '@storybook/components': 6.0.27 + '@storybook/components': 6.0.27_@types+react@16.9.54 '@storybook/core-events': 6.0.27 '@storybook/router': 6.0.27_react-dom@16.14.0+react@16.14.0 '@storybook/semver': 7.3.2 @@ -3964,6 +3938,8 @@ packages: regenerator-runtime: 0.13.7 resolve-from: 5.0.0 store2: 2.12.0 + peerDependencies: + '@types/react': '*' resolution: integrity: sha512-hxTeoe3QTSJ4P9EI8Kc8hroxem5OXEYq77zKq8XxgtOKhVzhQVaA+c4p/t6Z68+yK693CCp07+6QvGo++EQEHw== /@svgr/babel-plugin-add-jsx-attribute/5.4.0: @@ -4428,7 +4404,7 @@ packages: chalk: 2.4.2 strip-ansi: 4.0.0 text-table: 0.2.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 webpack-log: 1.2.0 dev: false engines: @@ -4842,7 +4818,7 @@ packages: mkdirp: 0.5.5 pify: 4.0.1 schema-utils: 2.7.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 6.9' peerDependencies: @@ -5016,7 +4992,7 @@ packages: '@babel/helper-module-imports': 7.10.1 babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.15 - styled-components: 5.1.1_9a4a3b3ed34a772b68db523825332f5f + styled-components: 5.1.1_988f4f9157fb8e0dba6a9870bbd1cb60 dev: false peerDependencies: styled-components: '>= 2' @@ -5944,7 +5920,7 @@ packages: postcss-value-parser: 4.1.0 schema-utils: 2.7.1 semver: 6.3.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 8.9.0' peerDependencies: @@ -6262,7 +6238,7 @@ packages: /dotenv-webpack/1.8.0_webpack@4.44.1: dependencies: dotenv-defaults: 1.1.1 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 peerDependencies: webpack: ^1 || ^2 || ^3 || ^4 resolution: @@ -6769,7 +6745,7 @@ packages: dependencies: loader-utils: 2.0.0 schema-utils: 3.0.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 10.13.0' peerDependencies: @@ -7399,7 +7375,7 @@ packages: pretty-error: 2.1.2 tapable: 1.1.3 util.promisify: 1.0.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>=6.9' peerDependencies: @@ -9517,7 +9493,7 @@ packages: dependencies: loader-utils: 2.0.0 schema-utils: 3.0.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 10.13.0' peerDependencies: @@ -9835,16 +9811,6 @@ packages: react: ^16.8.0 resolution: integrity: sha512-grajUlVbkx6VdtSxCgzloUIphIZF5bKr21OYMceWPKkniy7H0mRAT/AXPrRtObAe+zUePnNlBwUc4ivVjUGIjw== - /react-textarea-autosize/8.2.0_react@16.14.0: - dependencies: - '@babel/runtime': 7.12.1 - react: 16.14.0 - use-composed-ref: 1.0.0_react@16.14.0 - use-latest: 1.1.0_react@16.14.0 - peerDependencies: - react: ^16.8.0 - resolution: - integrity: sha512-grajUlVbkx6VdtSxCgzloUIphIZF5bKr21OYMceWPKkniy7H0mRAT/AXPrRtObAe+zUePnNlBwUc4ivVjUGIjw== /react-transition-group/4.4.1_react-dom@16.13.1+react@16.13.1: dependencies: '@babel/runtime': 7.11.2 @@ -10729,7 +10695,7 @@ packages: dependencies: loader-utils: 2.0.0 schema-utils: 2.7.1 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 8.9.0' peerDependencies: @@ -10742,7 +10708,7 @@ packages: dev: true resolution: integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== - /styled-components/5.1.1_9a4a3b3ed34a772b68db523825332f5f: + /styled-components/5.1.1_988f4f9157fb8e0dba6a9870bbd1cb60: dependencies: '@babel/helper-module-imports': 7.10.1 '@babel/traverse': 7.10.1 @@ -10762,7 +10728,6 @@ packages: react: '>= 16.8.0' react-dom: '>= 16.8.0' react-is: '>= 16.8.0' - styled-components: '*' requiresBuild: true resolution: integrity: sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== @@ -10876,7 +10841,7 @@ packages: serialize-javascript: 4.0.0 source-map: 0.6.1 terser: 4.8.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 webpack-sources: 1.4.3 worker-farm: 1.7.0 engines: @@ -10895,7 +10860,7 @@ packages: serialize-javascript: 4.0.0 source-map: 0.6.1 terser: 4.8.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 webpack-sources: 1.4.3 engines: node: '>= 10.13.0' @@ -11289,7 +11254,7 @@ packages: loader-utils: 2.0.0 mime-types: 2.1.27 schema-utils: 3.0.0 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 engines: node: '>= 10.13.0' peerDependencies: @@ -11326,17 +11291,6 @@ packages: optional: true resolution: integrity: sha512-JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg== - /use-isomorphic-layout-effect/1.0.0_react@16.14.0: - dependencies: - react: 16.14.0 - peerDependencies: - '@types/react': '*' - react: ^16.8.0 - peerDependenciesMeta: - '@types/react': - optional: true - resolution: - integrity: sha512-JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg== /use-latest/1.1.0_7a81abeb4682dcd740958f1c62af662f: dependencies: '@types/react': 16.9.54 @@ -11350,18 +11304,6 @@ packages: optional: true resolution: integrity: sha512-gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw== - /use-latest/1.1.0_react@16.14.0: - dependencies: - react: 16.14.0 - use-isomorphic-layout-effect: 1.0.0_react@16.14.0 - peerDependencies: - '@types/react': '*' - react: ^16.8.0 - peerDependenciesMeta: - '@types/react': - optional: true - resolution: - integrity: sha512-gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw== /use/3.1.1: engines: node: '>=0.10.0' @@ -11479,7 +11421,7 @@ packages: mime: 2.4.6 mkdirp: 0.5.5 range-parser: 1.2.1 - webpack: 4.44.1_webpack@4.44.1 + webpack: 4.44.1 webpack-log: 2.0.0 engines: node: '>= 6' @@ -11525,7 +11467,7 @@ packages: debug: 3.2.6 resolution: integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA== - /webpack/4.44.1_webpack@4.44.1: + /webpack/4.44.1: dependencies: '@webassemblyjs/ast': 1.9.0 '@webassemblyjs/helper-module-context': 1.9.0 @@ -11549,13 +11491,11 @@ packages: tapable: 1.1.3 terser-webpack-plugin: 1.4.5_webpack@4.44.1 watchpack: 1.7.4 - webpack: 4.44.1_webpack@4.44.1 webpack-sources: 1.4.3 engines: node: '>=6.11.5' hasBin: true peerDependencies: - webpack: '*' webpack-cli: '*' webpack-command: '*' peerDependenciesMeta: diff --git a/libraries/core-react/README.md b/libraries/core-react/README.md index 11b7affe2f..c9dd3a7bfb 100644 --- a/libraries/core-react/README.md +++ b/libraries/core-react/README.md @@ -62,7 +62,7 @@ npm install @equinor/eds-core-react styled-components ## Usage ```jsx -import React from 'react' +import * as React from 'react' import { render } from 'react-dom' import { Button, Typography } from '@equinor/eds-core-react' diff --git a/libraries/core-react/pnpm-lock.yaml b/libraries/core-react/pnpm-lock.yaml index 56ff3edd3d..fb824a3c2b 100644 --- a/libraries/core-react/pnpm-lock.yaml +++ b/libraries/core-react/pnpm-lock.yaml @@ -32,11 +32,11 @@ devDependencies: react-dom: 16.13.1_react@16.13.1 rollup: 2.15.0 rollup-plugin-typescript2: 0.27.2_rollup@2.15.0+typescript@4.0.2 - styled-components: 4.4.1_4f54128445bc6f13bd713dcb3d91e98e + styled-components: 4.4.1_react-dom@16.13.1+react@16.13.1 ts-jest: 26.3.0_jest@26.0.1+typescript@4.0.2 tslib: 2.0.1 typescript: 4.0.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@babel/cli/7.10.1_@babel+core@7.10.2: dependencies: @@ -1303,7 +1303,7 @@ packages: jest-haste-map: 26.0.1 jest-message-util: 26.0.1 jest-regex-util: 26.0.0 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 jest-resolve-dependencies: 26.0.1 jest-runner: 26.0.1 jest-runtime: 26.0.1 @@ -1371,7 +1371,7 @@ packages: istanbul-lib-source-maps: 4.0.0 istanbul-reports: 3.0.2 jest-haste-map: 26.0.1 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 jest-util: 26.0.1 jest-worker: 26.0.0 slash: 3.0.0 @@ -2024,7 +2024,7 @@ packages: '@babel/helper-module-imports': 7.10.1 babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.15 - styled-components: 4.4.1_4f54128445bc6f13bd713dcb3d91e98e + styled-components: 4.4.1_react-dom@16.13.1+react@16.13.1 dev: true peerDependencies: styled-components: '>= 2' @@ -3503,7 +3503,7 @@ packages: jest-get-type: 26.0.0 jest-jasmine2: 26.0.1 jest-regex-util: 26.0.0 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 jest-util: 26.0.1 jest-validate: 26.0.1 micromatch: 4.0.2 @@ -3693,7 +3693,7 @@ packages: integrity: sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q== /jest-pnp-resolver/1.2.1_jest-resolve@26.0.1: dependencies: - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 dev: true engines: node: '>=6' @@ -3720,7 +3720,7 @@ packages: node: '>= 10.14.2' resolution: integrity: sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw== - /jest-resolve/26.0.1_jest-resolve@26.0.1: + /jest-resolve/26.0.1: dependencies: '@jest/types': 26.0.1 chalk: 4.0.0 @@ -3733,8 +3733,6 @@ packages: dev: true engines: node: '>= 10.14.2' - peerDependencies: - jest-resolve: '*' resolution: integrity: sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ== /jest-runner/26.0.1: @@ -3752,7 +3750,7 @@ packages: jest-jasmine2: 26.0.1 jest-leak-detector: 26.0.1 jest-message-util: 26.0.1 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 jest-runtime: 26.0.1 jest-util: 26.0.1 jest-worker: 26.0.0 @@ -3784,7 +3782,7 @@ packages: jest-message-util: 26.0.1 jest-mock: 26.0.1 jest-regex-util: 26.0.0 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 jest-snapshot: 26.0.1 jest-util: 26.0.1 jest-validate: 26.0.1 @@ -3817,7 +3815,7 @@ packages: jest-get-type: 26.0.0 jest-matcher-utils: 26.0.1 jest-message-util: 26.0.1 - jest-resolve: 26.0.1_jest-resolve@26.0.1 + jest-resolve: 26.0.1 make-dir: 3.1.0 natural-compare: 1.4.0 pretty-format: 26.0.1 @@ -3830,7 +3828,7 @@ packages: /jest-styled-components/6.3.4_styled-components@4.4.1: dependencies: css: 2.2.4 - styled-components: 4.4.1_4f54128445bc6f13bd713dcb3d91e98e + styled-components: 4.4.1_react-dom@16.13.1+react@16.13.1 dev: true peerDependencies: styled-components: ^2 || ^3 || ^4 @@ -5332,7 +5330,7 @@ packages: node: '>=8' resolution: integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - /styled-components/4.4.1_4f54128445bc6f13bd713dcb3d91e98e: + /styled-components/4.4.1_react-dom@16.13.1+react@16.13.1: dependencies: '@babel/helper-module-imports': 7.10.1 '@babel/traverse': 7.10.1 @@ -5353,7 +5351,6 @@ packages: peerDependencies: react: '>= 16.3.0' react-dom: '>= 16.3.0' - styled-components: '*' requiresBuild: true resolution: integrity: sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g== diff --git a/libraries/core-react/src/Accordion/Accordion.test.tsx b/libraries/core-react/src/Accordion/Accordion.test.tsx index 9c43052993..e058037c64 100644 --- a/libraries/core-react/src/Accordion/Accordion.test.tsx +++ b/libraries/core-react/src/Accordion/Accordion.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen, fireEvent } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Accordion/Accordion.tsx b/libraries/core-react/src/Accordion/Accordion.tsx index 182bf4739a..68ff741b38 100644 --- a/libraries/core-react/src/Accordion/Accordion.tsx +++ b/libraries/core-react/src/Accordion/Accordion.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, useMemo, ReactElement, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, useMemo, ReactElement, HTMLAttributes } from 'react' import createId from 'lodash/uniqueId' import type { AccordionProps } from './Accordion.types' diff --git a/libraries/core-react/src/Accordion/AccordionHeader.tsx b/libraries/core-react/src/Accordion/AccordionHeader.tsx index b4275b3c6f..e0fa7b6ce3 100644 --- a/libraries/core-react/src/Accordion/AccordionHeader.tsx +++ b/libraries/core-react/src/Accordion/AccordionHeader.tsx @@ -1,9 +1,5 @@ -import React, { - forwardRef, - HTMLAttributes, - isValidElement, - ReactElement, -} from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes, isValidElement, ReactElement } from 'react' import styled from 'styled-components' import type { CSSObject } from 'styled-components' // eslint-disable-next-line camelcase diff --git a/libraries/core-react/src/Accordion/AccordionHeaderTitle.tsx b/libraries/core-react/src/Accordion/AccordionHeaderTitle.tsx index 177295c478..da4434a3ad 100644 --- a/libraries/core-react/src/Accordion/AccordionHeaderTitle.tsx +++ b/libraries/core-react/src/Accordion/AccordionHeaderTitle.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { accordion as tokens } from './Accordion.tokens' diff --git a/libraries/core-react/src/Accordion/AccordionItem.tsx b/libraries/core-react/src/Accordion/AccordionItem.tsx index a5c8ae8321..e8dc071a1f 100644 --- a/libraries/core-react/src/Accordion/AccordionItem.tsx +++ b/libraries/core-react/src/Accordion/AccordionItem.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useState, useEffect, diff --git a/libraries/core-react/src/Accordion/AccordionPanel.tsx b/libraries/core-react/src/Accordion/AccordionPanel.tsx index 8728ce1738..3f16d4e0b1 100644 --- a/libraries/core-react/src/Accordion/AccordionPanel.tsx +++ b/libraries/core-react/src/Accordion/AccordionPanel.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { accordion as tokens } from './Accordion.tokens' diff --git a/libraries/core-react/src/Avatar/Avatar.test.tsx b/libraries/core-react/src/Avatar/Avatar.test.tsx index 90aeeed913..8e5174ce49 100644 --- a/libraries/core-react/src/Avatar/Avatar.test.tsx +++ b/libraries/core-react/src/Avatar/Avatar.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Avatar/Avatar.tsx b/libraries/core-react/src/Avatar/Avatar.tsx index cdf103d687..1776235414 100644 --- a/libraries/core-react/src/Avatar/Avatar.tsx +++ b/libraries/core-react/src/Avatar/Avatar.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { avatar as tokens } from './Avatar.tokens' diff --git a/libraries/core-react/src/Banner/Banner.test.tsx b/libraries/core-react/src/Banner/Banner.test.tsx index 5e0979ea61..e2607a1110 100644 --- a/libraries/core-react/src/Banner/Banner.test.tsx +++ b/libraries/core-react/src/Banner/Banner.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Banner/Banner.tsx b/libraries/core-react/src/Banner/Banner.tsx index 89a78b478e..2018a46313 100644 --- a/libraries/core-react/src/Banner/Banner.tsx +++ b/libraries/core-react/src/Banner/Banner.tsx @@ -1,4 +1,5 @@ -import React, { FC, HTMLAttributes, ReactNode } from 'react' +import * as React from 'react' +import { FC, HTMLAttributes, ReactNode } from 'react' import styled from 'styled-components' import { banner as tokens } from './Banner.tokens' import { Divider } from '../Divider' diff --git a/libraries/core-react/src/Banner/BannerActions.tsx b/libraries/core-react/src/Banner/BannerActions.tsx index 41af34800a..ecf4747d7f 100644 --- a/libraries/core-react/src/Banner/BannerActions.tsx +++ b/libraries/core-react/src/Banner/BannerActions.tsx @@ -1,4 +1,5 @@ -import React, { FC, HTMLAttributes, ReactNode } from 'react' +import * as React from 'react' +import { FC, HTMLAttributes, ReactNode } from 'react' import styled from 'styled-components' import { banner as tokens } from './Banner.tokens' diff --git a/libraries/core-react/src/Banner/BannerIcon.tsx b/libraries/core-react/src/Banner/BannerIcon.tsx index e152f21033..6ac819e14f 100644 --- a/libraries/core-react/src/Banner/BannerIcon.tsx +++ b/libraries/core-react/src/Banner/BannerIcon.tsx @@ -1,4 +1,5 @@ -import React, { FC, HTMLAttributes, ReactNode } from 'react' +import * as React from 'react' +import { FC, HTMLAttributes, ReactNode } from 'react' import styled from 'styled-components' import { banner as tokens } from './Banner.tokens' import { Icon } from '../Icon' diff --git a/libraries/core-react/src/Banner/BannerMessage.tsx b/libraries/core-react/src/Banner/BannerMessage.tsx index 3f0b25573e..ae210c9a6a 100644 --- a/libraries/core-react/src/Banner/BannerMessage.tsx +++ b/libraries/core-react/src/Banner/BannerMessage.tsx @@ -1,4 +1,5 @@ -import React, { FC } from 'react' +import * as React from 'react' +import { FC } from 'react' import styled from 'styled-components' import { Typography } from '../Typography' import { TypographyProps } from '../Typography/Typography' diff --git a/libraries/core-react/src/Breadcrumbs/Breadcrumb.tsx b/libraries/core-react/src/Breadcrumbs/Breadcrumb.tsx index b49c853cb2..c0f8eaeb58 100644 --- a/libraries/core-react/src/Breadcrumbs/Breadcrumb.tsx +++ b/libraries/core-react/src/Breadcrumbs/Breadcrumb.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { Typography } from '../Typography' import { Tooltip } from '../Tooltip' diff --git a/libraries/core-react/src/Breadcrumbs/Breadcrumbs.test.tsx b/libraries/core-react/src/Breadcrumbs/Breadcrumbs.test.tsx index 7e101a39bd..868ef58616 100644 --- a/libraries/core-react/src/Breadcrumbs/Breadcrumbs.test.tsx +++ b/libraries/core-react/src/Breadcrumbs/Breadcrumbs.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Breadcrumbs/Breadcrumbs.tsx b/libraries/core-react/src/Breadcrumbs/Breadcrumbs.tsx index 55f9defee5..c85573f96b 100644 --- a/libraries/core-react/src/Breadcrumbs/Breadcrumbs.tsx +++ b/libraries/core-react/src/Breadcrumbs/Breadcrumbs.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useState, Fragment, diff --git a/libraries/core-react/src/Button/Button.test.tsx b/libraries/core-react/src/Button/Button.test.tsx index 4d28e56406..2125f41767 100644 --- a/libraries/core-react/src/Button/Button.test.tsx +++ b/libraries/core-react/src/Button/Button.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen, fireEvent } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Button/Button.tsx b/libraries/core-react/src/Button/Button.tsx index 5b2fae213a..c817f959dc 100644 --- a/libraries/core-react/src/Button/Button.tsx +++ b/libraries/core-react/src/Button/Button.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, ElementType, ButtonHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, ElementType, ButtonHTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { button, Button as ButtonType, ButtonGroups } from './Button.tokens' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Card/Card.test.tsx b/libraries/core-react/src/Card/Card.test.tsx index 4c7edeab32..4439118496 100644 --- a/libraries/core-react/src/Card/Card.test.tsx +++ b/libraries/core-react/src/Card/Card.test.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Card/Card.tsx b/libraries/core-react/src/Card/Card.tsx index 867e54430c..3d16d4354c 100644 --- a/libraries/core-react/src/Card/Card.tsx +++ b/libraries/core-react/src/Card/Card.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { card as tokens } from './Card.tokens' import { spacingsTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Card/CardActions.tsx b/libraries/core-react/src/Card/CardActions.tsx index ab6ba790ea..3e0275232a 100644 --- a/libraries/core-react/src/Card/CardActions.tsx +++ b/libraries/core-react/src/Card/CardActions.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { Typography } from '../Typography' diff --git a/libraries/core-react/src/Card/CardHeader.tsx b/libraries/core-react/src/Card/CardHeader.tsx index 7ac5b28e48..ccad8b8e83 100644 --- a/libraries/core-react/src/Card/CardHeader.tsx +++ b/libraries/core-react/src/Card/CardHeader.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { card as tokens } from './Card.tokens' diff --git a/libraries/core-react/src/Card/CardHeaderTitle.tsx b/libraries/core-react/src/Card/CardHeaderTitle.tsx index 458bcf0cb3..ed42da058a 100644 --- a/libraries/core-react/src/Card/CardHeaderTitle.tsx +++ b/libraries/core-react/src/Card/CardHeaderTitle.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' export type CardHeaderTitleProps = HTMLAttributes diff --git a/libraries/core-react/src/Card/CardMedia.tsx b/libraries/core-react/src/Card/CardMedia.tsx index b5e2bc4ded..7b769bc310 100644 --- a/libraries/core-react/src/Card/CardMedia.tsx +++ b/libraries/core-react/src/Card/CardMedia.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { card as tokens } from './Card.tokens' diff --git a/libraries/core-react/src/Chip/Chip.test.tsx b/libraries/core-react/src/Chip/Chip.test.tsx index 4b4410767a..66cea777c0 100644 --- a/libraries/core-react/src/Chip/Chip.test.tsx +++ b/libraries/core-react/src/Chip/Chip.test.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Chip/Chip.tsx b/libraries/core-react/src/Chip/Chip.tsx index ff9c9f7129..87234e5ca5 100644 --- a/libraries/core-react/src/Chip/Chip.tsx +++ b/libraries/core-react/src/Chip/Chip.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { Icon } from './Icon' import { chip as tokens } from './Chip.tokens' diff --git a/libraries/core-react/src/Dialog/Actions.tsx b/libraries/core-react/src/Dialog/Actions.tsx index 26a72dca33..f383d26241 100644 --- a/libraries/core-react/src/Dialog/Actions.tsx +++ b/libraries/core-react/src/Dialog/Actions.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' import styled, { css } from 'styled-components' import { dialog as tokens } from './Dialog.tokens' diff --git a/libraries/core-react/src/Dialog/CustomContent.tsx b/libraries/core-react/src/Dialog/CustomContent.tsx index 83476913db..bbbc08f64a 100644 --- a/libraries/core-react/src/Dialog/CustomContent.tsx +++ b/libraries/core-react/src/Dialog/CustomContent.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, Fragment, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, Fragment, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { Divider } from '../Divider' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Dialog/Dialog.tsx b/libraries/core-react/src/Dialog/Dialog.tsx index cb50b9dd6d..5aafa81a76 100644 --- a/libraries/core-react/src/Dialog/Dialog.tsx +++ b/libraries/core-react/src/Dialog/Dialog.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' import styled from 'styled-components' import { typographyTemplate } from '../_common/templates' import { dialog as tokens } from './Dialog.tokens' diff --git a/libraries/core-react/src/Dialog/Title.tsx b/libraries/core-react/src/Dialog/Title.tsx index 149c9bc59c..31a36edd50 100644 --- a/libraries/core-react/src/Dialog/Title.tsx +++ b/libraries/core-react/src/Dialog/Title.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, Fragment } from 'react' +import * as React from 'react' +import { forwardRef, Fragment } from 'react' import styled, { css } from 'styled-components' import { Divider } from '../Divider' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Divider/Divider.test.tsx b/libraries/core-react/src/Divider/Divider.test.tsx index abf5f6ebfa..9cf74536c4 100644 --- a/libraries/core-react/src/Divider/Divider.test.tsx +++ b/libraries/core-react/src/Divider/Divider.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Divider/Divider.tsx b/libraries/core-react/src/Divider/Divider.tsx index 60dbc40cf2..901420eae7 100644 --- a/libraries/core-react/src/Divider/Divider.tsx +++ b/libraries/core-react/src/Divider/Divider.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { divider as tokens } from './Divider.tokens' diff --git a/libraries/core-react/src/Icon/Icon.test.tsx b/libraries/core-react/src/Icon/Icon.test.tsx index 1a4e2bc25c..aa3ef78c08 100644 --- a/libraries/core-react/src/Icon/Icon.test.tsx +++ b/libraries/core-react/src/Icon/Icon.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Icon/Icon.tsx b/libraries/core-react/src/Icon/Icon.tsx index 27b003f730..3e068654a5 100644 --- a/libraries/core-react/src/Icon/Icon.tsx +++ b/libraries/core-react/src/Icon/Icon.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, Ref, SVGProps } from 'react' +import * as React from 'react' +import { forwardRef, Ref, SVGProps } from 'react' import styled from 'styled-components' import { get } from './library' import type { IconData } from '@equinor/eds-icons' diff --git a/libraries/core-react/src/List/List.test.tsx b/libraries/core-react/src/List/List.test.tsx index 777de8608d..c5eab6b2c9 100644 --- a/libraries/core-react/src/List/List.test.tsx +++ b/libraries/core-react/src/List/List.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/List/List.tsx b/libraries/core-react/src/List/List.tsx index bfbeca00b0..cdc3fc66a1 100644 --- a/libraries/core-react/src/List/List.tsx +++ b/libraries/core-react/src/List/List.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes, ElementType } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes, ElementType } from 'react' import styled, { css } from 'styled-components' import { list as tokens } from './List.tokens' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/List/ListItem.tsx b/libraries/core-react/src/List/ListItem.tsx index 5b18fa0861..92966784e7 100644 --- a/libraries/core-react/src/List/ListItem.tsx +++ b/libraries/core-react/src/List/ListItem.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' export type ListItemProps = React.HTMLAttributes diff --git a/libraries/core-react/src/Menu/Menu.context.tsx b/libraries/core-react/src/Menu/Menu.context.tsx index 57f6416928..daf7dd5cdd 100644 --- a/libraries/core-react/src/Menu/Menu.context.tsx +++ b/libraries/core-react/src/Menu/Menu.context.tsx @@ -1,4 +1,5 @@ -import React, { useState, useContext, ReactNode, MouseEvent } from 'react' +import * as React from 'react' +import { useState, useContext, ReactNode, MouseEvent } from 'react' export type State = { focusedIndex: number diff --git a/libraries/core-react/src/Menu/Menu.test.tsx b/libraries/core-react/src/Menu/Menu.test.tsx index 58b2f062d7..a6d90d8226 100644 --- a/libraries/core-react/src/Menu/Menu.test.tsx +++ b/libraries/core-react/src/Menu/Menu.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen, fireEvent } from './test-utils' import '@testing-library/jest-dom' import '@testing-library/jest-dom/extend-expect' diff --git a/libraries/core-react/src/Menu/Menu.tsx b/libraries/core-react/src/Menu/Menu.tsx index 1c3cde99f7..fed2dbea74 100644 --- a/libraries/core-react/src/Menu/Menu.tsx +++ b/libraries/core-react/src/Menu/Menu.tsx @@ -1,4 +1,5 @@ -import React, { useEffect, useRef, ReactNode, HTMLAttributes } from 'react' +import * as React from 'react' +import { useEffect, useRef, ReactNode, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { useMenu } from './Menu.context' import { Paper } from '../Paper' diff --git a/libraries/core-react/src/Menu/MenuItem.tsx b/libraries/core-react/src/Menu/MenuItem.tsx index a6c4a54415..1d422d1d73 100644 --- a/libraries/core-react/src/Menu/MenuItem.tsx +++ b/libraries/core-react/src/Menu/MenuItem.tsx @@ -1,4 +1,5 @@ -import React, { MouseEvent } from 'react' +import * as React from 'react' +import { MouseEvent } from 'react' import styled, { css } from 'styled-components' import { menu as tokens } from './Menu.tokens' import { templates, useCombinedRefs } from '../_common' diff --git a/libraries/core-react/src/Menu/MenuList.tsx b/libraries/core-react/src/Menu/MenuList.tsx index 61577bc005..2433cd43fe 100644 --- a/libraries/core-react/src/Menu/MenuList.tsx +++ b/libraries/core-react/src/Menu/MenuList.tsx @@ -1,9 +1,5 @@ -import React, { - useEffect, - ReactElement, - ReactNode, - isValidElement, -} from 'react' +import * as React from 'react' +import { useEffect, ReactElement, ReactNode, isValidElement } from 'react' import styled from 'styled-components' import { useMenu } from './Menu.context' import type { FocusTarget } from './Menu.types' diff --git a/libraries/core-react/src/Menu/MenuSection.tsx b/libraries/core-react/src/Menu/MenuSection.tsx index dd61c9a236..6db8a0c84b 100644 --- a/libraries/core-react/src/Menu/MenuSection.tsx +++ b/libraries/core-react/src/Menu/MenuSection.tsx @@ -1,4 +1,5 @@ -import React, { ReactNode } from 'react' +import * as React from 'react' +import { ReactNode } from 'react' import styled from 'styled-components' import { menu as tokens } from './Menu.tokens' import { templates } from '../_common' diff --git a/libraries/core-react/src/Menu/index.tsx b/libraries/core-react/src/Menu/index.tsx index dbdf094cd3..2ab2cd275d 100644 --- a/libraries/core-react/src/Menu/index.tsx +++ b/libraries/core-react/src/Menu/index.tsx @@ -1,4 +1,5 @@ -import React, { FC } from 'react' +import * as React from 'react' +import { FC } from 'react' import { Menu as BaseMenu, MenuProps } from './Menu' import { MenuItem } from './MenuItem' import { MenuSection } from './MenuSection' diff --git a/libraries/core-react/src/Menu/test-utils.tsx b/libraries/core-react/src/Menu/test-utils.tsx index 07d3ec9f2a..66b595027e 100644 --- a/libraries/core-react/src/Menu/test-utils.tsx +++ b/libraries/core-react/src/Menu/test-utils.tsx @@ -1,4 +1,5 @@ -import React, { ElementType, ReactElement, ReactNode } from 'react' +import * as React from 'react' +import { ElementType, ReactElement, ReactNode } from 'react' import { render, RenderOptions, RenderResult } from '@testing-library/react' const AllTheProviders = ({ children }: { children: ReactNode }) => { diff --git a/libraries/core-react/src/Pagination/Pagination.test.tsx b/libraries/core-react/src/Pagination/Pagination.test.tsx index fb1bae2cac..59c07bc834 100644 --- a/libraries/core-react/src/Pagination/Pagination.test.tsx +++ b/libraries/core-react/src/Pagination/Pagination.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Pagination/Pagination.tsx b/libraries/core-react/src/Pagination/Pagination.tsx index 0842033a0e..2facb4e73e 100644 --- a/libraries/core-react/src/Pagination/Pagination.tsx +++ b/libraries/core-react/src/Pagination/Pagination.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useState, MouseEvent, @@ -200,10 +201,10 @@ export const Pagination = forwardRef( {currentItemFirst !== currentItemLast - ? `${currentItemFirst} - ${' - '} + ? `${currentItemFirst} + ${' - '} ${currentItemLast} - ${' of '} + ${' of '} ${totalItems} ${' items'}` : `${currentItemFirst} ${' of '} ${totalItems} ${' items'}`} diff --git a/libraries/core-react/src/Pagination/PaginationItem.tsx b/libraries/core-react/src/Pagination/PaginationItem.tsx index 0933db0c9d..2c1d57f414 100644 --- a/libraries/core-react/src/Pagination/PaginationItem.tsx +++ b/libraries/core-react/src/Pagination/PaginationItem.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, MouseEvent, KeyboardEvent } from 'react' +import * as React from 'react' +import { forwardRef, MouseEvent, KeyboardEvent } from 'react' import { Button } from '../Button' import { pagination as tokens } from './Pagination.tokens' diff --git a/libraries/core-react/src/Paper/Paper.tsx b/libraries/core-react/src/Paper/Paper.tsx index bac30c88ac..739d6b2aca 100644 --- a/libraries/core-react/src/Paper/Paper.tsx +++ b/libraries/core-react/src/Paper/Paper.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' import styled from 'styled-components' import { paper as tokens, ElevationTypes } from './Paper.tokens' diff --git a/libraries/core-react/src/Popover/Popover.test.tsx b/libraries/core-react/src/Popover/Popover.test.tsx index 0c2c97460c..8db64b740c 100644 --- a/libraries/core-react/src/Popover/Popover.test.tsx +++ b/libraries/core-react/src/Popover/Popover.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import PropTypes from 'prop-types' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' diff --git a/libraries/core-react/src/Popover/Popover.tsx b/libraries/core-react/src/Popover/Popover.tsx index 258e68d2d4..ccd976e1ee 100644 --- a/libraries/core-react/src/Popover/Popover.tsx +++ b/libraries/core-react/src/Popover/Popover.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useRef, HTMLAttributes, diff --git a/libraries/core-react/src/Popover/PopoverAnchor.tsx b/libraries/core-react/src/Popover/PopoverAnchor.tsx index 8499783a45..1397abd336 100644 --- a/libraries/core-react/src/Popover/PopoverAnchor.tsx +++ b/libraries/core-react/src/Popover/PopoverAnchor.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' type Props = HTMLAttributes diff --git a/libraries/core-react/src/Popover/PopoverContent.tsx b/libraries/core-react/src/Popover/PopoverContent.tsx index 525c786089..88030b2229 100644 --- a/libraries/core-react/src/Popover/PopoverContent.tsx +++ b/libraries/core-react/src/Popover/PopoverContent.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' const ContentWrapper = styled.div` diff --git a/libraries/core-react/src/Popover/PopoverItem.tsx b/libraries/core-react/src/Popover/PopoverItem.tsx index 2e4d464a09..35bd16799c 100644 --- a/libraries/core-react/src/Popover/PopoverItem.tsx +++ b/libraries/core-react/src/Popover/PopoverItem.tsx @@ -1,11 +1,6 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import React, { - useEffect, - useRef, - forwardRef, - HTMLAttributes, - SVGProps, -} from 'react' +import * as React from 'react' +import { useEffect, useRef, forwardRef, HTMLAttributes, SVGProps } from 'react' import styled, { css } from 'styled-components' import { Icon } from '../Icon' import { Card } from '../Card' diff --git a/libraries/core-react/src/Popover/PopoverTitle.tsx b/libraries/core-react/src/Popover/PopoverTitle.tsx index 4e6dc6310e..8a67648063 100644 --- a/libraries/core-react/src/Popover/PopoverTitle.tsx +++ b/libraries/core-react/src/Popover/PopoverTitle.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { Divider } from '../Divider' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Progress/Circular/CircularProgress.test.tsx b/libraries/core-react/src/Progress/Circular/CircularProgress.test.tsx index e2f5d5f394..8b6b725cb4 100644 --- a/libraries/core-react/src/Progress/Circular/CircularProgress.test.tsx +++ b/libraries/core-react/src/Progress/Circular/CircularProgress.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Progress/Circular/CircularProgress.tsx b/libraries/core-react/src/Progress/Circular/CircularProgress.tsx index 106186f520..2d951a1618 100644 --- a/libraries/core-react/src/Progress/Circular/CircularProgress.tsx +++ b/libraries/core-react/src/Progress/Circular/CircularProgress.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import CSS from 'csstype' import styled, { css, keyframes } from 'styled-components' import { progress as tokens } from '../Progress.tokens' diff --git a/libraries/core-react/src/Progress/Dots/DotProgress.test.tsx b/libraries/core-react/src/Progress/Dots/DotProgress.test.tsx index c2a19a4df2..79397e2d4f 100644 --- a/libraries/core-react/src/Progress/Dots/DotProgress.test.tsx +++ b/libraries/core-react/src/Progress/Dots/DotProgress.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Progress/Dots/DotProgress.tsx b/libraries/core-react/src/Progress/Dots/DotProgress.tsx index 5f29eee264..a7c1140c91 100644 --- a/libraries/core-react/src/Progress/Dots/DotProgress.tsx +++ b/libraries/core-react/src/Progress/Dots/DotProgress.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, Ref, SVGProps } from 'react' +import * as React from 'react' +import { forwardRef, Ref, SVGProps } from 'react' import styled, { keyframes } from 'styled-components' import { progress as tokens } from '../Progress.tokens' diff --git a/libraries/core-react/src/Progress/Linear/LinearProgress.test.tsx b/libraries/core-react/src/Progress/Linear/LinearProgress.test.tsx index 4f70e3905c..e58fd9f6b7 100644 --- a/libraries/core-react/src/Progress/Linear/LinearProgress.test.tsx +++ b/libraries/core-react/src/Progress/Linear/LinearProgress.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Progress/Linear/LinearProgress.tsx b/libraries/core-react/src/Progress/Linear/LinearProgress.tsx index 9cbb86472d..87c7cd075a 100644 --- a/libraries/core-react/src/Progress/Linear/LinearProgress.tsx +++ b/libraries/core-react/src/Progress/Linear/LinearProgress.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css, keyframes } from 'styled-components' import { progress as tokens } from '../Progress.tokens' import CSS from 'csstype' diff --git a/libraries/core-react/src/Progress/Star/StarProgress.test.tsx b/libraries/core-react/src/Progress/Star/StarProgress.test.tsx index d484bd6136..ddb00c6d7b 100644 --- a/libraries/core-react/src/Progress/Star/StarProgress.test.tsx +++ b/libraries/core-react/src/Progress/Star/StarProgress.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Progress/Star/StarProgress.tsx b/libraries/core-react/src/Progress/Star/StarProgress.tsx index 81a12788c1..866838d282 100644 --- a/libraries/core-react/src/Progress/Star/StarProgress.tsx +++ b/libraries/core-react/src/Progress/Star/StarProgress.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, SVGProps, Ref } from 'react' +import * as React from 'react' +import { forwardRef, SVGProps, Ref } from 'react' import styled, { keyframes, css } from 'styled-components' import { progress as tokens } from '../Progress.tokens' diff --git a/libraries/core-react/src/Scrim/Scrim.test.tsx b/libraries/core-react/src/Scrim/Scrim.test.tsx index ad76596d2f..6ecca5d7d4 100644 --- a/libraries/core-react/src/Scrim/Scrim.test.tsx +++ b/libraries/core-react/src/Scrim/Scrim.test.tsx @@ -1,5 +1,6 @@ /* eslint-disable no-undef */ -import React, { useState } from 'react' +import * as React from 'react' +import { useState } from 'react' import { render, cleanup, screen, fireEvent } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Scrim/Scrim.tsx b/libraries/core-react/src/Scrim/Scrim.tsx index 0dcf2b0c7e..7c9d5b6b81 100644 --- a/libraries/core-react/src/Scrim/Scrim.tsx +++ b/libraries/core-react/src/Scrim/Scrim.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, useEffect, MouseEvent, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, useEffect, MouseEvent, HTMLAttributes } from 'react' import styled from 'styled-components' import { scrim as tokens } from './Scrim.tokens' diff --git a/libraries/core-react/src/Search/Search.test.tsx b/libraries/core-react/src/Search/Search.test.tsx index c5ee0c766a..628d756e36 100644 --- a/libraries/core-react/src/Search/Search.test.tsx +++ b/libraries/core-react/src/Search/Search.test.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Search/Search.tsx b/libraries/core-react/src/Search/Search.tsx index 34d6eb330f..2bb7ed965d 100644 --- a/libraries/core-react/src/Search/Search.tsx +++ b/libraries/core-react/src/Search/Search.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { useState, useRef, useEffect, diff --git a/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.test.tsx b/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.test.tsx index e6e7e5472a..102aefea73 100644 --- a/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.test.tsx +++ b/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.test.tsx @@ -1,6 +1,7 @@ /* eslint-disable no-undef */ -import React, { useState } from 'react' +import * as React from 'react' +import { useState } from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.tsx b/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.tsx index 146f50b328..f9205533b2 100644 --- a/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.tsx +++ b/libraries/core-react/src/SelectionControls/Checkbox/Checkbox.tsx @@ -1,5 +1,6 @@ /* eslint camelcase: "off" */ -import React, { forwardRef, Ref, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, Ref, InputHTMLAttributes } from 'react' import styled from 'styled-components' import { checkbox, diff --git a/libraries/core-react/src/SelectionControls/Radio/Radio.test.tsx b/libraries/core-react/src/SelectionControls/Radio/Radio.test.tsx index 905a879f25..5df4226efb 100644 --- a/libraries/core-react/src/SelectionControls/Radio/Radio.test.tsx +++ b/libraries/core-react/src/SelectionControls/Radio/Radio.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import userEvent from '@testing-library/user-event' import '@testing-library/jest-dom' diff --git a/libraries/core-react/src/SelectionControls/Radio/Radio.tsx b/libraries/core-react/src/SelectionControls/Radio/Radio.tsx index f1eab5c888..42832f7b0b 100644 --- a/libraries/core-react/src/SelectionControls/Radio/Radio.tsx +++ b/libraries/core-react/src/SelectionControls/Radio/Radio.tsx @@ -1,5 +1,6 @@ /* eslint camelcase: "off" */ -import React, { forwardRef, Ref, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, Ref, InputHTMLAttributes } from 'react' import styled from 'styled-components' import { radio_button_selected, // eslint-disable-line camelcase diff --git a/libraries/core-react/src/SelectionControls/Switch/Input.tsx b/libraries/core-react/src/SelectionControls/Switch/Input.tsx index 1d80d2fdaa..2e27782acc 100644 --- a/libraries/core-react/src/SelectionControls/Switch/Input.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/Input.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, InputHTMLAttributes } from 'react' import styled from 'styled-components' import { switchControl as tokens } from './Switch.tokens' import type { Size } from './Switch.types' diff --git a/libraries/core-react/src/SelectionControls/Switch/InputWrapper.tsx b/libraries/core-react/src/SelectionControls/Switch/InputWrapper.tsx index c9ec2576aa..7467ab2a21 100644 --- a/libraries/core-react/src/SelectionControls/Switch/InputWrapper.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/InputWrapper.tsx @@ -1,4 +1,5 @@ -import React, { ReactNode } from 'react' +import * as React from 'react' +import { ReactNode } from 'react' import styled from 'styled-components' import { switchControl as tokens } from './Switch.tokens' import type { Size } from './Switch.types' diff --git a/libraries/core-react/src/SelectionControls/Switch/Switch.test.tsx b/libraries/core-react/src/SelectionControls/Switch/Switch.test.tsx index 66627be934..9a145395ad 100644 --- a/libraries/core-react/src/SelectionControls/Switch/Switch.test.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/Switch.test.tsx @@ -1,6 +1,6 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/SelectionControls/Switch/Switch.tsx b/libraries/core-react/src/SelectionControls/Switch/Switch.tsx index 289e9dddc1..2f974b8df5 100644 --- a/libraries/core-react/src/SelectionControls/Switch/Switch.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/Switch.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, Ref, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, Ref, InputHTMLAttributes } from 'react' import styled from 'styled-components' import { SwitchSmall } from './SwitchSmall' import { SwitchDefault } from './SwitchDefault' diff --git a/libraries/core-react/src/SelectionControls/Switch/SwitchDefault.tsx b/libraries/core-react/src/SelectionControls/Switch/SwitchDefault.tsx index 772dea9486..5b818daea7 100644 --- a/libraries/core-react/src/SelectionControls/Switch/SwitchDefault.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/SwitchDefault.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' import styled from 'styled-components' import { switchControl as tokens } from './Switch.tokens' import { InputWrapper } from './InputWrapper' diff --git a/libraries/core-react/src/SelectionControls/Switch/SwitchSmall.tsx b/libraries/core-react/src/SelectionControls/Switch/SwitchSmall.tsx index 63dfb143e9..c31037c274 100644 --- a/libraries/core-react/src/SelectionControls/Switch/SwitchSmall.tsx +++ b/libraries/core-react/src/SelectionControls/Switch/SwitchSmall.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef } from 'react' +import * as React from 'react' +import { forwardRef } from 'react' import styled from 'styled-components' import { switchControl as tokens } from './Switch.tokens' import { InputWrapper } from './InputWrapper' diff --git a/libraries/core-react/src/SideSheet/SideSheet.test.tsx b/libraries/core-react/src/SideSheet/SideSheet.test.tsx index d4c07f5bbc..74444fe3a5 100644 --- a/libraries/core-react/src/SideSheet/SideSheet.test.tsx +++ b/libraries/core-react/src/SideSheet/SideSheet.test.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/SideSheet/SideSheet.tsx b/libraries/core-react/src/SideSheet/SideSheet.tsx index f7b0965281..569faae8eb 100644 --- a/libraries/core-react/src/SideSheet/SideSheet.tsx +++ b/libraries/core-react/src/SideSheet/SideSheet.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { clear } from '@equinor/eds-icons' import { spacingsTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Slider/MinMax.tsx b/libraries/core-react/src/Slider/MinMax.tsx index aa12314f3c..67c274eb15 100644 --- a/libraries/core-react/src/Slider/MinMax.tsx +++ b/libraries/core-react/src/Slider/MinMax.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes, ReactNode } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes, ReactNode } from 'react' import styled from 'styled-components' import { typographyTemplate } from '../_common/templates' import { slider as tokens } from './Slider.tokens' diff --git a/libraries/core-react/src/Slider/Output.tsx b/libraries/core-react/src/Slider/Output.tsx index 09e0ba8014..a05b2acfcf 100644 --- a/libraries/core-react/src/Slider/Output.tsx +++ b/libraries/core-react/src/Slider/Output.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, OutputHTMLAttributes, ReactNode } from 'react' +import * as React from 'react' +import { forwardRef, OutputHTMLAttributes, ReactNode } from 'react' import styled from 'styled-components' import { typographyTemplate } from '../_common/templates' import { slider as tokens } from './Slider.tokens' diff --git a/libraries/core-react/src/Slider/Slider.test.tsx b/libraries/core-react/src/Slider/Slider.test.tsx index 5b7362e861..42a8b41200 100644 --- a/libraries/core-react/src/Slider/Slider.test.tsx +++ b/libraries/core-react/src/Slider/Slider.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent, screen } from '@testing-library/react' import '@testing-library/jest-dom' import { Slider } from './Slider' diff --git a/libraries/core-react/src/Slider/Slider.tsx b/libraries/core-react/src/Slider/Slider.tsx index 643deac20d..1cb81240d6 100644 --- a/libraries/core-react/src/Slider/Slider.tsx +++ b/libraries/core-react/src/Slider/Slider.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useState, useRef, diff --git a/libraries/core-react/src/Slider/SliderInput.tsx b/libraries/core-react/src/Slider/SliderInput.tsx index 66b1bd3780..4b1881b6f0 100644 --- a/libraries/core-react/src/Slider/SliderInput.tsx +++ b/libraries/core-react/src/Slider/SliderInput.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, InputHTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { slider as tokens } from './Slider.tokens' diff --git a/libraries/core-react/src/Snackbar/Snackbar.test.tsx b/libraries/core-react/src/Snackbar/Snackbar.test.tsx index 816d052b80..286a6c74b1 100644 --- a/libraries/core-react/src/Snackbar/Snackbar.test.tsx +++ b/libraries/core-react/src/Snackbar/Snackbar.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, diff --git a/libraries/core-react/src/Snackbar/Snackbar.tsx b/libraries/core-react/src/Snackbar/Snackbar.tsx index 0765b8e412..834a2629e1 100644 --- a/libraries/core-react/src/Snackbar/Snackbar.tsx +++ b/libraries/core-react/src/Snackbar/Snackbar.tsx @@ -1,4 +1,5 @@ -import React, { useState, useEffect, HTMLAttributes, FC } from 'react' +import * as React from 'react' +import { useState, useEffect, HTMLAttributes, FC } from 'react' import styled from 'styled-components' import { snackbar as tokens } from './Snackbar.tokens' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/Snackbar/SnackbarAction.tsx b/libraries/core-react/src/Snackbar/SnackbarAction.tsx index e2b3e45c3f..40c5020509 100644 --- a/libraries/core-react/src/Snackbar/SnackbarAction.tsx +++ b/libraries/core-react/src/Snackbar/SnackbarAction.tsx @@ -1,4 +1,5 @@ -import React, { Children, ReactNode } from 'react' +import * as React from 'react' +import { Children, ReactNode } from 'react' import styled from 'styled-components' import { snackbar as tokens } from './Snackbar.tokens' diff --git a/libraries/core-react/src/Table/Body.tsx b/libraries/core-react/src/Table/Body.tsx index 13902da114..0f335bbac0 100644 --- a/libraries/core-react/src/Table/Body.tsx +++ b/libraries/core-react/src/Table/Body.tsx @@ -1,4 +1,5 @@ -import React, { HTMLAttributes } from 'react' +import * as React from 'react' +import { HTMLAttributes } from 'react' import styled from 'styled-components' const TableBase = styled.tbody`` diff --git a/libraries/core-react/src/Table/Cell.tsx b/libraries/core-react/src/Table/Cell.tsx index 07400d0419..74d50b2d1b 100644 --- a/libraries/core-react/src/Table/Cell.tsx +++ b/libraries/core-react/src/Table/Cell.tsx @@ -1,4 +1,5 @@ -import React, { TdHTMLAttributes } from 'react' +import * as React from 'react' +import { TdHTMLAttributes } from 'react' import styled, { css } from 'styled-components' import type { Border } from '@equinor/eds-tokens' import { getTokens, TableCell } from './Table.tokens' diff --git a/libraries/core-react/src/Table/Head.tsx b/libraries/core-react/src/Table/Head.tsx index 0449e6aa51..eff792fbbc 100644 --- a/libraries/core-react/src/Table/Head.tsx +++ b/libraries/core-react/src/Table/Head.tsx @@ -1,4 +1,5 @@ -import React, { FunctionComponent } from 'react' +import * as React from 'react' +import { FunctionComponent } from 'react' import styled, { css } from 'styled-components' import { getTokens, TableCell } from './Table.tokens' import type { Border } from '@equinor/eds-tokens' diff --git a/libraries/core-react/src/Table/Row.tsx b/libraries/core-react/src/Table/Row.tsx index 6658b8d04f..fe19c0809c 100644 --- a/libraries/core-react/src/Table/Row.tsx +++ b/libraries/core-react/src/Table/Row.tsx @@ -1,4 +1,5 @@ -import React, { FunctionComponent } from 'react' +import * as React from 'react' +import { FunctionComponent } from 'react' import styled from 'styled-components' const TableBase = styled.tr`` diff --git a/libraries/core-react/src/Table/Table.tsx b/libraries/core-react/src/Table/Table.tsx index 8ea1893bf0..4aa745a810 100644 --- a/libraries/core-react/src/Table/Table.tsx +++ b/libraries/core-react/src/Table/Table.tsx @@ -1,4 +1,5 @@ -import React, { FunctionComponent, HTMLAttributes } from 'react' +import * as React from 'react' +import { FunctionComponent, HTMLAttributes } from 'react' import styled from 'styled-components' const TableBase = styled.table` diff --git a/libraries/core-react/src/TableOfContents/LinkItem.tsx b/libraries/core-react/src/TableOfContents/LinkItem.tsx index e11c17c915..89624bf285 100644 --- a/libraries/core-react/src/TableOfContents/LinkItem.tsx +++ b/libraries/core-react/src/TableOfContents/LinkItem.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { tableOfContents as tokens } from './TableOfContents.tokens' diff --git a/libraries/core-react/src/TableOfContents/TableOfContents.test.tsx b/libraries/core-react/src/TableOfContents/TableOfContents.test.tsx index cbd064549e..f37879d5ab 100644 --- a/libraries/core-react/src/TableOfContents/TableOfContents.test.tsx +++ b/libraries/core-react/src/TableOfContents/TableOfContents.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/TableOfContents/TableOfContents.tsx b/libraries/core-react/src/TableOfContents/TableOfContents.tsx index 7b13961a85..af1539a03b 100644 --- a/libraries/core-react/src/TableOfContents/TableOfContents.tsx +++ b/libraries/core-react/src/TableOfContents/TableOfContents.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { List } from '../List' import { Typography } from '../Typography' diff --git a/libraries/core-react/src/Tabs/Tab.tsx b/libraries/core-react/src/Tabs/Tab.tsx index c56aef1943..388e31e654 100644 --- a/libraries/core-react/src/Tabs/Tab.tsx +++ b/libraries/core-react/src/Tabs/Tab.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, ButtonHTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, ButtonHTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { tab as tokens } from './Tabs.tokens' diff --git a/libraries/core-react/src/Tabs/TabList.tsx b/libraries/core-react/src/Tabs/TabList.tsx index 12e3f454ce..7764144b99 100644 --- a/libraries/core-react/src/Tabs/TabList.tsx +++ b/libraries/core-react/src/Tabs/TabList.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useContext, useRef, diff --git a/libraries/core-react/src/Tabs/TabPanel.tsx b/libraries/core-react/src/Tabs/TabPanel.tsx index 165bc592ca..1eac03fcd4 100644 --- a/libraries/core-react/src/Tabs/TabPanel.tsx +++ b/libraries/core-react/src/Tabs/TabPanel.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { tabPanel as tokens } from './Tabs.tokens' diff --git a/libraries/core-react/src/Tabs/TabPanels.tsx b/libraries/core-react/src/Tabs/TabPanels.tsx index 0627c3072e..aeba7792a8 100644 --- a/libraries/core-react/src/Tabs/TabPanels.tsx +++ b/libraries/core-react/src/Tabs/TabPanels.tsx @@ -1,9 +1,5 @@ -import React, { - forwardRef, - ReactElement, - useContext, - HTMLAttributes, -} from 'react' +import * as React from 'react' +import { forwardRef, ReactElement, useContext, HTMLAttributes } from 'react' import { TabsContext } from './Tabs.context' type TabPanelsProps = HTMLAttributes diff --git a/libraries/core-react/src/Tabs/Tabs.test.tsx b/libraries/core-react/src/Tabs/Tabs.test.tsx index ccb376a6f6..6164f6e8d5 100644 --- a/libraries/core-react/src/Tabs/Tabs.test.tsx +++ b/libraries/core-react/src/Tabs/Tabs.test.tsx @@ -1,5 +1,6 @@ /* eslint-disable no-undef */ -import React, { useRef, useEffect, useState, Fragment } from 'react' +import * as React from 'react' +import { useRef, useEffect, useState, Fragment } from 'react' import PropTypes from 'prop-types' import { render, cleanup, screen, fireEvent } from '@testing-library/react' import '@testing-library/jest-dom' diff --git a/libraries/core-react/src/Tabs/Tabs.tsx b/libraries/core-react/src/Tabs/Tabs.tsx index afbcdba38f..3fe85c33b6 100644 --- a/libraries/core-react/src/Tabs/Tabs.tsx +++ b/libraries/core-react/src/Tabs/Tabs.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, useMemo, useState, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, useMemo, useState, HTMLAttributes } from 'react' import createId from 'lodash/uniqueId' import { TabsProvider } from './Tabs.context' import { Variants } from './Tabs.types' diff --git a/libraries/core-react/src/TextField/HelperText/HelperText.tsx b/libraries/core-react/src/TextField/HelperText/HelperText.tsx index 5277f3d02d..fa0be9b887 100644 --- a/libraries/core-react/src/TextField/HelperText/HelperText.tsx +++ b/libraries/core-react/src/TextField/HelperText/HelperText.tsx @@ -1,4 +1,5 @@ -import React, { ReactNode } from 'react' +import * as React from 'react' +import { ReactNode } from 'react' import styled, { css } from 'styled-components' import { typographyTemplate } from '../../_common/templates' import { diff --git a/libraries/core-react/src/TextField/Icon/Icon.tsx b/libraries/core-react/src/TextField/Icon/Icon.tsx index 1f3743a31b..d8fe89d1eb 100644 --- a/libraries/core-react/src/TextField/Icon/Icon.tsx +++ b/libraries/core-react/src/TextField/Icon/Icon.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import styled, { css } from 'styled-components' import { useTextField } from '../context' diff --git a/libraries/core-react/src/TextField/Input/Input.tsx b/libraries/core-react/src/TextField/Input/Input.tsx index d0aab67c84..f533cb6fba 100644 --- a/libraries/core-react/src/TextField/Input/Input.tsx +++ b/libraries/core-react/src/TextField/Input/Input.tsx @@ -1,4 +1,5 @@ -import React, { ReactNode, ElementType, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { ReactNode, ElementType, InputHTMLAttributes } from 'react' import styled, { css } from 'styled-components' import { InputVariantProps, input as tokens } from './Input.tokens' import { typographyTemplate, spacingsTemplate } from '../../_common/templates' diff --git a/libraries/core-react/src/TextField/Label/Label.tsx b/libraries/core-react/src/TextField/Label/Label.tsx index 7222e4db92..38cde27c54 100644 --- a/libraries/core-react/src/TextField/Label/Label.tsx +++ b/libraries/core-react/src/TextField/Label/Label.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import styled from 'styled-components' import { typographyTemplate } from '../../_common/templates' import { label as tokens } from './Label.tokens' diff --git a/libraries/core-react/src/TextField/TextField.test.tsx b/libraries/core-react/src/TextField/TextField.test.tsx index cd062b9171..486e1e7019 100644 --- a/libraries/core-react/src/TextField/TextField.test.tsx +++ b/libraries/core-react/src/TextField/TextField.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, fireEvent } from '@testing-library/react' import 'jest-styled-components' import styled from 'styled-components' diff --git a/libraries/core-react/src/TextField/TextField.tsx b/libraries/core-react/src/TextField/TextField.tsx index e82697295c..581d88a7ac 100644 --- a/libraries/core-react/src/TextField/TextField.tsx +++ b/libraries/core-react/src/TextField/TextField.tsx @@ -1,4 +1,5 @@ -import React, { ReactNode, InputHTMLAttributes } from 'react' +import * as React from 'react' +import { ReactNode, InputHTMLAttributes } from 'react' import styled from 'styled-components' import { Input } from './Input' import { Label } from './Label' diff --git a/libraries/core-react/src/TextField/context.tsx b/libraries/core-react/src/TextField/context.tsx index 5b61b78249..ad6f463553 100644 --- a/libraries/core-react/src/TextField/context.tsx +++ b/libraries/core-react/src/TextField/context.tsx @@ -1,4 +1,5 @@ -import React, { useState, useContext, ReactNode } from 'react' +import * as React from 'react' +import { useState, useContext, ReactNode } from 'react' export const propsFor = { variants: ['error', 'warning', 'success', 'default'], diff --git a/libraries/core-react/src/Tooltip/Tooltip.test.tsx b/libraries/core-react/src/Tooltip/Tooltip.test.tsx index cf6ee5641f..55db6f4573 100644 --- a/libraries/core-react/src/Tooltip/Tooltip.test.tsx +++ b/libraries/core-react/src/Tooltip/Tooltip.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Tooltip/Tooltip.tsx b/libraries/core-react/src/Tooltip/Tooltip.tsx index ecc6459ffc..ca60b28999 100644 --- a/libraries/core-react/src/Tooltip/Tooltip.tsx +++ b/libraries/core-react/src/Tooltip/Tooltip.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, useState, HTMLAttributes, diff --git a/libraries/core-react/src/TopBar/Actions.tsx b/libraries/core-react/src/TopBar/Actions.tsx index ee9f765e56..e1d90e8971 100644 --- a/libraries/core-react/src/TopBar/Actions.tsx +++ b/libraries/core-react/src/TopBar/Actions.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' type ActionsProps = HTMLAttributes diff --git a/libraries/core-react/src/TopBar/CustomContent.tsx b/libraries/core-react/src/TopBar/CustomContent.tsx index d180e843f6..1b4130d98c 100644 --- a/libraries/core-react/src/TopBar/CustomContent.tsx +++ b/libraries/core-react/src/TopBar/CustomContent.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' type CustomContentProps = HTMLAttributes diff --git a/libraries/core-react/src/TopBar/Header.tsx b/libraries/core-react/src/TopBar/Header.tsx index eccdc2765b..d9788e501a 100644 --- a/libraries/core-react/src/TopBar/Header.tsx +++ b/libraries/core-react/src/TopBar/Header.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { typographyTemplate } from '../_common/templates' diff --git a/libraries/core-react/src/TopBar/TopBar.test.tsx b/libraries/core-react/src/TopBar/TopBar.test.tsx index 9740b0452b..774a6aab77 100644 --- a/libraries/core-react/src/TopBar/TopBar.test.tsx +++ b/libraries/core-react/src/TopBar/TopBar.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/TopBar/TopBar.tsx b/libraries/core-react/src/TopBar/TopBar.tsx index 4b1c79d874..2a08af0053 100644 --- a/libraries/core-react/src/TopBar/TopBar.tsx +++ b/libraries/core-react/src/TopBar/TopBar.tsx @@ -1,4 +1,5 @@ -import React, { forwardRef, HTMLAttributes } from 'react' +import * as React from 'react' +import { forwardRef, HTMLAttributes } from 'react' import styled from 'styled-components' import { spacingsTemplate, typographyTemplate } from '../_common/templates' import { topbar as tokens } from './TopBar.tokens' diff --git a/libraries/core-react/src/Typography/Typography.test.tsx b/libraries/core-react/src/Typography/Typography.test.tsx index 6ff03c1169..78d665c5f6 100644 --- a/libraries/core-react/src/Typography/Typography.test.tsx +++ b/libraries/core-react/src/Typography/Typography.test.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-undef */ -import React from 'react' +import * as React from 'react' import { render, cleanup, screen } from '@testing-library/react' import '@testing-library/jest-dom' import 'jest-styled-components' diff --git a/libraries/core-react/src/Typography/Typography.tsx b/libraries/core-react/src/Typography/Typography.tsx index 8595f204c1..6c0756cdea 100644 --- a/libraries/core-react/src/Typography/Typography.tsx +++ b/libraries/core-react/src/Typography/Typography.tsx @@ -1,4 +1,5 @@ -import React, { +import * as React from 'react' +import { forwardRef, ElementType, HTMLAttributes, diff --git a/libraries/core/pnpm-lock.yaml b/libraries/core/pnpm-lock.yaml index f6c8cd1f96..ee30d37717 100644 --- a/libraries/core/pnpm-lock.yaml +++ b/libraries/core/pnpm-lock.yaml @@ -1,6 +1,6 @@ devDependencies: prettier: 1.17.1 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /prettier/1.17.1: dev: true diff --git a/libraries/icons/pnpm-lock.yaml b/libraries/icons/pnpm-lock.yaml index 6508d75b82..ed96f0bb67 100644 --- a/libraries/icons/pnpm-lock.yaml +++ b/libraries/icons/pnpm-lock.yaml @@ -3,7 +3,7 @@ devDependencies: rollup: 2.15.0 rollup-plugin-typescript2: 0.27.2_rollup@2.15.0+typescript@4.0.2 typescript: 4.0.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@rollup/plugin-node-resolve/8.0.1_rollup@2.15.0: dependencies: diff --git a/libraries/tokens/pnpm-lock.yaml b/libraries/tokens/pnpm-lock.yaml index 6508d75b82..ed96f0bb67 100644 --- a/libraries/tokens/pnpm-lock.yaml +++ b/libraries/tokens/pnpm-lock.yaml @@ -3,7 +3,7 @@ devDependencies: rollup: 2.15.0 rollup-plugin-typescript2: 0.27.2_rollup@2.15.0+typescript@4.0.2 typescript: 4.0.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@rollup/plugin-node-resolve/8.0.1_rollup@2.15.0: dependencies: diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 54f881e8bc..0d1224f6f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,7 +11,7 @@ devDependencies: eslint-plugin-testing-library: 1.5.0_eslint@7.11.0 prettier: 2.0.5 typescript: 4.0.2 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /@babel/code-frame/7.10.4: dependencies: