fix(embeds): add support for RSC by adding `use client` directives (#7919)

pull/7968/head^2
Julius Marminge 2023-03-28 08:00:02 +02:00 committed by GitHub
parent 605f9c61f3
commit 1620ae660f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 187 additions and 1847 deletions

View File

@ -352,7 +352,6 @@ We have a list of [help wanted](https://github.com/calcom/cal.com/issues?q=is:is
</picture>
</a>
<!-- CONTRIBUTORS -->
### Contributors

View File

@ -86,7 +86,7 @@
"jest-watch-select-projects": "^2.0.0",
"jest-watch-typeahead": "^2.0.0",
"lint-staged": "^12.5.0",
"prettier": "^2.8.4",
"prettier": "^2.8.6",
"ts-jest": "^28.0.8",
"typescript": "^4.9.4"
},

View File

@ -10,6 +10,7 @@ items:
{DESCRIPTION}
### Cron's most valuable features
<!-- From "FAQs: What are Crons most valuable features?"
https://cronhq.notion.site/Cron-Calendar-5625be54feac4e13a75b10271b65ddb7 -->

View File

@ -1,14 +0,0 @@
/* @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss/issues/31#issuecomment-1024722576 */
const tailwind = require("prettier-plugin-tailwindcss");
const sortImports = require("@trivago/prettier-plugin-sort-imports");
const combinedFormatter = {
parsers: {
typescript: {
...tailwind.parsers.typescript,
preprocess: sortImports.parsers.typescript.preprocess,
},
},
};
module.exports = combinedFormatter;

View File

@ -20,13 +20,13 @@
"@tailwindcss/forms": "^0.5.2",
"@tailwindcss/line-clamp": "^0.4.0",
"@tailwindcss/typography": "^0.5.4",
"@trivago/prettier-plugin-sort-imports": "3.2.0",
"@trivago/prettier-plugin-sort-imports": "4.1.1",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"eslint": "^8.34.0",
"eslint-plugin-unused-imports": "^2.0.0",
"prettier": "^2.8.4",
"prettier-plugin-tailwindcss": "^0.1.13",
"prettier": "^2.8.6",
"prettier-plugin-tailwindcss": "^0.2.5",
"tailwind-scrollbar": "^2.0.1",
"tailwindcss": "^3.2.1",
"typescript": "^4.9.4"

View File

@ -16,7 +16,14 @@ module.exports = {
"^[./]",
],
importOrderSeparation: true,
plugins: [require("./merged-prettier-plugin")],
plugins: [
"@trivago/prettier-plugin-sort-imports",
/**
* **NOTE** tailwind plugin must come last!
* @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss#compatibility-with-other-prettier-plugins
*/
"prettier-plugin-tailwindcss",
],
overrides: [
{
files: ["apps/website/lib/utils/wordlist/wordlist.ts"],

View File

@ -345,11 +345,13 @@ function keepParentInformedAboutDimensionChanges() {
const contentHeight = Math.ceil(
parseFloat(mainElementStyles.height) +
parseFloat(mainElementStyles.marginTop) +
parseFloat(mainElementStyles.marginBottom));
parseFloat(mainElementStyles.marginBottom)
);
const contentWidth = Math.ceil(
parseFloat(mainElementStyles.width) +
parseFloat(mainElementStyles.marginLeft) +
parseFloat(mainElementStyles.marginRight));
parseFloat(mainElementStyles.marginRight)
);
// During first render let iframe tell parent that how much is the expected height to avoid scroll.
// Parent would set the same value as the height of iframe which would prevent scroll.

View File

@ -1,4 +1,5 @@
/* eslint-disable prefer-const */
"use client";
import { useEffect, useRef } from "react";
import useEmbed from "./useEmbed";

View File

@ -1,3 +1,5 @@
"use client";
import type { GlobalCal } from "@calcom/embed-core";
import EmbedSnippet from "@calcom/embed-snippet";

View File

@ -1,3 +1,5 @@
"use client";
import { useEffect, useState } from "react";
import EmbedSnippet from "@calcom/embed-snippet";

View File

@ -1,5 +1,4 @@
import { useEffect } from "react";
import { useState } from "react";
import React, { useEffect, useState } from "react";
import ReactDom from "react-dom";
import Cal, { getCalApi } from "./src/index";

1969
yarn.lock

File diff suppressed because it is too large Load Diff