Skip to content

Commit

Permalink
Merge branch 'main' into revert-5869-boban/5863-disable-touchpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
johanna-skylight authored Jul 6, 2023
2 parents ec0dad4 + 84e404c commit cc8ba75
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 70 deletions.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"@storybook/addon-interactions": "^6.5.13",
"@storybook/addon-links": "^7.0.20",
"@storybook/builder-webpack5": "^6.5.13",
"@storybook/manager-webpack5": "^6.5.13",
"@storybook/manager-webpack5": "^6.5.16",
"@storybook/node-logger": "^6.5.13",
"@storybook/preset-create-react-app": "^7.0.6",
"@storybook/react": "^6.5.16",
Expand Down
81 changes: 12 additions & 69 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3615,17 +3615,6 @@
qs "^6.10.0"
telejson "^7.0.3"

"@storybook/channel-websocket@6.5.15":
version "6.5.15"
resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.15.tgz#3fa090412d122428a7bc3d622e4cd36fdac7dd78"
integrity sha512-K85KEgzo5ahzJNJjyUbSNyuRmkeC8glJX2hCg2j9HiJ9rasX53qugkODrKDlWAeheulo3kR13VSuAqIuwVbmbw==
dependencies:
"@storybook/channels" "6.5.15"
"@storybook/client-logger" "6.5.15"
core-js "^3.8.2"
global "^4.4.0"
telejson "^6.0.8"

"@storybook/channel-websocket@6.5.16":
version "6.5.16"
resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.16.tgz#41f69ca9444a4dfbf72580b4696900c5b1d2b817"
Expand Down Expand Up @@ -3806,32 +3795,6 @@
use-resize-observer "^9.1.0"
util-deprecate "^1.0.2"

"@storybook/core-client@6.5.15":
version "6.5.15"
resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.15.tgz#57d86a07f920ab0cb058820dbcb1f48cc9dc6257"
integrity sha512-i9t4WONy2MxJwLI1FIp5ck7b52EXyJfALnxUn4O/3GTkw09J0NOKi2DPjefUsi7IB5MzFpDjDH9vw/XiTM+OZw==
dependencies:
"@storybook/addons" "6.5.15"
"@storybook/channel-postmessage" "6.5.15"
"@storybook/channel-websocket" "6.5.15"
"@storybook/client-api" "6.5.15"
"@storybook/client-logger" "6.5.15"
"@storybook/core-events" "6.5.15"
"@storybook/csf" "0.0.2--canary.4566f4d.1"
"@storybook/preview-web" "6.5.15"
"@storybook/store" "6.5.15"
"@storybook/ui" "6.5.15"
airbnb-js-shims "^2.2.1"
ansi-to-html "^0.6.11"
core-js "^3.8.2"
global "^4.4.0"
lodash "^4.17.21"
qs "^6.10.0"
regenerator-runtime "^0.13.7"
ts-dedent "^2.0.0"
unfetch "^4.2.0"
util-deprecate "^1.0.2"

"@storybook/core-client@6.5.16":
version "6.5.16"
resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.16.tgz#ed2328fd38c6111fe887f6a91b28d9dc2b17092a"
Expand Down Expand Up @@ -4228,20 +4191,20 @@
webpack-dev-middleware "^3.7.3"
webpack-virtual-modules "^0.2.2"

"@storybook/manager-webpack5@^6.5.13":
version "6.5.15"
resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.15.tgz#e17ae2538c7bd013e77597f20a3843e448d1cb5b"
integrity sha512-yrHVFUHGdVRWq/oGJwQu+UOZzxELH5SS+Lpn5oIQ/Dblam9piQC0KmBZtFuA9X8acaw4BBVnXgF/aiqs9fOp/Q==
"@storybook/manager-webpack5@^6.5.16":
version "6.5.16"
resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.16.tgz#48b223557d9633614ff8c6e3227c01a57ab4eb55"
integrity sha512-OtxXv8JCe0r/0rE5HxaFicsNsXA+fqZxzokxquFFgrYf/1Jg4d7QX6/pG5wINF+5qInJfVkRG6xhPzv1s5bk9Q==
dependencies:
"@babel/core" "^7.12.10"
"@babel/plugin-transform-template-literals" "^7.12.1"
"@babel/preset-react" "^7.12.10"
"@storybook/addons" "6.5.15"
"@storybook/core-client" "6.5.15"
"@storybook/core-common" "6.5.15"
"@storybook/node-logger" "6.5.15"
"@storybook/theming" "6.5.15"
"@storybook/ui" "6.5.15"
"@storybook/addons" "6.5.16"
"@storybook/core-client" "6.5.16"
"@storybook/core-common" "6.5.16"
"@storybook/node-logger" "6.5.16"
"@storybook/theming" "6.5.16"
"@storybook/ui" "6.5.16"
"@types/node" "^14.0.10 || ^16.0.0"
babel-loader "^8.0.0"
case-sensitive-paths-webpack-plugin "^2.3.0"
Expand Down Expand Up @@ -4701,26 +4664,6 @@
"@types/express" "^4.7.0"
file-system-cache "^2.0.0"

"@storybook/ui@6.5.15":
version "6.5.15"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.15.tgz#e4d80465116e53d48d2c3bb616909c37f5405181"
integrity sha512-OO+TWZmI8ebWA1C3JBKNvbUbsgvt4GppqsGlkf5CTBZrT/MzmMlYiooLAtlY1ZPcMtTd5ynLxvroHWBEnMOk2A==
dependencies:
"@storybook/addons" "6.5.15"
"@storybook/api" "6.5.15"
"@storybook/channels" "6.5.15"
"@storybook/client-logger" "6.5.15"
"@storybook/components" "6.5.15"
"@storybook/core-events" "6.5.15"
"@storybook/router" "6.5.15"
"@storybook/semver" "^7.3.2"
"@storybook/theming" "6.5.15"
core-js "^3.8.2"
memoizerific "^1.11.3"
qs "^6.10.0"
regenerator-runtime "^0.13.7"
resolve-from "^5.0.0"

"@storybook/ui@6.5.16":
version "6.5.16"
resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.16.tgz#c73bf456e672ecf2370b4365070088487fc0ce57"
Expand Down Expand Up @@ -19780,7 +19723,7 @@ webpack@4:
watchpack "^1.7.4"
webpack-sources "^1.4.1"

webpack@>5.0.0@5.76.0, "webpack@>=4.43.0 <6.0.0", webpack@^5.64.4, webpack@^5.9.0:
webpack@>5.0.0@5.76.0:
version "5.76.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
Expand Down Expand Up @@ -19810,7 +19753,7 @@ webpack@>5.0.0@5.76.0, "webpack@>=4.43.0 <6.0.0", webpack@^5.64.4, webpack@^5.9.
watchpack "^2.4.0"
webpack-sources "^3.2.3"

webpack@^5.76.0:
"webpack@>=4.43.0 <6.0.0", webpack@^5.64.4, webpack@^5.76.0, webpack@^5.9.0:
version "5.77.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.77.0.tgz#dea3ad16d7ea6b84aa55fa42f4eac9f30e7eb9b4"
integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==
Expand Down

0 comments on commit cc8ba75

Please sign in to comment.