chore: fixed lock file

This commit is contained in:
Anirban Kar 2024-12-03 03:23:22 +05:30
parent b499ee1f15
commit bd236860f9
7 changed files with 6532 additions and 33361 deletions

View File

@ -2,15 +2,24 @@
echo "🔍 Running pre-commit hook to check the code looks good... 🔍"
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # Load nvm if you're using i
echo "Running typecheck..."
which pnpm
if ! pnpm typecheck; then
echo "❌ Type checking failed! Please review TypeScript types."
echo "Once you're done, don't forget to add your changes to the commit! 🚀"
exit 1
echo "❌ Type checking failed! Please review TypeScript types."
echo "Once you're done, don't forget to add your changes to the commit! 🚀"
echo "Typecheck exit code: $?"
exit 1
fi
echo "Running lint..."
if ! pnpm lint; then
echo "❌ Linting failed! 'pnpm lint:check' will help you fix the easy ones."
echo "Once you're done, don't forget to add your beautification to the commit! 🤩"
echo "lint exit code: $?"
exit 1
fi

View File

@ -260,7 +260,7 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
<GitCloneButton />
<Separator.Root className="my-[15px] bg-gray6 data-[orientation=horizontal]:h-px data-[orientation=vertical]:h-full data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px" />
<div className="flex items-center gap-3"></div>
<div className={isModelSettingsCollapsed ? 'hidden' : ''}>
<ModelSelector
key={provider?.name + ':' + modelList.length}

View File

@ -1,24 +1,30 @@
import { IconButton } from '../ui/IconButton'
import git from 'isomorphic-git'
import http from 'isomorphic-git/http/web'
import { useGit } from '~/lib/hooks/useGit'
import { IconButton } from '~/components/ui/IconButton';
import { useGit } from '~/lib/hooks/useGit';
export default function GitCloneButton() {
const {ready,gitClone} = useGit()
const onClick= async(e:any)=>{
if (!ready) return
let repoUrl=prompt("Enter the Git url")
if (repoUrl) {
await gitClone(repoUrl)
}
const { ready, gitClone } = useGit();
const onClick = async (_e: any) => {
if (!ready) {
return;
}
const repoUrl = prompt('Enter the Git url');
if (repoUrl) {
await gitClone(repoUrl);
}
};
return (
<IconButton onClick={e=>{
onClick(e)
}} className="w-full justify-center" title="Clone A Git Repo">
<span className="mr-2 text-xs lg:text-sm">Clone A Git Repo</span>
<div className='i-ph:git-branch' />
<IconButton
onClick={(e) => {
onClick(e);
}}
className="w-full justify-center"
title="Clone A Git Repo"
>
<span className="mr-2 text-xs lg:text-sm">Clone A Git Repo</span>
<div className="i-ph:git-branch" />
</IconButton>
)
);
}

View File

