From 11a3b01c81cc0648448460ba4b811b6970fda25e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:35:04 +0000 Subject: [PATCH 1/8] Bump styled-components from 5.3.11 to 6.1.11 Bumps [styled-components](https://github.com/styled-components/styled-components) from 5.3.11 to 6.1.11. - [Release notes](https://github.com/styled-components/styled-components/releases) - [Commits](https://github.com/styled-components/styled-components/compare/v5.3.11...v6.1.11) --- updated-dependencies: - dependency-name: styled-components dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- web/packages/build/package.json | 5 +- yarn.lock | 116 +++++++++++++++++--------------- 2 files changed, 64 insertions(+), 57 deletions(-) diff --git a/web/packages/build/package.json b/web/packages/build/package.json index ea0eb826eac67..782d62a93daec 100644 --- a/web/packages/build/package.json +++ b/web/packages/build/package.json @@ -75,7 +75,7 @@ "react-select-event": "^5.5.1", "react-transition-group": "^4.4.5", "rollup-plugin-visualizer": "^5.12.0", - "styled-components": "5.3.11", + "styled-components": "6.1.11", "typescript-eslint": "^7.14.1", "vite": "^5.3.2", "vite-plugin-wasm": "^3.3.0", @@ -85,5 +85,4 @@ "msw-storybook-addon": "^1.8.0", "ts-loader": "^9.5.1" } -} - +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 6bd6447e59947..db155c4e94909 100644 --- a/yarn.lock +++ b/yarn.lock @@ -91,7 +91,7 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7": +"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== @@ -196,7 +196,7 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -536,7 +536,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": +"@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== @@ -1212,7 +1212,7 @@ "@babel/parser" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.24.7", "@babel/traverse@^7.4.5": +"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5" integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA== @@ -1462,10 +1462,10 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== -"@emotion/is-prop-valid@^1.1.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz#23116cf1ed18bfeac910ec6436561ecb1a3885cc" - integrity sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw== +"@emotion/is-prop-valid@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz#d4175076679c6a26faa92b03bb786f9e52612337" + integrity sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw== dependencies: "@emotion/memoize" "^0.8.1" @@ -1495,16 +1495,21 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5" integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA== -"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4": +"@emotion/stylis@0.8.5": version "0.8.5" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== -"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4": +"@emotion/unitless@0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@emotion/unitless@0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3" + integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== + "@emotion/utils@0.11.3": version "0.11.3" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924" @@ -3978,6 +3983,11 @@ dependencies: csstype "^2.2.0" +"@types/stylis@4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.5.tgz#1daa6456f40959d06157698a653a9ab0a70281df" + integrity sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw== + "@types/tapable@^1", "@types/tapable@^1.0.5": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" @@ -5096,17 +5106,6 @@ babel-plugin-react-docgen@^4.2.1: lodash "^4.17.15" react-docgen "^5.0.0" -"babel-plugin-styled-components@>= 1.12.0": - version "2.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" - integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.22.5" - lodash "^4.17.21" - picomatch "^2.3.1" - babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" @@ -6202,7 +6201,7 @@ css-select@^4.1.3: domutils "^2.6.0" nth-check "^2.0.0" -css-to-react-native@^3.0.0: +css-to-react-native@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== @@ -6248,16 +6247,16 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +csstype@3.1.3, csstype@^3.0.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + csstype@^2.2.0, csstype@^2.5.7: version "2.6.21" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== -csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== - d3-array@2: version "2.12.1" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" @@ -8378,7 +8377,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -11384,15 +11383,7 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.2.15, postcss@^8.4.38: +postcss@8.4.38, postcss@^8.2.15, postcss@^8.4.38: version "8.4.38" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== @@ -11401,6 +11392,14 @@ postcss@^8.2.15, postcss@^8.4.38: picocolors "^1.0.0" source-map-js "^1.2.0" +postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.39" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -12508,7 +12507,7 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" -shallowequal@^1.1.0: +shallowequal@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== @@ -13050,21 +13049,20 @@ style-to-object@0.3.0, style-to-object@^0.3.0: dependencies: inline-style-parser "0.1.1" -styled-components@5.3.11: - version "5.3.11" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.11.tgz#9fda7bf1108e39bf3f3e612fcc18170dedcd57a8" - integrity sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^1.1.0" - "@emotion/stylis" "^0.8.4" - "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1.12.0" - css-to-react-native "^3.0.0" - hoist-non-react-statics "^3.0.0" - shallowequal "^1.1.0" - supports-color "^5.5.0" +styled-components@6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-6.1.11.tgz#01948e5195bf1d39e57e0a85b41958c80e40cfb8" + integrity sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA== + dependencies: + "@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.3" + postcss "8.4.38" + shallowequal "1.1.0" + stylis "4.3.2" + tslib "2.6.2" styled-system@^3.1.11: version "3.2.1" @@ -13074,6 +13072,11 @@ styled-system@^3.1.11: "@babel/runtime" "^7.1.2" prop-types "^15.6.2" +stylis@4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" + integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== + sumchecker@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" @@ -13081,7 +13084,7 @@ sumchecker@^3.0.1: dependencies: debug "^4.1.0" -supports-color@^5.3.0, supports-color@^5.5.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13442,6 +13445,11 @@ tsconfig-paths@^3.15.0: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" From d1194f0434afca9e79ff6cad6aee5b1e7ba4cfed Mon Sep 17 00:00:00 2001 From: Bartosz Leper Date: Thu, 4 Jul 2024 10:45:31 +0200 Subject: [PATCH 2/8] Remove @types/styled-components --- web/packages/build/package.json | 1 - yarn.lock | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/web/packages/build/package.json b/web/packages/build/package.json index 782d62a93daec..dbd02877af64b 100644 --- a/web/packages/build/package.json +++ b/web/packages/build/package.json @@ -46,7 +46,6 @@ "@types/react-dom": "^18.3.0", "@types/react-router-dom": "^5.1.1", "@types/react-transition-group": "^4.4.10", - "@types/styled-components": "^5.1.34", "@types/styled-system": "^3.1.3", "@vitejs/plugin-react-swc": "^3.7.0", "babel-loader": "^8.2.5", diff --git a/yarn.lock b/yarn.lock index db155c4e94909..32d4d5a26bbb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3700,14 +3700,6 @@ resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== -"@types/hoist-non-react-statics@*": - version "3.3.5" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" - integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== - dependencies: - "@types/react" "*" - hoist-non-react-statics "^3.3.0" - "@types/html-minifier-terser@^5.0.0": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" @@ -3967,15 +3959,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/styled-components@^5.1.34": - version "5.1.34" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.34.tgz#4107df8ef8a7eaba4fa6b05f78f93fba4daf0300" - integrity sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA== - dependencies: - "@types/hoist-non-react-statics" "*" - "@types/react" "*" - csstype "^3.0.2" - "@types/styled-system@^3.1.3": version "3.2.2" resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-3.2.2.tgz#a40b30baf20a8d9820808688a370a973cb778e7c" @@ -8377,7 +8360,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== From ab41c4320f386bead4f70d8a910391369285b9de Mon Sep 17 00:00:00 2001 From: Bartosz Leper Date: Thu, 4 Jul 2024 11:18:58 +0200 Subject: [PATCH 3/8] Add babel-plugin-styled-components --- web/packages/build/package.json | 1 + yarn.lock | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web/packages/build/package.json b/web/packages/build/package.json index dbd02877af64b..8cfd57b9c9185 100644 --- a/web/packages/build/package.json +++ b/web/packages/build/package.json @@ -49,6 +49,7 @@ "@types/styled-system": "^3.1.3", "@vitejs/plugin-react-swc": "^3.7.0", "babel-loader": "^8.2.5", + "babel-plugin-styled-components": "^2.1.4", "electron-builder": "^24.13.3", "eslint": "^8.56.0", "eslint-import-resolver-typescript": "^3.6.1", diff --git a/yarn.lock b/yarn.lock index 32d4d5a26bbb1..e12689f3d17e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -91,7 +91,7 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.24.7": +"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== @@ -196,7 +196,7 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -536,7 +536,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": +"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== @@ -5089,6 +5089,17 @@ babel-plugin-react-docgen@^4.2.1: lodash "^4.17.15" react-docgen "^5.0.0" +babel-plugin-styled-components@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" + integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + lodash "^4.17.21" + picomatch "^2.3.1" + babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" From 025bcc6b6fa2be2a57cf8081c3614a579d63c5c8 Mon Sep 17 00:00:00 2001 From: Bartosz Leper Date: Thu, 4 Jul 2024 12:39:31 +0200 Subject: [PATCH 4/8] Fix issues after upgrading packages --- .../AnimatedProgressBar.tsx | 2 +- web/packages/design/src/Checkbox/Checkbox.tsx | 2 +- .../design/src/DataTable/StyledTable.tsx | 4 ++-- web/packages/design/src/Input/Input.story.js | 2 ++ web/packages/design/src/Input/Input.tsx | 8 +++---- .../design/src/Onboard/WelcomeWrapper.tsx | 2 +- .../design/src/StepSlider/StepSlider.tsx | 4 ++-- web/packages/design/src/Text/Text.tsx | 5 +++- .../design/src/TextArea/TextArea.story.tsx | 2 ++ web/packages/design/src/TextArea/TextArea.tsx | 6 ++--- .../design/src/ThemeProvider/index.tsx | 24 ++++++++++++++++++- web/packages/design/src/system/typography.ts | 22 +++++++++++++++++ .../AssumeStartTime/AssumeStartTime.tsx | 2 +- .../RequestCheckout/RequestCheckout.tsx | 8 +++---- .../AwsLaunchButton/AwsLaunchButton.tsx | 4 ++-- .../ClusterDropdown/ClusterDropdown.tsx | 2 +- .../UploadForm/UploadForm.tsx | 2 +- .../shared/components/MenuLogin/MenuLogin.tsx | 4 ++-- .../shared/components/ToolTip/ToolTip.tsx | 2 +- .../CardsView/ResourceCard.tsx | 4 ++-- .../UnifiedResources/FilterPanel.tsx | 4 ++-- .../ListView/ResourceListItem.tsx | 6 ++--- .../DocumentKubeExec.test.tsx | 2 +- .../Console/DocumentNodes/DocumentNodes.tsx | 2 +- .../SelectResource/SelectResource.tsx | 4 ++-- .../teleport/src/Discover/Shared/HintBox.tsx | 2 +- web/packages/teleport/src/LocksV2/common.tsx | 2 +- .../src/Navigation/NavigationItem.tsx | 2 +- .../src/components/BannerList/Banner.tsx | 4 ++-- .../teleport/src/components/Layout/Layout.jsx | 2 +- .../teleport/src/components/Tabs/Tabs.tsx | 8 +++---- .../components/Wizard/Navigation/Bullet.tsx | 4 ++-- .../NewRequest/NewRequest.tsx | 2 +- .../RequestList/RequestList.tsx | 2 +- .../teleterm/src/ui/Search/SearchBar.tsx | 2 +- .../src/ui/Search/pickers/ActionPicker.tsx | 2 +- .../src/ui/Search/pickers/ResultList.tsx | 2 +- .../src/ui/ThemeProvider/ThemeProvider.tsx | 4 +++- .../ConnectionStatusIndicator.tsx | 4 ++-- .../VirtualScroll/VirtualScroll.tsx | 4 ++-- 40 files changed, 114 insertions(+), 61 deletions(-) diff --git a/web/packages/design/src/AnimatedProgressBar/AnimatedProgressBar.tsx b/web/packages/design/src/AnimatedProgressBar/AnimatedProgressBar.tsx index 5bf5d8bfc9c35..d5ad45a1f3bd0 100644 --- a/web/packages/design/src/AnimatedProgressBar/AnimatedProgressBar.tsx +++ b/web/packages/design/src/AnimatedProgressBar/AnimatedProgressBar.tsx @@ -66,7 +66,7 @@ const Bar = styled.span` overflow: hidden; width: 118px; - ::after { + &::after { content: ''; position: absolute; top: 0; diff --git a/web/packages/design/src/Checkbox/Checkbox.tsx b/web/packages/design/src/Checkbox/Checkbox.tsx index d5be0f3009e1e..3843036c91c01 100644 --- a/web/packages/design/src/Checkbox/Checkbox.tsx +++ b/web/packages/design/src/Checkbox/Checkbox.tsx @@ -106,7 +106,7 @@ const Checkmark = styled(Icon.CheckThick)` const CheckboxInternal = styled.input.attrs(props => ({ // TODO(bl-nero): Make radio buttons a separate control. type: props.type || 'checkbox', -}))` +}))<{ cbSize?: CheckboxSize }>` // reset the appearance so we can style the background -webkit-appearance: none; -moz-appearance: none; diff --git a/web/packages/design/src/DataTable/StyledTable.tsx b/web/packages/design/src/DataTable/StyledTable.tsx index d938dc2722732..4995206f2e4b5 100644 --- a/web/packages/design/src/DataTable/StyledTable.tsx +++ b/web/packages/design/src/DataTable/StyledTable.tsx @@ -75,13 +75,13 @@ export const StyledTable = styled.table` border-top: ${props => props.theme.borders[2]} ${props => props.theme.colors.spotBackground[0]}; - :hover { + &:hover { border-top: ${props => props.theme.borders[2]} rgba(0, 0, 0, 0); background-color: ${props => props.theme.colors.levels.surface}; // We use a pseudo element for the shadow with position: absolute in order to prevent // the shadow from increasing the size of the layout and causing scrollbar flicker. - :after { + &:after { box-shadow: ${props => props.theme.boxShadow[3]}; content: ''; position: absolute; diff --git a/web/packages/design/src/Input/Input.story.js b/web/packages/design/src/Input/Input.story.js index e741ab64d5558..42bdc2ef164cc 100644 --- a/web/packages/design/src/Input/Input.story.js +++ b/web/packages/design/src/Input/Input.story.js @@ -28,5 +28,7 @@ export const Inputs = () => ( <> + + ); diff --git a/web/packages/design/src/Input/Input.tsx b/web/packages/design/src/Input/Input.tsx index 59726300324d5..f4e66cf180471 100644 --- a/web/packages/design/src/Input/Input.tsx +++ b/web/packages/design/src/Input/Input.tsx @@ -67,20 +67,20 @@ const Input = styled.input` border: 1px solid ${props => props.theme.colors.text.slightlyMuted}; } - ::-ms-clear { + &::-ms-clear { display: none; } - ::placeholder { + &::placeholder { color: ${props => props.theme.colors.text.muted}; opacity: 1; } - :read-only { + &:read-only { cursor: not-allowed; } - :disabled { + &:disabled { color: ${props => props.theme.colors.text.disabled}; border-color: ${props => props.theme.colors.text.disabled}; } diff --git a/web/packages/design/src/Onboard/WelcomeWrapper.tsx b/web/packages/design/src/Onboard/WelcomeWrapper.tsx index 8b2324322ef3e..47532dd7af467 100644 --- a/web/packages/design/src/Onboard/WelcomeWrapper.tsx +++ b/web/packages/design/src/Onboard/WelcomeWrapper.tsx @@ -61,7 +61,7 @@ const OnboardWrapper = styled.div` background-size: cover; // leveraging pseudo element for opacity/blur - ::after { + &::after { content: ''; top: 0; left: 0; diff --git a/web/packages/design/src/StepSlider/StepSlider.tsx b/web/packages/design/src/StepSlider/StepSlider.tsx index 3bb73e14fba43..4cab9f3a42b73 100644 --- a/web/packages/design/src/StepSlider/StepSlider.tsx +++ b/web/packages/design/src/StepSlider/StepSlider.tsx @@ -246,8 +246,8 @@ const HiddenBox = styled.div` position: absolute; `; -const Wrap = styled.div( - ({ tDuration }: { tDuration: number }) => ` +const Wrap = styled.div<{ tDuration: number }>( + ({ tDuration }) => ` .prev-slide-enter { transform: translateX(-100%); diff --git a/web/packages/design/src/Text/Text.tsx b/web/packages/design/src/Text/Text.tsx index 527bf56c1f041..dc2ba10535f31 100644 --- a/web/packages/design/src/Text/Text.tsx +++ b/web/packages/design/src/Text/Text.tsx @@ -36,6 +36,7 @@ import { fontWeight, } from 'design/system'; import { fontWeights } from 'design/theme/typography'; +import { shouldForwardTypographyProp } from 'design/system/typography'; interface FontWeightProps { fontWeight?: ResponsiveValue; @@ -49,7 +50,9 @@ export interface TextProps TextAlignProps, FontWeightProps {} -const Text = styled.div` +const Text = styled.div.withConfig({ + shouldForwardProp: shouldForwardTypographyProp, +})` overflow: hidden; text-overflow: ellipsis; ${typography} diff --git a/web/packages/design/src/TextArea/TextArea.story.tsx b/web/packages/design/src/TextArea/TextArea.story.tsx index 045dbee380bfe..3bf2692bc14a4 100644 --- a/web/packages/design/src/TextArea/TextArea.story.tsx +++ b/web/packages/design/src/TextArea/TextArea.story.tsx @@ -28,6 +28,8 @@ export const TextAreas = () => ( <>