v.1.9.1

.env.example

@@ -30,8 +30,6 @@ NEXT_PUBLIC_WEBAPP_URL='http://localhost:3000'
 NEXT_PUBLIC_WEBSITE_URL='http://localhost:3000'
 NEXT_PUBLIC_CONSOLE_URL='http://localhost:3004'
 NEXT_PUBLIC_EMBED_LIB_URL='http://localhost:3000/embed/embed.js'
-# Make sure you don't have .example.com as a value
-NEXTAUTH_DOMAIN='localhost:3000'
 
 # To enable SAML login, set both these variables
 # @see https://github.com/calcom/cal.com/tree/main/packages/ee#setting-up-saml-login
@@ -54,7 +52,7 @@ NEXTAUTH_URL=
 # You can use: `openssl rand -base64 32` to generate one
 NEXTAUTH_SECRET=
 # Used for cross-domain cookie authentication
-NEXTAUTH_COOKIE_DOMAIN=.example.com
+NEXTAUTH_COOKIE_DOMAIN=
 
 # Set this to '1' if you don't want Cal to collect anonymous usage
 CALCOM_TELEMETRY_DISABLED=

README.md

@@ -64,9 +64,6 @@ That's where Cal.com comes in. Self-hosted or hosted by us. White-label by desig
 
 <a href="https://www.producthunt.com/posts/calendso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=291910&theme=light&period=monthly" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/calendso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=291910&theme=light" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/stories/how-this-open-source-calendly-alternative-rocketed-to-product-of-the-day" target="_blank"><img src="https://cal.com/maker-grant.svg" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
-
-
-
 ### Built With
 
 - [Next.js](https://nextjs.org/)
@@ -266,13 +263,13 @@ yarn workspace @calcom/web playwright-report
 
 ### Docker
 
-The Docker configuration for Cal is an effort powered by people within the community. 
+The Docker configuration for Cal is an effort powered by people within the community.
 
 If you want to contribute to the Docker repository, [reply here](https://github.com/calcom/docker/discussions/32).
 
 The Docker configuration can be found [in our docker repository](https://github.com/calcom/docker).
 
-Issues with Docker? Find your answer or open a new discussion [here](https://github.com/calcom/docker/discussions) to ask the community. 
+Issues with Docker? Find your answer or open a new discussion [here](https://github.com/calcom/docker/discussions) to ask the community.
 
 Cal.com, Inc. does not provide official support for Docker, but we will accept fixes and documentation. Use at your own risk.
 
@@ -284,7 +281,7 @@ Cal.com, Inc. does not provide official support for Docker, but we will accept f
 
 ### Railway
 
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template?template=https%3A%2F%2Fgithub.amrom.workers.dev%2Fcalendso%2Fcalendso&plugins=postgresql&envs=GOOGLE_API_CREDENTIALS%2CBASE_URL%2CNEXTAUTH_URL%2CPORT&BASE_URLDefault=http%3A%2F%2Flocalhost%3A3000&NEXTAUTH_URLDefault=http%3A%2F%2Flocalhost%3A3000&PORTDefault=3000)
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/cal)
 
 You can deploy Cal on [Railway](https://railway.app/) using the button above. The team at Railway also have a [detailed blog post](https://blog.railway.app/p/calendso) on deploying Cal on their platform.
 
@@ -328,7 +325,7 @@ We have a list of [help wanted](https://github.com/orgs/calcom/projects/1/views/
 10. The key will be created and you will be redirected back to the Credentials page. Select the newly generated client ID under OAuth 2.0 Client IDs.
 11. Select Download JSON. Copy the contents of this file and paste the entire JSON string in the .env file as the value for GOOGLE_API_CREDENTIALS key.
 
-#### *Adding google calendar to Cal.com App Store*
+#### _Adding google calendar to Cal.com App Store_
 
 After adding Google credentials, you can now Google Calendar App to the app store.
 You can repopulate the App store by running
@@ -344,6 +341,7 @@ following
 
 1. Add extra redirect URL `<Cal.com URL>/api/auth/callback/google`
 1. Under 'OAuth concent screen', click "PUBLISH APP"
+
 ### Obtaining Microsoft Graph Client ID and Secret
 
 1. Open [Azure App Registration](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredApps) and select New registration

apps/docs/package.json

@@ -17,14 +17,14 @@
   "license": "MIT",
   "dependencies": {
     "iframe-resizer-react": "^1.1.0",
-    "next": "^12.2.0",
+    "next": "^12.2.5",
     "nextra": "^1.1.0",
     "nextra-theme-docs": "^1.2.2",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@calcom/config": "*",
-    "eslint": "^8.15.0"
+    "eslint": "^8.20.0"
   }
 }

apps/storybook/package.json

@@ -23,16 +23,16 @@
     "@radix-ui/react-radio-group": "^0.1.1",
     "@radix-ui/react-slider": "^0.1.1",
     "@radix-ui/react-switch": "^0.1.1",
-    "@radix-ui/react-tooltip": "^0.1.0",
-    "next": "^12.2.0",
+    "@radix-ui/react-tooltip": "^1.0.0",
+    "next": "^12.2.5",
     "next-transpile-modules": "^9.0.0",
-    "react": "18.1.0",
-    "react-dom": "18.1.0",
-    "react-feather": "^2.0.9",
-    "react-hot-toast": "^2.2.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-feather": "^2.0.10",
+    "react-hot-toast": "^2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.6",
+    "@babel/core": "^7.18.9",
     "@calcom/config": "*",
     "@storybook/addon-a11y": "^6.5.9",
     "@storybook/addon-actions": "^6.5.9",
@@ -44,19 +44,19 @@
     "@storybook/manager-webpack5": "^6.5.9",
     "@storybook/react": "^6.5.9",
     "@types/node": "16.9.1",
-    "@types/react": "18.0.9",
+    "@types/react": "^18.0.9",
     "@types/react-dom": "18.0.4",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
-    "chromatic": "^6.6.4",
-    "eslint": "^8.15.0",
+    "chromatic": "^6.7.1",
+    "eslint": "^8.20.0",
     "postcss": "^8.4.13",
     "postcss-loader": "^7.0.0",
     "storybook-addon-designs": "^6.3.1",
     "storybook-addon-next": "^1.6.7",
-    "tailwindcss": "^3.1.3",
+    "tailwindcss": "^3.1.6",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.4"
   },
   "readme": "ERROR: No README data found!",
   "_id": "@calcom/[email protected]"

apps/swagger/package.json

@@ -12,18 +12,18 @@
     "start": "PORT=4200 next start"
   },
   "dependencies": {
-    "highlight.js": "^11.5.1",
+    "highlight.js": "^11.6.0",
     "isarray": "2.0.5",
-    "next": "12.2.0",
+    "next": "^12.2.5",
     "openapi-snippet": "^0.13.0",
-    "react": "18.1.0",
-    "react-dom": "18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "swagger-ui-react": "4.11.1"
   },
   "devDependencies": {
     "@types/node": "16.9.1",
-    "@types/react": "18.0.9",
+    "@types/react": "^18.0.9",
     "@types/react-dom": "18.0.4",
-    "typescript": "4.6.4"
+    "typescript": "^4.7.4"
   }
 }

apps/web/components/DestinationCalendarSelector.tsx

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from "react";
 import Select from "react-select";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { DestinationCalendar } from "@calcom/prisma/client";
 import { trpc } from "@calcom/trpc/react";
 
 interface Props {
@@ -11,13 +12,15 @@ interface Props {
   hidePlaceholder?: boolean;
   /** The external Id of the connected calendar */
   value: string | undefined;
+  destinationCalendar?: DestinationCalendar | null;
 }
 
 const DestinationCalendarSelector = ({
   onChange,
   isLoading,
   value,
   hidePlaceholder,
+  destinationCalendar,
 }: Props): JSX.Element | null => {
   const { t } = useLocale();
   const query = trpc.useQuery(["viewer.connectedCalendars"]);
@@ -67,11 +70,20 @@ const DestinationCalendarSelector = ({
           value: `${cal.integration}:${cal.externalId}`,
         })),
     })) ?? [];
