-
Notifications
You must be signed in to change notification settings - Fork 7.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into chore/orgs-e2e
- Loading branch information
Showing
223 changed files
with
8,710 additions
and
1,718 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
.yarn/patches/libphonenumber-js-npm-1.10.12-51c84f8bf1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/index.cjs b/index.cjs | ||
index b645707a3549fc298508726e404243499bbed499..f34b0891e99b275a9218e253f303f43d31ef3f73 100644 | ||
--- a/index.cjs | ||
+++ b/index.cjs | ||
@@ -13,8 +13,8 @@ function withMetadataArgument(func, _arguments) { | ||
// https://github.com/babel/babel/issues/2212#issuecomment-131827986 | ||
// An alternative approach: | ||
// https://www.npmjs.com/package/babel-plugin-add-module-exports | ||
-exports = module.exports = min.parsePhoneNumberFromString | ||
-exports['default'] = min.parsePhoneNumberFromString | ||
+// exports = module.exports = min.parsePhoneNumberFromString | ||
+// exports['default'] = min.parsePhoneNumberFromString | ||
|
||
// `parsePhoneNumberFromString()` named export is now considered legacy: | ||
// it has been promoted to a default export due to being too verbose. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/dist/commonjs/serverSideTranslations.js b/dist/commonjs/serverSideTranslations.js | ||
index bcad3d02fbdfab8dacb1d85efd79e98623a0c257..fff668f598154a13c4030d1b4a90d5d9c18214ad 100644 | ||
--- a/dist/commonjs/serverSideTranslations.js | ||
+++ b/dist/commonjs/serverSideTranslations.js | ||
@@ -36,7 +36,6 @@ var _fs = _interopRequireDefault(require("fs")); | ||
var _path = _interopRequireDefault(require("path")); | ||
var _createConfig = require("./config/createConfig"); | ||
var _node = _interopRequireDefault(require("./createClient/node")); | ||
-var _appWithTranslation = require("./appWithTranslation"); | ||
var _utils = require("./utils"); | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } | ||
@@ -110,12 +109,8 @@ var serverSideTranslations = /*#__PURE__*/function () { | ||
lng: initialLocale | ||
})); | ||
localeExtension = config.localeExtension, localePath = config.localePath, fallbackLng = config.fallbackLng, reloadOnPrerender = config.reloadOnPrerender; | ||
- if (!reloadOnPrerender) { | ||
- _context.next = 18; | ||
- break; | ||
- } | ||
_context.next = 18; | ||
- return _appWithTranslation.globalI18n === null || _appWithTranslation.globalI18n === void 0 ? void 0 : _appWithTranslation.globalI18n.reloadResources(); | ||
+ return void 0; | ||
case 18: | ||
_createClient = (0, _node["default"])(_objectSpread(_objectSpread({}, config), {}, { | ||
lng: initialLocale |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Checkly Tests | ||
|
||
Run as `yarn checkly test` | ||
Deploy the tests as `yarn checkly deploy` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
import type { Page } from "@playwright/test"; | ||
import { test, expect } from "@playwright/test"; | ||
|
||
test.describe("Org", () => { | ||
// Because these pages involve next.config.js rewrites, it's better to test them on production | ||
test.describe("Embeds - i.cal.com", () => { | ||
test("Org Profile Page should be embeddable", async ({ page }) => { | ||
const response = await page.goto("https://i.cal.com/embed"); | ||
expect(response?.status()).toBe(200); | ||
await page.screenshot({ path: "screenshot.jpg" }); | ||
await expectPageToBeServerSideRendered(page); | ||
}); | ||
|
||
test("Org User(Peer) Page should be embeddable", async ({ page }) => { | ||
const response = await page.goto("https://i.cal.com/peer/embed"); | ||
expect(response?.status()).toBe(200); | ||
await expect(page.locator("text=Peer Richelsen")).toBeVisible(); | ||
await expectPageToBeServerSideRendered(page); | ||
}); | ||
|
||
test("Org User Event(peer/meet) Page should be embeddable", async ({ page }) => { | ||
const response = await page.goto("https://i.cal.com/peer/meet/embed"); | ||
expect(response?.status()).toBe(200); | ||
await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible(); | ||
await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible(); | ||
await expectPageToBeServerSideRendered(page); | ||
}); | ||
|
||
test("Org Team Profile(/sales) page should be embeddable", async ({ page }) => { | ||
const response = await page.goto("https://i.cal.com/sales/embed"); | ||
expect(response?.status()).toBe(200); | ||
await expect(page.locator("text=Cal.com Sales")).toBeVisible(); | ||
await expectPageToBeServerSideRendered(page); | ||
}); | ||
|
||
test("Org Team Event page(/sales/hippa) should be embeddable", async ({ page }) => { | ||
const response = await page.goto("https://i.cal.com/sales/hipaa/embed"); | ||
expect(response?.status()).toBe(200); | ||
await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible(); | ||
await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible(); | ||
await expectPageToBeServerSideRendered(page); | ||
}); | ||
}); | ||
}); | ||
|
||
// This ensures that the route is actually mapped to a page that is using withEmbedSsr | ||
async function expectPageToBeServerSideRendered(page: Page) { | ||
expect( | ||
await page.evaluate(() => { | ||
return window.__NEXT_DATA__.props.pageProps.isEmbed; | ||
}) | ||
).toBe(true); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.