@ -1,254 +1,258 @@
import type { WebContainer,FileSystemAPI } from "@webcontainer/api";
import { useCallback, useEffect, useState } from "react";
import { webcontainer as webcontainerPromise } from "~/lib/webcontainer";
import git, { type PromiseFsClient } from 'isomorphic-git'
import http from 'isomorphic-git/http/web'
import type { WebContainer } from '@webcontainer/api';
import { useCallback, useEffect, useState } from 'react';
import { webcontainer as webcontainerPromise } from '~/lib/webcontainer';
import git, { type PromiseFsClient } from 'isomorphic-git';
import http from 'isomorphic-git/http/web';
import Cookies from 'js-cookie';
export function useGit() {
const [ready, setReady] = useState(false);
const [webcontainer, setWebcontainer] = useState<WebContainer>();
const [fs, setFs] = useState<PromiseFsClient>();
const lookupSavedPassword=(url:string)=>{
try {
const [ready, setReady] = useState(false);
const [webcontainer, setWebcontainer] = useState<WebContainer>();
const [fs, setFs] = useState<PromiseFsClient>();
const lookupSavedPassword: (url: string) => any | null = (url: string) => {
try {
// Save updated API keys to cookies with 30 day expiry and secure settings
const creds = Cookies.get(`git:${url}`);
// Save updated API keys to cookies with 30 day expiry and secure settings
let creds=Cookies.get(`git:${url}`);
if (creds) {
const parsedCreds = JSON.parse(creds);
if (creds) {
const parsedCreds = JSON.parse(creds);
if (typeof parsedCreds === 'object' && parsedCreds !== null) {
return parsedCreds
}
}
return;
} catch (error) {
console.error('Error saving API keys to cookies:', error);
return;
if (typeof parsedCreds === 'object' && parsedCreds !== null) {
return parsedCreds;
}
}
return null;
} catch (error) {
console.error('Error saving API keys to cookies:', error);
return null;
}
useEffect(()=>{
webcontainerPromise.then(container=>{
setWebcontainer(container);
setFs(getFs(container));
setReady(true);
})
},[])
};
useEffect(() => {
webcontainerPromise.then((container) => {
setWebcontainer(container);
setFs(getFs(container));
setReady(true);
});
}, []);
const gitClone= useCallback(async (url:string)=>{
if (!webcontainer||!fs||!ready) {
return;
}
let repo = await git.clone({
fs,
http,
dir: webcontainer.workdir,
url: url,
depth: 1,
singleBranch: true,
corsProxy: 'https://cors.isomorphic-git.org',
onAuth: url => {
let auth = lookupSavedPassword(url)
if (auth) return auth
const gitClone = useCallback(
async (url: string) => {
if (!webcontainer || !fs || !ready) {
return;
}
if (confirm('This repo is password protected. Ready to enter a username & password?')) {
auth = {
username: prompt('Enter username'),
password: prompt('Enter password'),
}
return auth
} else {
return { cancel: true }
}
}
})
console.log(repo)
}, [webcontainer])
return {ready,gitClone}
const repo = await git.clone({
fs,
http,
dir: webcontainer.workdir,
url,
depth: 1,
singleBranch: true,
corsProxy: 'https://cors.isomorphic-git.org',
onAuth: (url) => {
let auth = lookupSavedPassword(url);
if (auth) {
return auth;
}
if (confirm('This repo is password protected. Ready to enter a username & password?')) {
auth = {
username: prompt('Enter username'),
password: prompt('Enter password'),
};
return auth;
} else {
return { cancel: true };
}
},
});
console.log(repo);
},
[webcontainer],
);
return { ready, gitClone };
}
const getFs: (c: WebContainer) => PromiseFsClient = (webcontainer: WebContainer) => ({
promises: {
readFile: async (path: string, options: any) => {
const encoding = options.encoding;
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('readFile', relativePath, encoding);
interface IFS{
promises:{
readFile: PromiseFsClient['promises']['readFile'];
writeFile: PromiseFsClient['promises']['writeFile'];
mkdir:FileSystemAPI['mkdir'];
readdir:FileSystemAPI['readdir'];
rm:FileSystemAPI['rm'];
unlink(path: string): Promise<void>;
stat(path: string): Promise<any>;
lstat(path: string): Promise<any>;
rmdir(path: string): Promise<void>;
readlink?(path: string): Promise<string>;
symlink?(target: string, path: string): Promise<void>;
chmod?(path: string, mode: number): Promise<void>;
}
}
const getFs: (c: WebContainer) => PromiseFsClient = (webcontainer: WebContainer)=> ({
promises:{
readFile: async (path: string, options: any) => {
let encoding = options.encoding;
let relativePath = pathUtils.relative(webcontainer.workdir,path);
console.log('readFile', relativePath, encoding);
return await webcontainer.fs.readFile(relativePath,encoding);
},
writeFile: async (path: string, data: any, options: any) => {
let encoding = options.encoding;
let relativePath = pathUtils.relative(webcontainer.workdir,path);
console.log('writeFile', {relativePath,data,encoding});
return await webcontainer.fs.writeFile(relativePath, data, { ...options,encoding});
},
mkdir: async (path: string, options: any) => {
let relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('mkdir', relativePath,options);
return await webcontainer.fs.mkdir(relativePath,{...options,recursive:true})
},
readdir: async (path: string,options:any) => {
let relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('readdir', relativePath,options);
return await webcontainer.fs.readdir(relativePath,options)
},
rm: async (path: string,options:any) => {
let relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('rm', relativePath,options);
return await webcontainer.fs.readFile(relativePath, encoding);
},
writeFile: async (path: string, data: any, options: any) => {
const encoding = options.encoding;
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('writeFile', { relativePath, data, encoding });
return await webcontainer.fs.rm(relativePath, { ...options||{} })
},
rmdir: async (path: string,options:any) => {
let relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('rmdir', relativePath, options);
return await webcontainer.fs.rm(relativePath, { recursive: true,...options})
},
// Mock implementations for missing functions
unlink: async (path: string) => {
// unlink is just removing a single file
let relativePath = pathUtils.relative(webcontainer.workdir, path);
return await webcontainer.fs.rm(relativePath, { recursive: false });
},
return await webcontainer.fs.writeFile(relativePath, data, { ...options, encoding });
},
mkdir: async (path: string, options: any) => {
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('mkdir', relativePath, options);
stat: async (path: string) => {
try {
let relativePath = pathUtils.relative(webcontainer.workdir, path);
let resp = await webcontainer.fs.readdir(pathUtils.dirname(relativePath),{withFileTypes:true})
let name = pathUtils.basename(relativePath)
let fileInfo=resp.find(x=>x.name==name)
if(!fileInfo){
throw new Error(`ENOENT: no such file or directory, stat '${path}'`);
}
return {
isFile: () => fileInfo.isFile(),
isDirectory: () => fileInfo.isDirectory(),
isSymbolicLink: () => false,
size: 1,
mode: 0o666, // Default permissions
mtimeMs: Date.now(),
uid: 1000,
gid: 1000
};
} catch (error) {
const err = new Error(`ENOENT: no such file or directory, stat '${path}'`) as NodeJS.ErrnoException;
err.code = 'ENOENT';
err.errno = -2;
err.syscall = 'stat';
err.path = path;
throw err;
}
},
return await webcontainer.fs.mkdir(relativePath, { ...options, recursive: true });
},
readdir: async (path: string, options: any) => {
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('readdir', relativePath, options);
lstat: async (path: string) => {
// For basic usage, lstat can return the same as stat
// since we're not handling symbolic links
return await getFs(webcontainer).promises.stat(path);
},
return await webcontainer.fs.readdir(relativePath, options);
},
rm: async (path: string, options: any) => {
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('rm', relativePath, options);
readlink: async (path: string) => {
// Since WebContainer doesn't support symlinks,
// we'll throw a "not a symbolic link" error
throw new Error(`EINVAL: invalid argument, readlink '${path}'`);
},
return await webcontainer.fs.rm(relativePath, { ...(options || {}) });
},
rmdir: async (path: string, options: any) => {
const relativePath = pathUtils.relative(webcontainer.workdir, path);
console.log('rmdir', relativePath, options);
symlink: async (target: string, path: string) => {
// Since WebContainer doesn't support symlinks,
// we'll throw a "operation not supported" error
throw new Error(`EPERM: operation not permitted, symlink '${target}' -> '${path}'`);
},
return await webcontainer.fs.rm(relativePath, { recursive: true, ...options });
},
chmod: async (path: string, mode: number) => {
// WebContainer doesn't support changing permissions,
// but we can pretend it succeeded for compatibility
return await Promise.resolve();
// Mock implementations for missing functions
unlink: async (path: string) => {
// unlink is just removing a single file
const relativePath = pathUtils.relative(webcontainer.workdir, path);
return await webcontainer.fs.rm(relativePath, { recursive: false });
},
stat: async (path: string) => {
try {
const relativePath = pathUtils.relative(webcontainer.workdir, path);
const resp = await webcontainer.fs.readdir(pathUtils.dirname(relativePath), { withFileTypes: true });
const name = pathUtils.basename(relativePath);
const fileInfo = resp.find((x) => x.name == name);
if (!fileInfo) {
throw new Error(`ENOENT: no such file or directory, stat '${path}'`);
}
}
})
return {
isFile: () => fileInfo.isFile(),
isDirectory: () => fileInfo.isDirectory(),
isSymbolicLink: () => false,
size: 1,
mode: 0o666, // Default permissions
mtimeMs: Date.now(),
uid: 1000,
gid: 1000,
};
} catch (error: any) {
console.log(error?.message);
const err = new Error(`ENOENT: no such file or directory, stat '${path}'`) as NodeJS.ErrnoException;
err.code = 'ENOENT';
err.errno = -2;
err.syscall = 'stat';
err.path = path;
throw err;
}
},
lstat: async (path: string) => {
/*
* For basic usage, lstat can return the same as stat
* since we're not handling symbolic links
*/
return await getFs(webcontainer).promises.stat(path);
},
readlink: async (path: string) => {
/*
* Since WebContainer doesn't support symlinks,
* we'll throw a "not a symbolic link" error
*/
throw new Error(`EINVAL: invalid argument, readlink '${path}'`);
},
symlink: async (target: string, path: string) => {
/*
* Since WebContainer doesn't support symlinks,
* we'll throw a "operation not supported" error
*/
throw new Error(`EPERM: operation not permitted, symlink '${target}' -> '${path}'`);
},
chmod: async (_path: string, _mode: number) => {
/*
* WebContainer doesn't support changing permissions,
* but we can pretend it succeeded for compatibility
*/
return await Promise.resolve();
},
},
});
const pathUtils = {
dirname: (path: string) => {
// Handle empty or just filename cases
if (!path || !path.includes('/')) return '.';
// Remove trailing slashes
path = path.replace(/\/+$/, '');
// Get directory part
return path.split('/').slice(0, -1).join('/') || '/';
},
basename: (path: string, ext?: string) => {
// Remove trailing slashes
path = path.replace(/\/+$/, '');
// Get the last part of the path
const base = path.split('/').pop() || '';
// If extension is provided, remove it from the result
if (ext && base.endsWith(ext)) {
return base.slice(0, -ext.length);
}
return base;
},
relative: (from: string, to: string): string => {
// Handle empty inputs
if (!from || !to) return '.';
// Normalize paths by removing trailing slashes and splitting
const normalizePathParts = (p: string) =>
p.replace(/\/+$/, '')
.split('/')
.filter(Boolean);
const fromParts = normalizePathParts(from);
const toParts = normalizePathParts(to);
// Find common parts at the start of both paths
let commonLength = 0;
const minLength = Math.min(fromParts.length, toParts.length);
for (let i = 0; i < minLength; i++) {
if (fromParts[i] !== toParts[i]) break;
commonLength++;
}
// Calculate the number of "../" needed
const upCount = fromParts.length - commonLength;
// Get the remaining path parts we need to append
const remainingPath = toParts.slice(commonLength);
// Construct the relative path
const relativeParts = [
...Array(upCount).fill('..'),
...remainingPath
];
// Handle empty result case
return relativeParts.length === 0 ? '.' : relativeParts.join('/');
dirname: (path: string) => {
// Handle empty or just filename cases
if (!path || !path.includes('/')) {
return '.';
}
}
// Remove trailing slashes
path = path.replace(/\/+$/, '');
// Get directory part
return path.split('/').slice(0, -1).join('/') || '/';
},
basename: (path: string, ext?: string) => {
// Remove trailing slashes
path = path.replace(/\/+$/, '');
// Get the last part of the path
const base = path.split('/').pop() || '';
// If extension is provided, remove it from the result
if (ext && base.endsWith(ext)) {
return base.slice(0, -ext.length);
}
return base;
},
relative: (from: string, to: string): string => {
// Handle empty inputs
if (!from || !to) {
return '.';
}
// Normalize paths by removing trailing slashes and splitting
const normalizePathParts = (p: string) => p.replace(/\/+$/, '').split('/').filter(Boolean);
const fromParts = normalizePathParts(from);
const toParts = normalizePathParts(to);
// Find common parts at the start of both paths
let commonLength = 0;
const minLength = Math.min(fromParts.length, toParts.length);
for (let i = 0; i < minLength; i++) {
if (fromParts[i] !== toParts[i]) {
break;
}
commonLength++;
}
// Calculate the number of "../" needed
const upCount = fromParts.length - commonLength;
// Get the remaining path parts we need to append
const remainingPath = toParts.slice(commonLength);
// Construct the relative path
const relativeParts = [...Array(upCount).fill('..'), ...remainingPath];
// Handle empty result case
return relativeParts.length === 0 ? '.' : relativeParts.join('/');
},
};

25548
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -58,6 +58,7 @@
"@openrouter/ai-sdk-provider": "^0.0.5",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.4",
"@remix-run/cloudflare": "^2.15.0",
"@remix-run/cloudflare-pages": "^2.15.0",
@ -75,13 +76,13 @@
"framer-motion": "^11.12.0",
"ignore": "^6.0.2",
"isbot": "^4.4.0",
"isomorphic-git": "^1.27.2",
"istextorbinary": "^9.5.0",
"jose": "^5.9.6",
"js-cookie": "^3.0.5",
"jszip": "^3.10.1",
"nanostores": "^0.10.3",
"ollama-ai-provider": "^0.15.2",
"pnpm": "^9.14.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hotkeys-hook": "^4.6.1",
@ -109,6 +110,7 @@
"husky": "9.1.7",
"is-ci": "^3.0.1",
"node-fetch": "^3.3.2",
"pnpm": "^9.14.4",
"prettier": "^3.4.1",
"sass-embedded": "^1.81.0",
"typescript": "^5.7.2",

File diff suppressed because it is too large Load Diff