+
   return (
     <div className="relative" title={`${t("select_destination_calendar")}: ${selectedOption?.label || ""}`}>
       <Select
         name="primarySelectedCalendar"
-        placeholder={!hidePlaceholder ? `${t("select_destination_calendar")}:` : undefined}
+        placeholder={
+          !hidePlaceholder ? (
+            `${t("select_destination_calendar")}`
+          ) : (
+            <span>
+              {t("default_calendar_selected")} ({destinationCalendar?.externalId})
+            </span>
+          )
+        }
         options={options}
         styles={{
           placeholder: (styles) => ({ ...styles, ...content(hidePlaceholder) }),

apps/web/jest.config.ts

@@ -1,15 +1,20 @@
 import type { Config } from "@jest/types";
 
 const config: Config.InitialOptions = {
+  preset: "ts-jest",
+  clearMocks: true,
+  setupFilesAfterEnv: ["../../tests/config/singleton.ts"],
   verbose: true,
   roots: ["<rootDir>"],
+  setupFiles: ["<rootDir>/test/jest-setup.js"],
   testMatch: ["**/test/lib/**/*.(spec|test).(ts|tsx|js)"],
   testPathIgnorePatterns: ["<rootDir>/.next", "<rootDir>/playwright/"],
   transform: {
     "^.+\\.(js|jsx|ts|tsx)$": ["babel-jest", { presets: ["next/babel"] }],
   },
   transformIgnorePatterns: ["/node_modules/", "^.+\\.module\\.(css|sass|scss)$"],
   testEnvironment: "jsdom",
+  resolver: `<rootDir>/test/jest-resolver.js`,
   moduleNameMapper: {
     "^@components(.*)$": "<rootDir>/components$1",
     "^@lib(.*)$": "<rootDir>/lib$1",

apps/web/lib/app-providers.tsx

@@ -1,3 +1,4 @@
+import { TooltipProvider } from "@radix-ui/react-tooltip";
 import { SessionProvider } from "next-auth/react";
 import { EventCollectionProvider } from "next-collect/client";
 import { appWithTranslation } from "next-i18next";
@@ -72,14 +73,16 @@ const AppProviders = (props: AppPropsWithChildren) => {
       <ContractsProvider>
         <SessionProvider session={session || undefined}>
           <CustomI18nextProvider {...props}>
-            {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
-            <ThemeProvider
-              enableColorScheme={false}
-              storageKey={storageKey}
-              forcedTheme={forcedTheme}
-              attribute="class">
-              {props.children}
-            </ThemeProvider>
+            <TooltipProvider>
+              {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
+              <ThemeProvider
+                enableColorScheme={false}
+                storageKey={storageKey}
+                forcedTheme={forcedTheme}
+                attribute="class">
+                {props.children}
+              </ThemeProvider>
+            </TooltipProvider>
           </CustomI18nextProvider>
         </SessionProvider>
       </ContractsProvider>

apps/web/middleware.ts

@@ -1,5 +1,4 @@
 import { collectEvents } from "next-collect/server";
-// eslint-disable-next-line @next/next/no-server-import-in-page
 import { NextMiddleware, NextResponse, userAgent } from "next/server";
 
 import { CONSOLE_URL, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";