Graphite borked it

Author: oscartbeaumont

apps/desktop/package.json

@@ -5,7 +5,7 @@
 		"dev": "pnpm -w cap-setup && dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri dev",
 		"build:tauri": "dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri build",
 		"preparescript": "node scripts/prepare.js",
-		"localdev": "dotenv -e ../../.env -- vinxi dev --port 3001",
+		"localdev": "dotenv -e ../../.env -- vinxi dev --port 3002",
 		"build": "vinxi build",
 		"tauri": "tauri"
 	},
@@ -54,7 +54,7 @@
 		"@ts-rest/core": "^3.52.1",
 		"@types/react-tooltip": "^4.2.4",
 		"cva": "npm:class-variance-authority@^0.7.0",
-		"effect": "^3.17.7",
+		"effect": "^3.17.13",
 		"mp4box": "^0.5.2",
 		"posthog-js": "^1.215.3",
 		"solid-js": "^1.9.3",

apps/desktop/src-tauri/tauri.conf.json

@@ -5,7 +5,7 @@
 	"mainBinaryName": "Cap - Development",
 	"build": {
 		"beforeDevCommand": "pnpm localdev",
-		"devUrl": "http://localhost:3001",
+		"devUrl": "http://localhost:3002",
 		"beforeBuildCommand": "pnpm turbo build --filter @cap/desktop",
 		"frontendDist": "../.output/public"
 	},

apps/discord-bot/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
-		"dev": "wrangler dev",
+		"bot-dev": "wrangler dev",
 		"start": "wrangler dev",
 		"test": "vitest",
 		"cf-typegen": "wrangler types"

apps/tasks/package.json

@@ -5,7 +5,6 @@
 	"main": "src/index.ts",
 	"scripts": {
 		"start": "node dist/src/index.js",
-		"dev": "ts-node src/index.ts",
 		"build": "tsc",
 		"start:dist": "node dist/src/index.js",
 		"test": "jest",

apps/web/actions/caps/share.ts

@@ -11,11 +11,12 @@ import {
 	spaceVideos,
 	videos,
 } from "@cap/database/schema";
+import type { Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 interface ShareCapParams {
-	capId: string;
+	capId: Video.VideoId;
 	spaceIds: string[];
 	public?: boolean;
 }

apps/web/actions/folders/moveVideoToFolder.ts

@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { folders, spaceVideos, videos } from "@cap/database/schema";
+import type { Folder, Video } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -11,8 +12,8 @@ export async function moveVideoToFolder({
 	folderId,
 	spaceId,
 }: {
-	videoId: string;
-	folderId: string | null;
+	videoId: Video.VideoId;
+	folderId: Folder.FolderId | null;
 	spaceId?: string | null;
 }) {
 	const user = await getCurrentUser();
@@ -23,7 +24,7 @@ export async function moveVideoToFolder({
 
 	// Get the current video to know its original folder
 	const [currentVideo] = await db()
-		.select({ folderId: videos.folderId })
+		.select({ folderId: videos.folderId, id: videos.id })
 		.from(videos)
 		.where(eq(videos.id, videoId));
 

apps/web/actions/folders/updateFolder.ts

@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { folders } from "@cap/database/schema";
+import type { Folder } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -12,10 +13,10 @@ export async function updateFolder({
 	color,
 	parentId,
 }: {
-	folderId: string;
+	folderId: Folder.FolderId;
 	name?: string;
 	color?: "normal" | "blue" | "red" | "yellow";
-	parentId?: string | null;
+	parentId?: Folder.FolderId | null;
 }) {
 	const user = await getCurrentUser();
 	if (!user || !user.activeOrganizationId)

apps/web/actions/organizations/add-videos.ts

@@ -9,12 +9,13 @@ import {
 	sharedVideos,
 	videos,
 } from "@cap/database/schema";
+import type { Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function addVideosToOrganization(
 	organizationId: string,
-	videoIds: string[],
+	videoIds: Video.VideoId[],
 ) {
 	try {
 		const user = await getCurrentUser();

apps/web/actions/organizations/remove-videos.ts

@@ -9,12 +9,13 @@ import {
 	sharedVideos,
 	videos,
 } from "@cap/database/schema";
+import type { Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function removeVideosFromOrganization(
 	organizationId: string,
-	videoIds: string[],
+	videoIds: Video.VideoId[],
 ) {
 	try {
 		const user = await getCurrentUser();