Skip to content

Commit 547b409

Browse files
committed
Merge branch 'production'
# Conflicts: # .env.example # .github/workflows/e2e-embed.yml # apps/web/components/EmptyScreen.tsx # apps/web/components/SettingsShell.tsx # apps/web/components/Shell.tsx # apps/web/components/booking/BookingListItem.tsx # apps/web/components/booking/pages/AvailabilityPage.tsx # apps/web/ee/components/LicenseRequired.tsx # apps/web/ee/components/apiKeys/ApiKeyListContainer.tsx # apps/web/ee/components/support/HelpMenuItem.tsx # apps/web/lib/emails/templates/attendee-request-reschedule-email.ts # apps/web/lib/emails/templates/attendee-rescheduled-email.ts # apps/web/lib/emails/templates/attendee-scheduled-email.ts # apps/web/lib/emails/templates/organizer-request-reschedule-email.ts # apps/web/lib/emails/templates/organizer-rescheduled-email.ts # apps/web/lib/emails/templates/organizer-scheduled-email.ts # apps/web/pages/_app.tsx # apps/web/pages/apps/installed.tsx # apps/web/pages/event-types/[type].tsx # apps/web/public/static/locales/en/common.json # apps/web/server/routers/viewer/bookings.tsx # packages/app-store/vital/lib/templates/attendee-request-reschedule-email.ts # packages/app-store/vital/lib/templates/base-template.ts # packages/app-store/vital/lib/templates/organizer-request-reschedule-email.ts # packages/app-store/wipemycalother/lib/templates/attendee-request-reschedule-email.ts # packages/app-store/wipemycalother/lib/templates/base-template.ts # packages/app-store/wipemycalother/lib/templates/organizer-request-reschedule-email.ts # packages/ee/server/checkLicense.ts # packages/emails/email-manager.ts # packages/embeds/embed-core/package.json # packages/embeds/embed-snippet/package.json # packages/embeds/vite.config.js # packages/lib/constants.ts # packages/types/environment.d.ts # yarn.lock
2 parents 15d5333 + 03e787a commit 547b409

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

yarn.lock

+20-15
Original file line numberDiff line numberDiff line change
@@ -1163,10 +1163,15 @@
11631163
resolved "https://registry.yarnpkg.com/@glidejs/glide/-/glide-3.5.2.tgz#7012c5920ecf202bbda44d8526fc979984b6dd54"
11641164
integrity sha512-7jGciNJ2bQ4eZLSNlSZ+VAyW63kALf420CvkEpK4lEsUfWJq9odqimci0YCiyNyMUFB+pWHwLYyNc57dijYsCg==
11651165

1166-
"@headlessui/react@^1.4.1", "@headlessui/react@^1.5.0":
1167-
version "1.6.4"
1168-
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.4.tgz#c73084e23386bef5fb86cd16da3352c3a844bb4c"
1169-
integrity sha512-0yqz1scwbFtwljmbbKjXsSGl5ABEYNICVHZnMCWo0UtOZodo2Tpu94uOVgCRjRZ77l2WcTi2S0uidINDvG7lsA==
1166+
"@headlessui/react@^1.4.1":
1167+
version "1.6.1"
1168+
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.1.tgz#d822792e589aac005462491dd62f86095e0c3bef"
1169+
integrity sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==
1170+
1171+
"@headlessui/react@^1.5.0":
1172+
version "1.6.3"
1173+
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.3.tgz#6e52477ea3aee7d99f153b98c1b41765ed77db3d"
1174+
integrity sha512-WNu/ypGzl0JmJ+sD34KtdycEu2n7EZjKFx2rq6fivsszPdoEyOVZ/GYQMJ437dfAJI0/ZxoRYfrOVduZHjlokQ==
11701175

11711176
"@heroicons/react@^1.0.4", "@heroicons/react@^1.0.6":
11721177
version "1.0.6"
@@ -11811,7 +11816,7 @@ nanoid@^3.1.23, nanoid@^3.3.1:
1181111816
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
1181211817
integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
1181311818

11814-
nanoid@^3.1.30, nanoid@^3.3.3, nanoid@^3.3.4:
11819+
nanoid@^3.1.30, nanoid@^3.3.4:
1181511820
version "3.3.4"
1181611821
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
1181711822
integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
@@ -12998,12 +13003,12 @@ postcss@8.4.5:
1299813003
picocolors "^1.0.0"
1299913004
source-map-js "^1.0.1"
1300013005

13001-
postcss@^8.3.6, postcss@^8.4.8:
13002-
version "8.4.14"
13003-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
13004-
integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
13006+
postcss@^8.3.6, postcss@^8.4.13:
13007+
version "8.4.13"
13008+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
13009+
integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
1300513010
dependencies:
13006-
nanoid "^3.3.4"
13011+
nanoid "^3.3.3"
1300713012
picocolors "^1.0.0"
1300813013
source-map-js "^1.0.2"
1300913014

@@ -13016,12 +13021,12 @@ postcss@^8.4.12:
1301613021
picocolors "^1.0.0"
1301713022
source-map-js "^1.0.2"
1301813023

13019-
postcss@^8.4.13:
13020-
version "8.4.13"
13021-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
13022-
integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
13024+
postcss@^8.4.8:
13025+
version "8.4.14"
13026+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
13027+
integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
1302313028
dependencies:
13024-
nanoid "^3.3.3"
13029+
nanoid "^3.3.4"
1302513030
picocolors "^1.0.0"
1302613031
source-map-js "^1.0.2"
1302713032

0 commit comments

Comments
 (0)