From 4c4d5a30bc7c84ae3e1ecf7b367ed735d9057069 Mon Sep 17 00:00:00 2001 From: bzhang102 <100454119+bzhang102@users.noreply.github.com> Date: Mon, 5 Feb 2024 21:08:40 -0800 Subject: [PATCH] Feature: Added CodeBlock Component Using Syntax Highlighter (#241) * Using SyntaxHighlighter package * Added CodeBlock Component --- package.json | 6 +- src/components/binary-comps/BinaryCode.tsx | 1 + .../dining-comps/DiningUnderstand.tsx | 47 ++------ src/components/shared/CodeBlock.tsx | 29 +++++ src/pages/Intro.tsx | 34 ++---- yarn.lock | 112 +++++------------- 6 files changed, 81 insertions(+), 148 deletions(-) create mode 100644 src/components/shared/CodeBlock.tsx diff --git a/package.json b/package.json index e8ccd734..b37e07e6 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@mui/system": "^5.14.15", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", + "@types/react-syntax-highlighter": "^15.5.11", "@types/webpack-env": "^1.18.1", "babelify": "^10.0.0", "browserify": "^17.0.0", @@ -27,12 +28,12 @@ "katex": "^0.16.4", "prettier": "^2.8.7", "react": "^18.2.0", - "react-code-blocks": "^0.1.5", "react-confetti-explosion": "^2.1.2", "react-dom": "^18.2.0", "react-latex-next": "^2.2.0", "react-router-dom": "^6.12.0", "react-select": "^5.7.2", + "react-syntax-highlighter": "^15.5.0", "stylelint-config-prettier": "^9.0.4" }, "devDependencies": { @@ -40,6 +41,7 @@ "@babel/preset-env": "^7.22.14", "@babel/preset-react": "^7.22.5", "@babel/preset-typescript": "^7.22.11", + "@types/react-syntax-highlighter": "^15.5.11", "@typescript-eslint/eslint-plugin": "^6.9.0", "@typescript-eslint/parser": "^6.9.0", "babel-loader": "^9.1.2", @@ -74,6 +76,6 @@ "webpack-manifest-plugin": "^5.0.0", "webpack-merge": "^5.8.0", "webpack-nano": "^1.1.1", - "webpack-pwa-manifest": "^4.3.0" + "webpack-pwa-manifest": "^4.0.0" } } diff --git a/src/components/binary-comps/BinaryCode.tsx b/src/components/binary-comps/BinaryCode.tsx index 3c3e9826..ad7ec570 100644 --- a/src/components/binary-comps/BinaryCode.tsx +++ b/src/components/binary-comps/BinaryCode.tsx @@ -112,6 +112,7 @@ function BinaryCode(): JSX.Element { return ( <> @@ -21,42 +25,7 @@ function DiningUnderstand(): JSX.Element {
- class Friend: -
- - <> - def - - {' '} - - init - - {' '} - - (self, val,
- left = None, right = None): -
- - <> - self.val = val -
- self.left = left -
- self.right = right - - - - +
diff --git a/src/components/shared/CodeBlock.tsx b/src/components/shared/CodeBlock.tsx new file mode 100644 index 00000000..93882314 --- /dev/null +++ b/src/components/shared/CodeBlock.tsx @@ -0,0 +1,29 @@ +import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/default-highlight'; +import { atomOneLight } from 'react-syntax-highlighter/dist/esm/styles/hljs'; + +interface CodeBlockProps { + code: string; + language: string; +} + +const customStyle = { + lineHeight: '1.5', + fontSize: '1rem', +}; + +const CodeBlock = (props: CodeBlockProps): JSX.Element => { + return ( +
+ + {props.code} + +
+ ); +}; + +export default CodeBlock; diff --git a/src/pages/Intro.tsx b/src/pages/Intro.tsx index 5a975193..964d3468 100644 --- a/src/pages/Intro.tsx +++ b/src/pages/Intro.tsx @@ -1,12 +1,11 @@ import { faGreaterThan, faLessThan } from '@fortawesome/free-solid-svg-icons'; import { FC } from 'react'; -import { CodeBlock, dracula } from 'react-code-blocks'; import Latex from 'react-latex-next'; - import FactorialQuestion from '../components/intro_comps/FactorialQuestion'; import IntroCode from '../components/intro_comps/intro_code'; import AppWrapper from '../components/shared/AppWrapper'; import Button from '../components/shared/Button'; +import CodeBlock from '../components/shared/CodeBlock'; import { HeaderSections } from '../components/shared/globalTypes'; import './intro.scss'; @@ -24,29 +23,14 @@ const slides: { url: string }[] = importAll( require.context('../assets/', false, /Variant\d\.(png|jpe?g|svg)$/) ); -function recursionCodeBlock( - code: string, - language: string, - showLineNumbers: boolean, - startingLineNumber: number -) { - return ( - - ); +function recursionCodeBlock(code: string) { + return ; } -const code = `void doSomething() { - //---- do stuff ---- - cout << "did something" << endl; - //------------------ - - doSomething(); -}`; +const code = `def doSomething(): + #---- do stuff ---- + print("did something") + #------------------ + doSomething()`; const Intro: FC = () => { return ( @@ -81,7 +65,7 @@ const Intro: FC = () => { fontFamily: 'monospace', }} > - {recursionCodeBlock(code, 'cpp', true, 1)} + {recursionCodeBlock(code)} {` diff --git a/yarn.lock b/yarn.lock index eb71e65b..ea74ea9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -978,7 +978,7 @@ resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.10.4", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.23.2" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz" integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== @@ -1128,7 +1128,7 @@ "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1" "@emotion/utils" "^1.2.1" -"@emotion/unitless@^0.8.0", "@emotion/unitless@^0.8.1": +"@emotion/unitless@^0.8.1": version "0.8.1" resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz" integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== @@ -1801,9 +1801,9 @@ "@types/node" "*" "@types/hast@^2.0.0": - version "2.3.7" - resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.7.tgz#5e9bd7ab4452d5313aeec9d38fbc193a70f8d810" - integrity sha512-EVLigw5zInURhzfXUM65eixfadfsHKomGKUakToXo84t8gGIJuTcD2xooM2See7GyQ7DRtYjhCHnSUQez8JaLw== + version "2.3.10" + resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.10.tgz#5c9d9e0b304bbb8879b857225c5ebab2d81d7643" + integrity sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw== dependencies: "@types/unist" "^2" @@ -1898,6 +1898,13 @@ dependencies: "@types/react" "*" +"@types/react-syntax-highlighter@^15.5.11": + version "15.5.11" + resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.11.tgz#e050745b22eff81fc13cb0c763dd0d063413bbf1" + integrity sha512-ZqIJl+Pg8kD+47kxUjvrlElrraSUrYa4h0dauY/U/FTUuprSCqvUj+9PNQNQzVc6AJgIWUUxn87/gqsMHNbRjw== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.7": version "4.4.8" resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz" @@ -1960,15 +1967,10 @@ dependencies: "@types/node" "*" -"@types/stylis@^4.0.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.2.tgz#baabb6b3aa6787e90a6bd6cd75cd8fb9a4f256a3" - integrity sha512-Rm17MsTpQQP5Jq4BF7CdrxJsDufoiL/q5IbJZYZmOZAJALyijgF7BzLgobXUqraNcQdqFYLYGeglDp6QzaxPpg== - "@types/unist@^2": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.9.tgz#72e164381659a49557b0a078b28308f2c6a3e1ce" - integrity sha512-zC0iXxAv1C1ERURduJueYzkzZ2zaGyc+P2c95hgkikHPr3z8EdUZOlgEQ5X0DRmwDZn+hekycQnoeiiRVrmilQ== + version "2.0.10" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.10.tgz#04ffa7f406ab628f7f7e97ca23e290cd8ab15efc" + integrity sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA== "@types/webpack-env@^1.18.1": version "1.18.3" @@ -3501,11 +3503,6 @@ camelcase@^5.3.1: resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelize@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz" - integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== - caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001541: version "1.0.30001554" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz" @@ -3541,17 +3538,17 @@ chalk@^4.0.0, chalk@^4.1.0: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== "chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3: @@ -3656,7 +3653,7 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0: comma-separated-tokens@^1.0.0: version "1.0.8" - resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== commander@^10.0.1: @@ -3856,11 +3853,6 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" -css-color-keywords@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz" - integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== - css-color-names@1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz" @@ -3905,15 +3897,6 @@ css-select@^4.1.3: domutils "^2.8.0" nth-check "^2.0.1" -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== - dependencies: - camelize "^1.0.0" - css-color-keywords "^1.0.0" - postcss-value-parser "^4.0.2" - css-vendor@^2.0.8: version "2.0.8" resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz" @@ -4847,7 +4830,7 @@ for-each@^0.3.3: format@^0.2.0: version "0.2.2" - resolved "https://registry.npmjs.org/format/-/format-0.2.2.tgz" + resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww== forwarded@0.2.0: @@ -5147,7 +5130,7 @@ hasown@^2.0.0: hast-util-parse-selector@^2.0.0: version "2.2.5" - resolved "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz" + resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a" integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ== hastscript@^6.0.0: @@ -5481,12 +5464,12 @@ ipaddr.js@^2.0.1: is-alphabetical@^1.0.0: version "1.0.4" - resolved "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== is-alphanumerical@^1.0.0: version "1.0.4" - resolved "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== dependencies: is-alphabetical "^1.0.0" @@ -5569,7 +5552,7 @@ is-date-object@^1.0.1, is-date-object@^1.0.5: is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== is-docker@^2.0.0, is-docker@^2.1.1: @@ -5620,7 +5603,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== is-in-browser@^1.0.2, is-in-browser@^1.1.3: @@ -7023,12 +7006,12 @@ postcss-sorting@^7.0.1: resolved "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz" integrity sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.31: +postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.21: version "8.4.31" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== @@ -7098,7 +7081,7 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1: property-information@^5.0.0: version "5.6.0" - resolved "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA== dependencies: xtend "^4.0.0" @@ -7192,16 +7175,6 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" -react-code-blocks@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/react-code-blocks/-/react-code-blocks-0.1.5.tgz#8514c6b7bee5b238366278aaee3c0d6cc6f07851" - integrity sha512-p57YPvry1OY0fS/oDVfK7BBgy89jHJguyyzNbjZvMUR2/90oB0iv3D6aS/PBjuQp7JyjlRoaZ/2WRxvOyyAAEw== - dependencies: - "@babel/runtime" "^7.10.4" - react-syntax-highlighter "^15.5.0" - styled-components "^6.1.0" - tslib "^2.6.0" - react-confetti-explosion@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/react-confetti-explosion/-/react-confetti-explosion-2.1.2.tgz" @@ -7827,11 +7800,6 @@ shallow-equal@^1.2.0: resolved "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz" integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== -shallowequal@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" - integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== - shasum-object@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz" @@ -7945,7 +7913,7 @@ source-map@^0.7.4: space-separated-tokens@^1.0.0: version "1.1.5" - resolved "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== spdx-correct@^3.0.0: @@ -8160,21 +8128,6 @@ style-search@^0.1.0: resolved "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz" integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg== -styled-components@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-6.1.1.tgz#a5414ada07fb1c17b96a26a05369daa4e2ad55e5" - integrity sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ== - dependencies: - "@emotion/is-prop-valid" "^1.2.1" - "@emotion/unitless" "^0.8.0" - "@types/stylis" "^4.0.2" - css-to-react-native "^3.2.0" - csstype "^3.1.2" - postcss "^8.4.31" - shallowequal "^1.1.0" - stylis "^4.3.0" - tslib "^2.5.0" - stylelint-config-prettier@^9.0.4: version "9.0.5" resolved "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz" @@ -8268,11 +8221,6 @@ stylis@4.2.0: resolved "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz" integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== -stylis@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c" - integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== - subarg@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz" @@ -8494,7 +8442,7 @@ tsconfig-paths@^3.14.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^2.0.3, tslib@^2.5.0, tslib@^2.6.0: +tslib@^2.0.3: version "2.6.2" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==