From 37c6dec104d3d1a3b7447f61db281a1727b4368e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oddbj=C3=B8rn=20=C3=98vernes?= Date: Mon, 13 May 2024 11:18:25 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Styled-components@6.1.11?= =?UTF-8?q?=20(#3431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Styled-components@6.1.11 * progress: fix types --- packages/eds-core-react/package.json | 2 +- .../Progress/Circular/CircularProgress.tsx | 12 +- .../Progress/Linear/LinearProgress.tsx | 11 +- packages/eds-data-grid-react/package.json | 2 +- packages/eds-lab-react/package.json | 2 +- packages/eds-utils/package.json | 2 +- pnpm-lock.yaml | 116 +++++++++--------- 7 files changed, 77 insertions(+), 70 deletions(-) diff --git a/packages/eds-core-react/package.json b/packages/eds-core-react/package.json index c0ad544c13..98cf709d0d 100644 --- a/packages/eds-core-react/package.json +++ b/packages/eds-core-react/package.json @@ -77,7 +77,7 @@ "rollup-plugin-delete": "^2.0.0", "rollup-plugin-postcss": "^4.0.2", "storybook": "^8.0.2", - "styled-components": "6.1.8", + "styled-components": "6.1.11", "tsc-watch": "^6.0.4", "typescript": "^5.2.2" }, diff --git a/packages/eds-core-react/src/components/Progress/Circular/CircularProgress.tsx b/packages/eds-core-react/src/components/Progress/Circular/CircularProgress.tsx index dba9ec74ac..a8efb34b97 100644 --- a/packages/eds-core-react/src/components/Progress/Circular/CircularProgress.tsx +++ b/packages/eds-core-react/src/components/Progress/Circular/CircularProgress.tsx @@ -1,8 +1,14 @@ -import { forwardRef, SVGProps, Ref, useEffect, useState } from 'react' +import { + forwardRef, + SVGProps, + Ref, + useEffect, + useState, + CSSProperties, +} from 'react' import styled, { css, keyframes } from 'styled-components' import * as tokens from './CircularProgress.tokens' import type { CircularProgressToken } from './CircularProgress.tokens' -import type { CSSObject } from 'styled-components' const indeterminate = keyframes` 100% { @@ -81,7 +87,7 @@ const CircularProgress = forwardRef( ) { const thickness = 4 const progress = Math.round(value) - const trackStyle: CSSObject = {} + const trackStyle: CSSProperties = {} const props = { ...rest, ref, diff --git a/packages/eds-core-react/src/components/Progress/Linear/LinearProgress.tsx b/packages/eds-core-react/src/components/Progress/Linear/LinearProgress.tsx index 3cf47b3047..80b6f27a06 100644 --- a/packages/eds-core-react/src/components/Progress/Linear/LinearProgress.tsx +++ b/packages/eds-core-react/src/components/Progress/Linear/LinearProgress.tsx @@ -1,6 +1,11 @@ -import { forwardRef, HTMLAttributes, useEffect, useState } from 'react' +import { + forwardRef, + HTMLAttributes, + useEffect, + useState, + CSSProperties, +} from 'react' import styled, { keyframes } from 'styled-components' -import type { CSSObject } from 'styled-components' import * as tokens from './LinearProgress.tokens' const indeterminate = keyframes` @@ -99,7 +104,7 @@ const LinearProgress = forwardRef( } } - const transformStyle: CSSObject = { + const transformStyle: CSSProperties = { transform: barStyle, } diff --git a/packages/eds-data-grid-react/package.json b/packages/eds-data-grid-react/package.json index 991f43257e..d610e18a9e 100644 --- a/packages/eds-data-grid-react/package.json +++ b/packages/eds-data-grid-react/package.json @@ -72,7 +72,7 @@ "rollup-plugin-delete": "^2.0.0", "rollup-plugin-postcss": "^4.0.2", "storybook": "^8.0.2", - "styled-components": "6.1.8", + "styled-components": "6.1.11", "ts-jest": "29.1.1", "ts-node": "10.9.1", "tsc-watch": "^6.0.4", diff --git a/packages/eds-lab-react/package.json b/packages/eds-lab-react/package.json index 849c8b4ba9..f2d820238d 100644 --- a/packages/eds-lab-react/package.json +++ b/packages/eds-lab-react/package.json @@ -77,7 +77,7 @@ "rollup-plugin-delete": "^2.0.0", "rollup-plugin-postcss": "^4.0.2", "storybook": "8.0.2", - "styled-components": "6.1.8", + "styled-components": "6.1.11", "tsc-watch": "^6.0.4", "typescript": "^5.2.2" }, diff --git a/packages/eds-utils/package.json b/packages/eds-utils/package.json index 8de6712c39..47b15d2b98 100644 --- a/packages/eds-utils/package.json +++ b/packages/eds-utils/package.json @@ -70,7 +70,7 @@ "react-is": "^18.2.0", "rollup": "^4.2.0", "rollup-plugin-delete": "^2.0.0", - "styled-components": "6.1.8", + "styled-components": "6.1.11", "tsc-watch": "^6.0.4", "typescript": "^5.2.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a9d400aed..65d0f46fe5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,7 +43,7 @@ importers: version: 6.9.0(eslint@8.52.0)(typescript@5.2.2) babel-plugin-styled-components: specifier: ^2.1.4 - version: 2.1.4(@babel/core@7.24.0)(styled-components@6.1.9) + version: 2.1.4(@babel/core@7.24.0)(styled-components@6.1.11) eslint: specifier: ^8.52.0 version: 8.52.0 @@ -188,7 +188,7 @@ importers: version: 9.1.3(@babel/core@7.24.5)(webpack@5.91.0) babel-plugin-styled-components: specifier: ^2.1.4 - version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.8) + version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.11) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.8.9)(ts-node@10.9.1) @@ -197,7 +197,7 @@ importers: version: 29.7.0 jest-styled-components: specifier: ^7.2.0 - version: 7.2.0(styled-components@6.1.8) + version: 7.2.0(styled-components@6.1.11) js-file-download: specifier: ^0.4.12 version: 0.4.12 @@ -232,8 +232,8 @@ importers: specifier: ^8.0.2 version: 8.0.2(@babel/preset-env@7.24.0)(react-dom@18.2.0)(react@18.2.0) styled-components: - specifier: 6.1.8 - version: 6.1.8(react-dom@18.2.0)(react@18.2.0) + specifier: 6.1.11 + version: 6.1.11(react-dom@18.2.0)(react@18.2.0) tsc-watch: specifier: ^6.0.4 version: 6.0.4(typescript@5.2.2) @@ -330,7 +330,7 @@ importers: version: 9.1.3(@babel/core@7.24.5)(webpack@5.91.0) babel-plugin-styled-components: specifier: ^2.1.4 - version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.8) + version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.11) jest: specifier: 29.7.0 version: 29.7.0(@types/node@20.8.9)(ts-node@10.9.1) @@ -339,7 +339,7 @@ importers: version: 29.7.0 jest-styled-components: specifier: ^7.2.0 - version: 7.2.0(styled-components@6.1.8) + version: 7.2.0(styled-components@6.1.11) js-file-download: specifier: ^0.4.12 version: 0.4.12 @@ -371,8 +371,8 @@ importers: specifier: ^8.0.2 version: 8.0.2(@babel/preset-env@7.24.0)(react-dom@18.2.0)(react@18.2.0) styled-components: - specifier: 6.1.8 - version: 6.1.8(react-dom@18.2.0)(react@18.2.0) + specifier: 6.1.11 + version: 6.1.11(react-dom@18.2.0)(react@18.2.0) ts-jest: specifier: 29.1.1 version: 29.1.1(@babel/core@7.24.5)(esbuild@0.20.2)(jest@29.7.0)(typescript@5.2.2) @@ -499,7 +499,7 @@ importers: version: 9.1.3(@babel/core@7.24.5)(webpack@5.91.0) babel-plugin-styled-components: specifier: ^2.1.4 - version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.8) + version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.11) clsx: specifier: ^2.0.0 version: 2.1.0 @@ -511,7 +511,7 @@ importers: version: 29.7.0 jest-styled-components: specifier: ^7.2.0 - version: 7.2.0(styled-components@6.1.8) + version: 7.2.0(styled-components@6.1.11) js-file-download: specifier: ^0.4.12 version: 0.4.12 @@ -546,8 +546,8 @@ importers: specifier: 8.0.2 version: 8.0.2(@babel/preset-env@7.24.0)(react-dom@18.2.0)(react@18.2.0) styled-components: - specifier: 6.1.8 - version: 6.1.8(react-dom@18.2.0)(react@18.2.0) + specifier: 6.1.11 + version: 6.1.11(react-dom@18.2.0)(react@18.2.0) tsc-watch: specifier: ^6.0.4 version: 6.0.4(typescript@5.2.2) @@ -626,7 +626,7 @@ importers: version: 9.1.3(@babel/core@7.24.5)(webpack@5.91.0) babel-plugin-styled-components: specifier: ^2.1.4 - version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.8) + version: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.11) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.8.9)(ts-node@10.9.1) @@ -635,7 +635,7 @@ importers: version: 29.7.0 jest-styled-components: specifier: ^7.2.0 - version: 7.2.0(styled-components@6.1.8) + version: 7.2.0(styled-components@6.1.11) js-file-download: specifier: ^0.4.12 version: 0.4.12 @@ -658,8 +658,8 @@ importers: specifier: ^2.0.0 version: 2.0.0 styled-components: - specifier: 6.1.8 - version: 6.1.8(react-dom@18.2.0)(react@18.2.0) + specifier: 6.1.11 + version: 6.1.11(react-dom@18.2.0)(react@18.2.0) tsc-watch: specifier: ^6.0.4 version: 6.0.4(typescript@5.2.2) @@ -3429,8 +3429,8 @@ packages: engines: {node: '>=10.0.0'} dev: true - /@emotion/is-prop-valid@1.2.1: - resolution: {integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==} + /@emotion/is-prop-valid@1.2.2: + resolution: {integrity: sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==} dependencies: '@emotion/memoize': 0.8.1 dev: true @@ -3439,10 +3439,6 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: true - /@emotion/unitless@0.8.0: - resolution: {integrity: sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==} - dev: true - /@emotion/unitless@0.8.1: resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} dev: true @@ -6840,8 +6836,8 @@ packages: undici-types: 5.26.5 dev: true - /@types/node@20.12.8: - resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==} + /@types/node@20.12.11: + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} dependencies: undici-types: 5.26.5 dev: true @@ -6939,8 +6935,8 @@ packages: resolution: {integrity: sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==} dev: true - /@types/stylis@4.2.0: - resolution: {integrity: sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==} + /@types/stylis@4.2.5: + resolution: {integrity: sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==} dev: true /@types/tough-cookie@4.0.5: @@ -7851,7 +7847,7 @@ packages: - supports-color dev: true - /babel-plugin-styled-components@2.1.4(@babel/core@7.24.0)(styled-components@6.1.9): + /babel-plugin-styled-components@2.1.4(@babel/core@7.24.0)(styled-components@6.1.11): resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==} peerDependencies: styled-components: '>= 2' @@ -7861,12 +7857,12 @@ packages: '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0) lodash: 4.17.21 picomatch: 2.3.1 - styled-components: 6.1.9(react-dom@18.3.1)(react@18.3.1) + styled-components: 6.1.11(react-dom@18.3.1)(react@18.3.1) transitivePeerDependencies: - '@babel/core' dev: true - /babel-plugin-styled-components@2.1.4(@babel/core@7.24.5)(styled-components@6.1.8): + /babel-plugin-styled-components@2.1.4(@babel/core@7.24.5)(styled-components@6.1.11): resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==} peerDependencies: styled-components: '>= 2' @@ -7876,7 +7872,7 @@ packages: '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.5) lodash: 4.17.21 picomatch: 2.3.1 - styled-components: 6.1.8(react-dom@18.2.0)(react@18.2.0) + styled-components: 6.1.11(react-dom@18.2.0)(react@18.2.0) transitivePeerDependencies: - '@babel/core' dev: true @@ -8635,6 +8631,10 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + dev: true + /damerau-levenshtein@1.0.8: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true @@ -9064,8 +9064,8 @@ packages: tapable: 2.2.1 dev: true - /enhanced-resolve@5.16.0: - resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==} + /enhanced-resolve@5.16.1: + resolution: {integrity: sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==} engines: {node: '>=10.13.0'} dependencies: graceful-fs: 4.2.11 @@ -11328,14 +11328,14 @@ packages: - supports-color dev: true - /jest-styled-components@7.2.0(styled-components@6.1.8): + /jest-styled-components@7.2.0(styled-components@6.1.11): resolution: {integrity: sha512-gwyyveNjvuRA0pyhbQoydXZllLZESs2VuL5fXCabzh0buHPAOUfANtW7n5YMPmdC0sH3VB7h2eUGZ23+tjvaBA==} engines: {node: '>= 12'} peerDependencies: styled-components: '>= 5' dependencies: '@adobe/css-tools': 4.3.3 - styled-components: 6.1.8(react-dom@18.2.0)(react@18.2.0) + styled-components: 6.1.11(react-dom@18.2.0)(react@18.2.0) dev: true /jest-util@29.7.0: @@ -11380,7 +11380,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.12.8 + '@types/node': 20.12.11 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -14109,44 +14109,44 @@ packages: resolution: {integrity: sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==} dev: true - /styled-components@6.1.8(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==} + /styled-components@6.1.11(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA==} engines: {node: '>= 16'} peerDependencies: react: '>= 16.8.0' react-dom: '>= 16.8.0' dependencies: - '@emotion/is-prop-valid': 1.2.1 - '@emotion/unitless': 0.8.0 - '@types/stylis': 4.2.0 + '@emotion/is-prop-valid': 1.2.2 + '@emotion/unitless': 0.8.1 + '@types/stylis': 4.2.5 css-to-react-native: 3.2.0 - csstype: 3.1.2 - postcss: 8.4.31 + csstype: 3.1.3 + postcss: 8.4.38 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 - stylis: 4.3.1 - tslib: 2.5.0 + stylis: 4.3.2 + tslib: 2.6.2 dev: true - /styled-components@6.1.9(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-aBOqs0uMsYufFXSE4q6cA6Ty1fwZuMk4BJRHfiGSna59F1otnxiDelwhN4fEwmBtIymmF0ZqXHnpSigr2ps9Cg==} + /styled-components@6.1.11(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA==} engines: {node: '>= 16'} peerDependencies: react: '>= 16.8.0' react-dom: '>= 16.8.0' dependencies: - '@emotion/is-prop-valid': 1.2.1 + '@emotion/is-prop-valid': 1.2.2 '@emotion/unitless': 0.8.1 - '@types/stylis': 4.2.0 + '@types/stylis': 4.2.5 css-to-react-native: 3.2.0 - csstype: 3.1.2 - postcss: 8.4.31 + csstype: 3.1.3 + postcss: 8.4.38 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 - stylis: 4.3.1 - tslib: 2.5.0 + stylis: 4.3.2 + tslib: 2.6.2 dev: true /stylehacks@5.1.1(postcss@8.4.31): @@ -14160,8 +14160,8 @@ packages: postcss-selector-parser: 6.0.15 dev: true - /stylis@4.3.1: - resolution: {integrity: sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==} + /stylis@4.3.2: + resolution: {integrity: sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==} dev: true /supports-color@5.5.0: @@ -14534,10 +14534,6 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true - /tslib@2.5.0: - resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - dev: true - /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} @@ -14935,7 +14931,7 @@ packages: acorn-import-assertions: 1.9.0(acorn@8.11.3) browserslist: 4.23.0 chrome-trace-event: 1.0.3 - enhanced-resolve: 5.16.0 + enhanced-resolve: 5.16.1 es-module-lexer: 1.5.2 eslint-scope: 5.1.1 events: 3.3.0