From f94b0408398fbaef31bbc5bdc163e9c42882baa6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:15:59 +0530 Subject: [PATCH] Bump styled-components to ^6.1.13 (#43654) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: ZeeshanTamboli --- benchmark/package.json | 2 +- docs/package.json | 2 +- package.json | 5 - packages/mui-styled-engine-sc/package.json | 2 +- packages/mui-system/package.json | 2 +- patches/styled-components@6.1.12.patch | 184 --------------------- pnpm-lock.yaml | 31 ++-- test/package.json | 2 +- 8 files changed, 18 insertions(+), 212 deletions(-) delete mode 100644 patches/styled-components@6.1.12.patch diff --git a/benchmark/package.json b/benchmark/package.json index 81a3279e0e38c3..67ed4e1e5ecd06 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -34,7 +34,7 @@ "react-redux": "^8.1.3", "redux": "^4.2.1", "serve-handler": "^6.1.5", - "styled-components": "^6.1.12", + "styled-components": "^6.1.13", "styled-system": "^5.1.5", "theme-ui": "^0.16.2", "webpack": "^5.93.0" diff --git a/docs/package.json b/docs/package.json index b292ae11485e61..11195c7d098bd1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -104,7 +104,7 @@ "react-virtuoso": "^4.10.3", "react-window": "^1.8.10", "rimraf": "^5.0.10", - "styled-components": "^6.1.12", + "styled-components": "^6.1.13", "stylis": "4.2.0", "stylis-plugin-rtl": "^2.1.1", "use-count-up": "^3.0.1", diff --git a/package.json b/package.json index b9f90607e197d5..7b5e2fa09c7841 100644 --- a/package.json +++ b/package.json @@ -288,10 +288,5 @@ ] } } - }, - "pnpm": { - "patchedDependencies": { - "styled-components@6.1.12": "patches/styled-components@6.1.12.patch" - } } } diff --git a/packages/mui-styled-engine-sc/package.json b/packages/mui-styled-engine-sc/package.json index 0a1ba0f0b5bd0b..fc26b32c463c96 100644 --- a/packages/mui-styled-engine-sc/package.json +++ b/packages/mui-styled-engine-sc/package.json @@ -50,7 +50,7 @@ "@types/react": "^18.3.4", "chai": "^4.5.0", "react": "^18.3.1", - "styled-components": "^6.1.12" + "styled-components": "^6.1.13" }, "peerDependencies": { "styled-components": "^6.0.0" diff --git a/packages/mui-system/package.json b/packages/mui-system/package.json index a6b82cc07d9a12..23c404fe22bb77 100644 --- a/packages/mui-system/package.json +++ b/packages/mui-system/package.json @@ -63,7 +63,7 @@ "lodash": "^4.17.21", "react": "^18.3.1", "sinon": "^18.0.0", - "styled-components": "^6.1.12" + "styled-components": "^6.1.13" }, "peerDependencies": { "@emotion/react": "^11.5.0", diff --git a/patches/styled-components@6.1.12.patch b/patches/styled-components@6.1.12.patch deleted file mode 100644 index 5c29b1ec848ba1..00000000000000 --- a/patches/styled-components@6.1.12.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff --git a/dist/hoc/withTheme.d.ts b/dist/hoc/withTheme.d.ts -index f3452c16983a0b45ca314c7c717de9f6da75f90a..21fec5f48cc060f485520c0d77afc59bf7e7d487 100644 ---- a/dist/hoc/withTheme.d.ts -+++ b/dist/hoc/withTheme.d.ts -@@ -1,3 +1,3 @@ - import React from 'react'; - import { AnyComponent, ExecutionProps } from '../types'; --export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "defaultProps" | "$$typeof" | "displayName" | "type" | "propTypes" | "compare" : T extends React.ForwardRefExoticComponent ? "defaultProps" | "$$typeof" | "displayName" | "propTypes" | "render" : "prototype" | "length" | "arguments" | "caller" | "name" | "defaultProps" | "displayName" | "type" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "getDefaultProps" | "mixins" | "callee" | "arity">]: T[key]; }; -+export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "defaultProps" | "$$typeof" | "displayName" | "type" | "propTypes" | "compare" : T extends React.ForwardRefExoticComponent ? "defaultProps" | "$$typeof" | "displayName" | "propTypes" | "render" : "prototype" | "length" | "arguments" | "caller" | "name" | "defaultProps" | "displayName" | "type" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "getDefaultProps" | "mixins" | "callee" | "arity">]: T[key]; }; -diff --git a/dist/models/ServerStyleSheet.d.ts b/dist/models/ServerStyleSheet.d.ts -index b47f4589f4da7b7413b37907c491dadc433c019b..d3f07db75a689eb9d45ddf412537a2b8a0e374b4 100644 ---- a/dist/models/ServerStyleSheet.d.ts -+++ b/dist/models/ServerStyleSheet.d.ts -@@ -8,9 +8,9 @@ export default class ServerStyleSheet { - sealed: boolean; - constructor(); - _emitSheetCSS: () => string; -- collectStyles(children: any): JSX.Element; -+ collectStyles(children: any): React.JSX.Element; - getStyleTags: () => string; - getStyleElement: () => React.JSX.Element[]; - interleaveWithNodeStream(input: Readable): streamInternal.Transform; - seal: () => void; - } -diff --git a/dist/models/StyleSheetManager.d.ts b/dist/models/StyleSheetManager.d.ts -index a2e4ac7f0ed10ea0e6827956c65a2e066948e3d1..0008e83fba4f3d84e90928da9d9af7cd2c85ad4e 100644 ---- a/dist/models/StyleSheetManager.d.ts -+++ b/dist/models/StyleSheetManager.d.ts -@@ -62,4 +62,4 @@ export type IStyleSheetManager = React.PropsWithChildren<{ - */ - target?: undefined | HTMLElement; - }>; --export declare function StyleSheetManager(props: IStyleSheetManager): JSX.Element; -+export declare function StyleSheetManager(props: IStyleSheetManager): React.JSX.Element; -diff --git a/dist/models/ThemeProvider.d.ts b/dist/models/ThemeProvider.d.ts -index b5d7d32bd1748d30ccba747db5c8c54438124eb4..2511ae972a2cc124b8d703d990865c31264eb528 100644 ---- a/dist/models/ThemeProvider.d.ts -+++ b/dist/models/ThemeProvider.d.ts -@@ -43,5 +43,5 @@ export declare function useTheme(): DefaultTheme; - /** - * Provide a theme to an entire react component tree via context - */ --export default function ThemeProvider(props: Props): JSX.Element | null; -+export default function ThemeProvider(props: Props): React.JSX.Element | null; - export {}; -diff --git a/dist/types.d.ts b/dist/types.d.ts -index a76cac2b82b733fa72d9be6ca9b764415d4ed8b4..5e166d7b485e98aa08ef684d7e0450fa601acee3 100644 ---- a/dist/types.d.ts -+++ b/dist/types.d.ts -@@ -130,13 +130,13 @@ export type PolymorphicComponentProps extends React.ForwardRefExoticComponent { -- | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): JSX.Element; -+ | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): React.JSX.Element; - } - export interface IStyledComponentBase extends PolymorphicComponent, IStyledStatics, StyledComponentBrand { - defaultProps?: (ExecutionProps & Partial) | undefined; - toString: () => string; - } --export type IStyledComponent = IStyledComponentBase & -+export type IStyledComponent = IStyledComponentBase & - /** - * TypeScript doesn't allow using a styled component as a key inside object - * styles because "A computed property name must be of type 'string', 'number', -diff --git a/native/dist/dist/hoc/withTheme.d.ts b/native/dist/dist/hoc/withTheme.d.ts -index f3452c16983a0b45ca314c7c717de9f6da75f90a..21fec5f48cc060f485520c0d77afc59bf7e7d487 100644 ---- a/native/dist/dist/hoc/withTheme.d.ts -+++ b/native/dist/dist/hoc/withTheme.d.ts -@@ -1,3 +1,3 @@ - import React from 'react'; - import { AnyComponent, ExecutionProps } from '../types'; --export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "defaultProps" | "$$typeof" | "displayName" | "type" | "propTypes" | "compare" : T extends React.ForwardRefExoticComponent ? "defaultProps" | "$$typeof" | "displayName" | "propTypes" | "render" : "prototype" | "length" | "arguments" | "caller" | "name" | "defaultProps" | "displayName" | "type" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "getDefaultProps" | "mixins" | "callee" | "arity">]: T[key]; }; -+export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "defaultProps" | "$$typeof" | "displayName" | "type" | "propTypes" | "compare" : T extends React.ForwardRefExoticComponent ? "defaultProps" | "$$typeof" | "displayName" | "propTypes" | "render" : "prototype" | "length" | "arguments" | "caller" | "name" | "defaultProps" | "displayName" | "type" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "getDefaultProps" | "mixins" | "callee" | "arity">]: T[key]; }; -diff --git a/native/dist/dist/models/ServerStyleSheet.d.ts b/native/dist/dist/models/ServerStyleSheet.d.ts -index b47f4589f4da7b7413b37907c491dadc433c019b..086123ea82646c4e42a36abfa34b029c1339dc7e 100644 ---- a/native/dist/dist/models/ServerStyleSheet.d.ts -+++ b/native/dist/dist/models/ServerStyleSheet.d.ts -@@ -8,7 +8,7 @@ export default class ServerStyleSheet { - sealed: boolean; - constructor(); - _emitSheetCSS: () => string; -- collectStyles(children: any): JSX.Element; -+ collectStyles(children: any): React.JSX.Element; - getStyleTags: () => string; - getStyleElement: () => React.JSX.Element[]; - interleaveWithNodeStream(input: Readable): streamInternal.Transform; -diff --git a/native/dist/dist/models/StyleSheetManager.d.ts b/native/dist/dist/models/StyleSheetManager.d.ts -index a2e4ac7f0ed10ea0e6827956c65a2e066948e3d1..0008e83fba4f3d84e90928da9d9af7cd2c85ad4e 100644 ---- a/native/dist/dist/models/StyleSheetManager.d.ts -+++ b/native/dist/dist/models/StyleSheetManager.d.ts -@@ -62,4 +62,4 @@ export type IStyleSheetManager = React.PropsWithChildren<{ - */ - target?: undefined | HTMLElement; - }>; --export declare function StyleSheetManager(props: IStyleSheetManager): JSX.Element; -+export declare function StyleSheetManager(props: IStyleSheetManager): React.JSX.Element; -diff --git a/native/dist/dist/models/ThemeProvider.d.ts b/native/dist/dist/models/ThemeProvider.d.ts -index b5d7d32bd1748d30ccba747db5c8c54438124eb4..2511ae972a2cc124b8d703d990865c31264eb528 100644 ---- a/native/dist/dist/models/ThemeProvider.d.ts -+++ b/native/dist/dist/models/ThemeProvider.d.ts -@@ -43,5 +43,5 @@ export declare function useTheme(): DefaultTheme; - /** - * Provide a theme to an entire react component tree via context - */ --export default function ThemeProvider(props: Props): JSX.Element | null; -+export default function ThemeProvider(props: Props): React.JSX.Element | null; - export {}; -diff --git a/native/dist/dist/types.d.ts b/native/dist/dist/types.d.ts -index a76cac2b82b733fa72d9be6ca9b764415d4ed8b4..5e166d7b485e98aa08ef684d7e0450fa601acee3 100644 ---- a/native/dist/dist/types.d.ts -+++ b/native/dist/dist/types.d.ts -@@ -130,13 +130,13 @@ export type PolymorphicComponentProps extends React.ForwardRefExoticComponent { -- | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): JSX.Element; -+ | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): React.JSX.Element; - } - export interface IStyledComponentBase extends PolymorphicComponent, IStyledStatics, StyledComponentBrand { - defaultProps?: (ExecutionProps & Partial) | undefined; - toString: () => string; - } --export type IStyledComponent = IStyledComponentBase & -+export type IStyledComponent = IStyledComponentBase & - /** - * TypeScript doesn't allow using a styled component as a key inside object - * styles because "A computed property name must be of type 'string', 'number', -diff --git a/native/dist/hoc/withTheme.d.ts b/native/dist/hoc/withTheme.d.ts -index 7d244d05cbfd990881338c15ec8d53afc578f5bd..21a2eafb196fb5372b0ad2dbae6af015b16b4587 100644 ---- a/native/dist/hoc/withTheme.d.ts -+++ b/native/dist/hoc/withTheme.d.ts -@@ -1,3 +1,3 @@ - import React from 'react'; - import { AnyComponent, ExecutionProps } from '../types'; --export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "propTypes" | "defaultProps" | "displayName" | "$$typeof" | "type" | "compare" : T extends React.ForwardRefExoticComponent ? "propTypes" | "defaultProps" | "displayName" | "$$typeof" | "render" : "length" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "defaultProps" | "displayName" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "type" | "getDefaultProps" | "mixins" | "name" | "prototype" | "caller" | "callee" | "arguments" | "arity">]: T[key]; }; -+export default function withTheme(Component: T): React.ForwardRefExoticComponent> & React.RefAttributes> & { [key in Exclude ? "propTypes" | "defaultProps" | "displayName" | "$$typeof" | "type" | "compare" : T extends React.ForwardRefExoticComponent ? "propTypes" | "defaultProps" | "displayName" | "$$typeof" | "render" : "length" | "propTypes" | "contextType" | "contextTypes" | "childContextTypes" | "defaultProps" | "displayName" | "getDerivedStateFromProps" | "getDerivedStateFromError" | "type" | "getDefaultProps" | "mixins" | "name" | "prototype" | "caller" | "callee" | "arguments" | "arity">]: T[key]; }; -diff --git a/native/dist/models/ServerStyleSheet.d.ts b/native/dist/models/ServerStyleSheet.d.ts -index b47f4589f4da7b7413b37907c491dadc433c019b..086123ea82646c4e42a36abfa34b029c1339dc7e 100644 ---- a/native/dist/models/ServerStyleSheet.d.ts -+++ b/native/dist/models/ServerStyleSheet.d.ts -@@ -8,7 +8,7 @@ export default class ServerStyleSheet { - sealed: boolean; - constructor(); - _emitSheetCSS: () => string; -- collectStyles(children: any): JSX.Element; -+ collectStyles(children: any): React.JSX.Element; - getStyleTags: () => string; - getStyleElement: () => React.JSX.Element[]; - interleaveWithNodeStream(input: Readable): streamInternal.Transform; -diff --git a/native/dist/models/StyleSheetManager.d.ts b/native/dist/models/StyleSheetManager.d.ts -index a2e4ac7f0ed10ea0e6827956c65a2e066948e3d1..0008e83fba4f3d84e90928da9d9af7cd2c85ad4e 100644 ---- a/native/dist/models/StyleSheetManager.d.ts -+++ b/native/dist/models/StyleSheetManager.d.ts -@@ -62,4 +62,4 @@ export type IStyleSheetManager = React.PropsWithChildren<{ - */ - target?: undefined | HTMLElement; - }>; --export declare function StyleSheetManager(props: IStyleSheetManager): JSX.Element; -+export declare function StyleSheetManager(props: IStyleSheetManager): React.JSX.Element; -diff --git a/native/dist/models/ThemeProvider.d.ts b/native/dist/models/ThemeProvider.d.ts -index b5d7d32bd1748d30ccba747db5c8c54438124eb4..2511ae972a2cc124b8d703d990865c31264eb528 100644 ---- a/native/dist/models/ThemeProvider.d.ts -+++ b/native/dist/models/ThemeProvider.d.ts -@@ -43,5 +43,5 @@ export declare function useTheme(): DefaultTheme; - /** - * Provide a theme to an entire react component tree via context - */ --export default function ThemeProvider(props: Props): JSX.Element | null; -+export default function ThemeProvider(props: Props): React.JSX.Element | null; - export {}; -diff --git a/native/dist/types.d.ts b/native/dist/types.d.ts -index 4a6953c145bbd6c0880378e09e0de80b7a2113f0..1e023c172fe4b569ec1a03710305458109931022 100644 ---- a/native/dist/types.d.ts -+++ b/native/dist/types.d.ts -@@ -130,7 +130,7 @@ export type PolymorphicComponentProps extends React.ForwardRefExoticComponent { -- | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): JSX.Element; -+ | void = void, ForwardedAsTarget extends StyledTarget | void = void>(props: PolymorphicComponentProps): React.JSX.Element; - } - export interface IStyledComponent extends PolymorphicComponent, IStyledStatics, StyledComponentBrand { - defaultProps?: (ExecutionProps & Partial) | undefined; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bef19b13304e02..5fc231f8670259 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,11 +25,6 @@ overrides: '@pigment-css/nextjs-plugin': 0.0.22 '@pigment-css/vite-plugin': 0.0.22 -patchedDependencies: - styled-components@6.1.12: - hash: ua4w6griwxbnxnkzzvndsl67he - path: patches/styled-components@6.1.12.patch - importers: .: @@ -536,8 +531,8 @@ importers: specifier: ^6.1.5 version: 6.1.5 styled-components: - specifier: ^6.1.12 - version: 6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.1.13 + version: 6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1) styled-system: specifier: ^5.1.5 version: 5.1.5 @@ -806,8 +801,8 @@ importers: specifier: ^5.0.10 version: 5.0.10 styled-components: - specifier: ^6.1.12 - version: 6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.1.13 + version: 6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1) stylis: specifier: 4.2.0 version: 4.2.0 @@ -1972,8 +1967,8 @@ importers: specifier: ^18.3.1 version: 18.3.1 styled-components: - specifier: ^6.1.12 - version: 6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.1.13 + version: 6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1) publishDirectory: build packages/mui-styles: @@ -2132,8 +2127,8 @@ importers: specifier: ^18.0.0 version: 18.0.0 styled-components: - specifier: ^6.1.12 - version: 6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.1.13 + version: 6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1) publishDirectory: build packages/mui-types: @@ -2362,8 +2357,8 @@ importers: specifier: ^18.0.0 version: 18.0.0 styled-components: - specifier: ^6.1.12 - version: 6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.1.13 + version: 6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1) stylis: specifier: 4.2.0 version: 4.2.0 @@ -11866,8 +11861,8 @@ packages: style-search@0.1.0: resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==} - styled-components@6.1.12: - resolution: {integrity: sha512-n/O4PzRPhbYI0k1vKKayfti3C/IGcPf+DqcrOB7O/ab9x4u/zjqraneT5N45+sIe87cxrCApXM8Bna7NYxwoTA==} + styled-components@6.1.13: + resolution: {integrity: sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==} engines: {node: '>= 16'} peerDependencies: react: '>= 16.8.0' @@ -24691,7 +24686,7 @@ snapshots: style-search@0.1.0: {} - styled-components@6.1.12(patch_hash=ua4w6griwxbnxnkzzvndsl67he)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + styled-components@6.1.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@emotion/is-prop-valid': 1.2.2 '@emotion/unitless': 0.8.1 diff --git a/test/package.json b/test/package.json index acececc5e168bf..9e57e66d69c863 100644 --- a/test/package.json +++ b/test/package.json @@ -36,7 +36,7 @@ "react-is": "^18.3.1", "react-router-dom": "^6.26.1", "sinon": "^18.0.0", - "styled-components": "^6.1.12", + "styled-components": "^6.1.13", "stylis": "4.2.0", "stylis-plugin-rtl": "^2.1.1", "stylis-plugin-rtl-sc": "npm:stylis-plugin-rtl@^1.1.0",