Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🔧 Prepare tsconfigs and dependency graph for TypeScript 7 (#2549)

Luke Vellaffc56a66f2f0
diff --git a/apps/landing/tsconfig.json b/apps/landing/tsconfig.json
index 0b80fed49..829767e0c 100644
--- a/apps/landing/tsconfig.json
+++ b/apps/landing/tsconfig.json
@@ -1,10 +1,9 @@
{
"extends": "@rallly/tsconfig/next.json",
"compilerOptions": {
- "baseUrl": ".",
"paths": {
- "@/*": ["src/*"],
- "~/*": ["public/*"]
+ "@/*": ["./src/*"],
+ "~/*": ["./public/*"]
},
"checkJs": false,
"strictNullChecks": true,
diff --git a/apps/web/tests/create-delete-poll.spec.ts b/apps/web/tests/create-delete-poll.spec.ts
index dce932e09..5c04adfd7 100644
--- a/apps/web/tests/create-delete-poll.spec.ts
+++ b/apps/web/tests/create-delete-poll.spec.ts
@@ -1,7 +1,7 @@
import type { Page } from "@playwright/test";
import { expect, test } from "@playwright/test";
import { deleteAllMessages } from "@rallly/test-helpers";
-import { NewPollPage } from "tests/new-poll-page";
+import { NewPollPage } from "./new-poll-page";
test.describe.serial(() => {
let page: Page;
diff --git a/apps/web/tests/edit-options.spec.ts b/apps/web/tests/edit-options.spec.ts
index 20951b7aa..72f4d3167 100644
--- a/apps/web/tests/edit-options.spec.ts
+++ b/apps/web/tests/edit-options.spec.ts
@@ -1,7 +1,7 @@
import type { Page } from "@playwright/test";
import { expect, test } from "@playwright/test";
-import type { EditOptionsPage } from "tests/edit-options-page";
-import { NewPollPage } from "tests/new-poll-page";
+import type { EditOptionsPage } from "./edit-options-page";
+import { NewPollPage } from "./new-poll-page";
test.describe("edit options", () => {
let page: Page;
diff --git a/apps/web/tests/guest-to-user-migration.spec.ts b/apps/web/tests/guest-to-user-migration.spec.ts
index 58d05136d..c4bc9ec89 100644
--- a/apps/web/tests/guest-to-user-migration.spec.ts
+++ b/apps/web/tests/guest-to-user-migration.spec.ts
@@ -1,8 +1,8 @@
import { expect, test } from "@playwright/test";
import { prisma } from "@rallly/database";
import { deleteAllMessages } from "@rallly/test-helpers";
-import { NewPollPage } from "tests/new-poll-page";
import { LoginPage } from "./login-page";
+import { NewPollPage } from "./new-poll-page";
import { RegisterPage } from "./register-page";
const testUser = {
diff --git a/apps/web/tests/new-poll-page.ts b/apps/web/tests/new-poll-page.ts
index 78f443042..f176ac4fd 100644
--- a/apps/web/tests/new-poll-page.ts
+++ b/apps/web/tests/new-poll-page.ts
@@ -1,5 +1,5 @@
import type { Locator, Page } from "@playwright/test";
-import { PollPage } from "tests/poll-page";
+import { PollPage } from "./poll-page";
export class CreatePollSuccessDialog {
constructor(private readonly page: Page) {}
diff --git a/apps/web/tests/poll-page.ts b/apps/web/tests/poll-page.ts
index 9ca40adca..c9e2d72df 100644
--- a/apps/web/tests/poll-page.ts
+++ b/apps/web/tests/poll-page.ts
@@ -1,6 +1,6 @@
import type { Page } from "@playwright/test";
-import { EditOptionsPage } from "tests/edit-options-page";
-import { InvitePage } from "tests/invite-page";
+import { EditOptionsPage } from "./edit-options-page";
+import { InvitePage } from "./invite-page";
export class PollPage {
constructor(public readonly page: Page) {}
diff --git a/apps/web/tests/vote-and-comment.spec.ts b/apps/web/tests/vote-and-comment.spec.ts
index 7316ec15e..c6173ba7e 100644
--- a/apps/web/tests/vote-and-comment.spec.ts
+++ b/apps/web/tests/vote-and-comment.spec.ts
@@ -2,8 +2,8 @@ import type { Page } from "@playwright/test";
import { expect, test } from "@playwright/test";
import { captureOne } from "@rallly/test-helpers";
import { load } from "cheerio";
-import type { PollPage } from "tests/poll-page";
import { NewPollPage } from "./new-poll-page";
+import type { PollPage } from "./poll-page";
test.describe(() => {
let page: Page;
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index a4f2705d3..225207271 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -1,9 +1,8 @@
{
"extends": "@rallly/tsconfig/next.json",
"compilerOptions": {
- "baseUrl": ".",
"paths": {
- "@/*": ["src/*"]
+ "@/*": ["./src/*"]
},
"strictNullChecks": true,
"types": ["vitest/globals"],
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index 157329eed..42e5369c0 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -1,8 +1,5 @@
{
"extends": "@rallly/tsconfig/next.json",
- "compilerOptions": {
- "baseUrl": "."
- },
"include": ["**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d0eea5b5a..8f576c7cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,8 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+packageExtensionsChecksum: sha256-MiHZ3mgtOUb60KfpkAkui5ad/9eLmcQda0MiZKaTRqA=
+
importers:
.:
@@ -92,7 +94,7 @@ importers:
version: 8.1.0([email protected])
'@vercel/analytics':
specifier: ^1.5.0
dayjs:
specifier: ^1.11.13
version: 1.11.19
@@ -131,7 +133,7 @@ importers:
version: 6.0.0(@types/[email protected])([email protected])
next-seo:
specifier: ^6.1.0
pg:
specifier: ^8.17.1
version: 8.18.0
@@ -213,7 +215,7 @@ importers:
'@hookform/resolvers':
specifier: ^5.2.2
'@marsidev/react-turnstile':
specifier: ^1.4.2
@@ -2471,6 +2473,10 @@ packages:
resolution: {integrity: sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==}
peerDependencies:
react-hook-form: ^7.55.0
+ zod: '*'
+ peerDependenciesMeta:
+ zod:
+ optional: true
resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
@@ -13483,10 +13489,12 @@ snapshots:
hono: 4.11.7
zod: 4.3.6
dependencies:
'@standard-schema/utils': 0.3.0
react-hook-form: 7.71.1([email protected])
+ optionalDependencies:
+ zod: 4.3.6
'@img/[email protected]': {}
@@ -18196,7 +18204,7 @@ snapshots:
dependencies:
uncrypto: 0.1.3
optionalDependencies:
react: 19.2.6
@@ -21954,7 +21962,7 @@ snapshots:
react: 19.2.6
react-dom: 19.2.6([email protected])
dependencies:
react: 19.2.6
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 7d66c74c9..6a2131ce1 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,3 +4,13 @@ packages:
onlyBuiltDependencies:
- '@prisma/client'
+
+# @hookform/resolvers imports zod/v4/core without declaring zod as a peer,
+# relying on pnpm's hoisted fallback which can flip to zod@3 on re-resolution
+packageExtensions:
+ '@hookform/resolvers':
+ peerDependencies:
+ zod: '*'
+ peerDependenciesMeta:
+ zod:
+ optional: true