Fix all cyclical dependencies in repo, resolve all typecheck issues in all packages, set up sherif to avoid future issues due to package mismatches #2966
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| import { api } from '@/trpc/server'; | ||
| import { trackEvent } from '@/utils/analytics/server'; | ||
| import { createRootAgentStream } from '@/lib/ai'; | ||
| import { toDbMessage } from '@/lib/ai/chat/mappers/message'; | ||
| import { ChatType, type ChatMessage, type ChatMetadata } from '@/lib/ai/models/chat'; | ||
| import { type NextRequest } from 'next/server'; | ||
| import { v4 as uuidv4 } from 'uuid'; | ||
| import { checkMessageLimit, decrementUsage, errorHandler, getSupabaseUser, incrementUsage } from './helpers'; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -20,6 +20,8 @@ export default function GitHubInstallCallbackPage() { | |
| const handleInstallationCallback = api.github.handleInstallationCallbackUrl.useMutation(); | ||
|
|
||
| useEffect(() => { | ||
| if (!searchParams) return; | ||
|
|
||
| const installationId = searchParams.get('installation_id'); | ||
| const setupAction = searchParams.get('setup_action'); | ||
| const stateParam = searchParams.get('state'); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ export const HandleAuth = () => { | |
| const searchParams = useSearchParams(); | ||
|
|
||
| const handleLogin = () => { | ||
| const currentUrl = `${pathname}${searchParams && searchParams.toString() ? `?${searchParams.toString()}` : ''}`; | ||
| router.push(`${Routes.LOGIN}?${getReturnUrlQueryParam(currentUrl)}`); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ export function Main({ invitationId }: { invitationId: string }) { | |
| const router = useRouter(); | ||
| const pathname = usePathname(); | ||
| const searchParams = useSearchParams(); | ||
| const token = searchParams?.get('token') ?? null; | ||
| const { data: invitation, isLoading: loadingInvitation, error: getInvitationError } = api.invitation.getWithoutToken.useQuery({ | ||
| id: invitationId, | ||
| }); | ||
|
|
@@ -35,7 +35,7 @@ export function Main({ invitationId }: { invitationId: string }) { | |
| // Clear analytics/feedback identities before signing out | ||
| void resetTelemetry(); | ||
| await supabase.auth.signOut(); | ||
| const currentUrl = `${pathname}${searchParams && searchParams.toString() ? `?${searchParams.toString()}` : ''}`; | ||
| router.push(`${Routes.LOGIN}?${getReturnUrlQueryParam(currentUrl)}`); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -15,7 +15,8 @@ export default function LoginPage() { | |
| const isDev = process.env.NODE_ENV === 'development'; | ||
| const t = useTranslations(); | ||
| const backgroundUrl = useGetBackground('login'); | ||
| const searchParams = useSearchParams(); | ||
| const returnUrl = searchParams?.get(LocalForageKeys.RETURN_URL) ?? null; | ||
|
|
||
| return ( | ||
| <div className="flex h-screen w-screen justify-center"> | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -4,10 +4,16 @@ import { useEditorEngine } from '@/components/store/editor'; | |
| import type { Frame } from '@onlook/models'; | ||
| import { | ||
| PENPAL_PARENT_CHANNEL, | ||
| type PenpalParentMethods, | ||
| } from '@onlook/penpal'; | ||
| import type { PenpalChildMethods } from '@onlook/web-preload/script/api'; | ||
|
|
||
| // Promisified version of PenpalChildMethods for async RPC calls | ||
| type PromisifiedPendpalChildMethods = { | ||
| [K in keyof PenpalChildMethods]: ( | ||
| ...args: Parameters<PenpalChildMethods[K]> | ||
| ) => Promise<ReturnType<PenpalChildMethods[K]>>; | ||
| }; | ||
| import { WebPreview, WebPreviewBody } from '@onlook/ui/ai-elements'; | ||
| import { cn } from '@onlook/ui/utils'; | ||
| import { observer } from 'mobx-react-lite'; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { useEditorEngine } from '@/components/store/editor'; | ||
| import { transKeys } from '@/i18n/keys'; | ||
| import { ChatType } from '@/lib/ai/models/chat' | ||
| import { Button } from '@onlook/ui/button'; | ||
| import { Icons } from '@onlook/ui/icons'; | ||
| import { toast } from '@onlook/ui/sonner'; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { EditorView, keymap, ViewUpdate } from '@codemirror/view'; | ||
| import type { CodeNavigationTarget } from '@onlook/models'; | ||
| import { convertToBase64DataUrl, getMimeType, isVideoFile } from '@onlook/utility'; | ||
| import CodeMirror from '@uiw/react-codemirror'; | ||
| import { type RefObject, useEffect, useMemo, useRef, useState } from 'react'; | ||
| import type { BinaryEditorFile, EditorFile } from '../shared/types'; | ||
|
|
@@ -170,11 +170,23 @@ export const CodeEditor = ({ | |
| }} | ||
| > | ||
| {file.type === 'binary' && ( | ||
| <> | ||
| {isVideoFile(file.path) ? ( | ||
| <video | ||
| src={getFileUrl(file as BinaryEditorFile)} | ||
| controls | ||
| className="w-full h-full object-contain p-5" | ||
| > | ||
| Your browser does not support the video tag. | ||
| </video> | ||
| ) : ( | ||
| <img | ||
| src={getFileUrl(file as BinaryEditorFile)} | ||
| alt={file.path} | ||
| className="w-full h-full object-contain p-5" | ||
| /> | ||
| )} | ||
| </> | ||
| )} | ||
| {file.type === 'text' && typeof file.content === 'string' && ( | ||
| <> | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ interface CodeControlsProps { | |
| currentPath: string; | ||
| onSave: () => Promise<void>; | ||
| onRefresh: () => void; | ||
| onCreateFile: (filePath: string, content?: string | Uint8Array) => Promise<void>; | ||
| onCreateFolder: (folderPath: string) => Promise<void>; | ||
| isSidebarOpen: boolean; | ||
| setIsSidebarOpen: (isSidebarOpen: boolean) => void; | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ export interface CodeTabRef { | |
| getCurrentPath: () => string; | ||
| handleSaveFile: () => Promise<void>; | ||
| refreshFileTree: () => void; | ||
| handleCreateFile: (filePath: string, content?: string | Uint8Array) => Promise<void>; | ||
| handleCreateFolder: (folderPath: string) => Promise<void>; | ||
| } | ||
|
|
||
|
|
@@ -415,7 +415,7 @@ export const CodeTab = memo(forwardRef<CodeTabRef, CodeTabProps>(({ projectId, b | |
| ); | ||
| }; | ||
|
|
||
| const handleCreateFile = async (filePath: string, content: string | Uint8Array = '') => { | ||
| if (!branchData) { | ||
| throw new Error('Branch data not found'); | ||
| } | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import { Input } from '@onlook/ui/input'; | |
| import { Label } from '@onlook/ui/label'; | ||
| import { toast } from '@onlook/ui/sonner'; | ||
| import { cn } from '@onlook/ui/utils'; | ||
| import { isBinaryFile } from '@onlook/utility'; | ||
| import path from 'path'; | ||
| import { useCallback, useEffect, useState } from 'react'; | ||
|
|
||
|
|
@@ -19,7 +20,7 @@ interface UploadModalProps { | |
| show: boolean; | ||
| setShow: (show: boolean) => void; | ||
| onSuccess?: () => void; | ||
| onCreateFile: (filePath: string, content?: string | Uint8Array) => Promise<void>; | ||
| } | ||
|
|
||
| export const UploadModal = ({ | ||
|
|
@@ -75,13 +76,27 @@ export const UploadModal = ({ | |
|
|
||
| const fileName = file.name; | ||
| const fullPath = path.join(currentPath, fileName).replace(/\\/g, '/'); | ||
| const isBinary = isBinaryFile(fileName); | ||
|
|
||
| const content = await new Promise<string | Uint8Array>((resolve, reject) => { | ||
| const reader = new FileReader(); | ||
| reader.onload = () => { | ||
| if (isBinary) { | ||
| // For binary files, convert ArrayBuffer to Uint8Array | ||
| resolve(new Uint8Array(reader.result as ArrayBuffer)); | ||
| } else { | ||
| // For text files, use string result | ||
| resolve(reader.result as string); | ||
| } | ||
| }; | ||
| reader.onerror = () => reject(reader.error); | ||
|
|
||
| // Use appropriate read method | ||
| if (isBinary) { | ||
| reader.readAsArrayBuffer(file); | ||
| } else { | ||
| reader.readAsText(file); | ||
| } | ||
| }); | ||
|
|
||
| await onCreateFile(fullPath, content); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -190,7 +190,7 @@ export const FileTree = ({ | |
| onRefresh={onRefresh} | ||
| onKeyDown={handleKeyDown} | ||
| /> | ||
| <div ref={treeContainerRef as React.Ref<HTMLDivElement>} className="w-full text-xs px-2 flex-1 min-h-0"> | ||
| {isLoading ? ( | ||
| <div className="flex flex-col justify-start items-center h-full text-sm text-foreground/50 pt-4"> | ||
| <div className="animate-spin h-6 w-6 border-2 border-foreground-hover rounded-full border-t-transparent mb-2"></div> | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -54,7 +54,7 @@ export const ImageGrid = ({ images, projectId, branchId, search, onUpload, onRen | |
| <div className="flex flex-col items-center justify-center py-8 text-foreground-secondary"> | ||
| <Icons.Image className="w-8 h-8 mb-2" /> | ||
| <div className="text-sm"> | ||
| {search ? 'No images or videos match your search' : 'No images or videos in this folder'} | ||
| </div> | ||
| </div> | ||
| )} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.