Skip to content

Commit

Permalink
Merge branch 'main' into renderer-angular-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ShellyDCMS committed Sep 29, 2024
2 parents 43b1b8d + 7d9a003 commit 0d12072
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 32 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
"@open-wc/lit-helpers": "^0.7.0",
"@simonsmith/cypress-image-snapshot": "^9.1.0",
"@types/chai-subset": "^1.3.5",
"@types/react": "^18.2.7",
"@types/react": "^18.3.5",
"@types/react-html-parser": "^2.0.6",
"chai-subset": "^1.6.0",
"cypress-pipe": "^2.0.0",
"cypress-real-events": "^1.13.0",
"cypress-wait-if-happens": "^1.3.3",
"cypress-wait-until": "^3.0.2",
"lit": "^2.7.4",
"react": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-html-parser": "^2.0.2",
"react-router-dom": "^6.21.3",
"react-router-dom": "^6.26.1",
"ts-stubber": "^1.0.17"
},
"devDependencies": {
Expand Down
52 changes: 23 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@
resolved "https://registry.npmjs.org/@open-wc/lit-helpers/-/lit-helpers-0.7.0.tgz"
integrity sha512-4NBlx5ve0EvZplCRJbESm0MdMbRCw16alP2y76KAAAwzmFFXXrUj5hFwhw55+sSg5qaRRx6sY+s7usKgnNo3TQ==

"@remix-run/router@1.14.2":
version "1.14.2"
resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz"
integrity sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==
"@remix-run/router@1.19.2":
version "1.19.2"
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.19.2.tgz#0c896535473291cb41f152c180bedd5680a3b273"
integrity sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==

"@rollup/plugin-node-resolve@^15.2.3":
version "15.2.3"
Expand Down Expand Up @@ -352,25 +352,19 @@
"@types/prop-types" "*"
csstype "^3.0.2"

"@types/react@^18.2.7":
version "18.2.28"
resolved "https://registry.npmjs.org/@types/react/-/react-18.2.28.tgz"
integrity sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==
"@types/react@^18.3.5":
version "18.3.9"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.9.tgz#2cdf5f425ec8a133d67e9e3673909738b783db20"
integrity sha512-+BpAVyTpJkNWWSSnaLBk6ePpHLOGJKnEQNbINNovPWzvEUyAe3e+/d494QdEh71RekM/qV7lw6jzf1HGrJyAtQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/[email protected]":
version "1.20.2"
resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz"
integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==

"@types/scheduler@*":
version "0.16.4"
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz"
integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==

"@types/[email protected]":
version "8.1.1"
resolved "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz"
Expand Down Expand Up @@ -3648,25 +3642,25 @@ react-is@^18.0.0:
resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==

react-router-dom@^6.21.3:
version "6.21.3"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz"
integrity sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==
react-router-dom@^6.26.1:
version "6.26.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.26.2.tgz#a6e3b0cbd6bfd508e42b9342099d015a0ac59680"
integrity sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==
dependencies:
"@remix-run/router" "1.14.2"
react-router "6.21.3"
"@remix-run/router" "1.19.2"
react-router "6.26.2"

react-router@6.21.3:
version "6.21.3"
resolved "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz"
integrity sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==
react-router@6.26.2:
version "6.26.2"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.26.2.tgz#2f0a68999168954431cdc29dd36cec3b6fa44a7e"
integrity sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==
dependencies:
"@remix-run/router" "1.14.2"
"@remix-run/router" "1.19.2"

react@^18.2.0:
version "18.2.0"
resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
react@^18.3.1:
version "18.3.1"
resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
dependencies:
loose-envify "^1.1.0"

Expand Down

0 comments on commit 0d12072

Please sign in to comment.