Skip to content

Commit 0ee5236

Browse files
authored
upgrade to next.js 12 (calcom#1111)
1 parent b82f2be commit 0ee5236

File tree

7 files changed

+143
-300
lines changed

7 files changed

+143
-300
lines changed

.github/workflows/e2e.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77

88
env:
99
DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
10-
NODE_ENV: test
1110
BASE_URL: http://localhost:3000
1211
JWT_SECRET: secret
1312
# GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}

jest.playwright.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
"jest-playwright": {
1919
browsers: ["chromium" /*, 'firefox', 'webkit'*/],
2020
exitOnPageError: false,
21+
launchType: "LAUNCH",
2122
launchOptions: {
2223
headless: opts.headless,
2324
executablePath: opts.executablePath,

lib/app-providers.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ type AppPropsWithChildren = AppProps & {
2323
};
2424

2525
const CustomI18nextProvider = (props: AppPropsWithChildren) => {
26-
const { i18n, locale } = trpc.useQuery(["viewer.i18n"]).data ?? {};
26+
const { i18n, locale } = trpc.useQuery(["viewer.i18n"]).data ?? {
27+
locale: "en",
28+
};
2729

2830
const passedProps = {
2931
...props,

next.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
2-
const withTM = require("next-transpile-modules")(["react-timezone-select"]);
2+
const withTM = require("@vercel/edge-functions-ui/transpile")(["react-timezone-select"]);
33
const { i18n } = require("./next-i18next.config");
44

55
// So we can test deploy previews preview

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"jimp": "^0.16.1",
6868
"lodash": "^4.17.21",
6969
"micro": "^9.3.4",
70-
"next": "^11.1.2",
70+
"next": "^12.0.2",
7171
"next-auth": "^3.29.0",
7272
"next-i18next": "^8.9.0",
7373
"next-seo": "^4.26.0",

playwright/login.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ test("login with pro@example.com", async () => {
1616
await page.press('input[name="password"]', "Enter");
1717

1818
await page.waitForSelector("[data-testid=event-types]");
19+
20+
await context.close();
1921
});
2022

2123
export {};

yarn.lock

Lines changed: 135 additions & 296 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)